Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
sakia
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
clients
python
sakia
Commits
f6f7fa5b
Commit
f6f7fa5b
authored
5 years ago
by
Vincent Texier
Browse files
Options
Downloads
Patches
Plain Diff
[fix] use t values in display of monetary mass and mass_per_member
Was using t (last ud block) for t-1 values. Fixed.
parent
4b4fa1ab
No related branches found
No related tags found
1 merge request
!775
0.50.0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/sakia/gui/main_window/toolbar/model.py
+6
-9
6 additions, 9 deletions
src/sakia/gui/main_window/toolbar/model.py
src/sakia/gui/main_window/toolbar/view.py
+7
-7
7 additions, 7 deletions
src/sakia/gui/main_window/toolbar/view.py
with
13 additions
and
16 deletions
src/sakia/gui/main_window/toolbar/model.py
+
6
−
9
View file @
f6f7fa5b
...
@@ -100,7 +100,7 @@ class ToolbarModel(QObject):
...
@@ -100,7 +100,7 @@ class ToolbarModel(QObject):
localized_data
[
localized_data
[
"
members_count
"
"
members_count
"
]
=
self
.
blockchain_service
.
curren
t_members_count
()
]
=
self
.
blockchain_service
.
las
t_members_count
()
computed_dividend
=
self
.
blockchain_service
.
computed_dividend
()
computed_dividend
=
self
.
blockchain_service
.
computed_dividend
()
# display float values
# display float values
...
@@ -109,7 +109,7 @@ class ToolbarModel(QObject):
...
@@ -109,7 +109,7 @@ class ToolbarModel(QObject):
).
diff_localized
(
False
,
True
)
).
diff_localized
(
False
,
True
)
localized_data
[
"
mass
"
]
=
self
.
app
.
current_ref
.
instance
(
localized_data
[
"
mass
"
]
=
self
.
app
.
current_ref
.
instance
(
self
.
blockchain_service
.
current
_mass
(),
self
.
app
.
currency
,
self
.
app
self
.
blockchain_service
.
last_monetary
_mass
(),
self
.
app
.
currency
,
self
.
app
).
localized
(
False
,
True
)
).
localized
(
False
,
True
)
ud_median_time
=
self
.
blockchain_service
.
last_ud_time
()
ud_median_time
=
self
.
blockchain_service
.
last_ud_time
()
...
@@ -145,22 +145,19 @@ class ToolbarModel(QObject):
...
@@ -145,22 +145,19 @@ class ToolbarModel(QObject):
)
)
if
last_ud
:
if
last_ud
:
mass_
minus_1_
per_member
=
(
mass_per_member
=
(
float
(
0
)
float
(
0
)
if
last_ud
==
0
or
last_members_count
==
0
if
last_ud
==
0
or
last_members_count
==
0
else
last_mass
/
last_members_count
else
last_mass
/
last_members_count
)
)
localized_data
[
"
members_count
_minus_1
"
]
=
last_members_count
localized_data
[
"
members_count
"
]
=
last_members_count
localized_data
[
localized_data
[
"
mass_
minus_1_
per_member
"
"
mass_per_member
"
]
=
self
.
app
.
current_ref
.
instance
(
]
=
self
.
app
.
current_ref
.
instance
(
mass_
minus_1_
per_member
,
self
.
app
.
currency
,
self
.
app
mass_per_member
,
self
.
app
.
currency
,
self
.
app
).
localized
(
).
localized
(
False
,
True
False
,
True
)
)
localized_data
[
"
mass_minus_1
"
]
=
self
.
app
.
current_ref
.
instance
(
last_mass
,
self
.
app
.
currency
,
self
.
app
).
localized
(
False
,
True
)
# avoid divide by zero !
# avoid divide by zero !
if
last_members_count
==
0
:
if
last_members_count
==
0
:
localized_data
[
"
actual_growth
"
]
=
float
(
0
)
localized_data
[
"
actual_growth
"
]
=
float
(
0
)
...
...
This diff is collapsed.
Click to expand it.
src/sakia/gui/main_window/toolbar/view.py
+
7
−
7
View file @
f6f7fa5b
...
@@ -209,12 +209,12 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
...
@@ -209,12 +209,12 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
self
.
tr
(
"
Universal Dividend UD(t) in
"
),
self
.
tr
(
"
Universal Dividend UD(t) in
"
),
localized_data
[
"
diff_units
"
],
localized_data
[
"
diff_units
"
],
localized_data
.
get
(
"
mass
"
,
"
###
"
),
localized_data
.
get
(
"
mass
"
,
"
###
"
),
self
.
tr
(
"
Monetary Mass M in
"
),
self
.
tr
(
"
Monetary Mass M
(t)
in
"
),
localized_data
[
"
units
"
],
localized_data
[
"
units
"
],
localized_data
.
get
(
"
members_count
"
,
"
####
"
),
localized_data
.
get
(
"
members_count
"
,
"
####
"
),
self
.
tr
(
"
Members N
"
),
self
.
tr
(
"
Members N
(t)
"
),
localized_data
.
get
(
"
mass_
minus_1_
per_member
"
,
"
####
"
),
localized_data
.
get
(
"
mass_per_member
"
,
"
####
"
),
self
.
tr
(
"
Monetary Mass per member M(t
-1
)/N(t
-1
) in
"
),
self
.
tr
(
"
Monetary Mass per member M(t)/N(t) in
"
),
localized_data
[
"
diff_units
"
],
localized_data
[
"
diff_units
"
],
localized_data
.
get
(
"
actual_growth
"
,
0
),
localized_data
.
get
(
"
actual_growth
"
,
0
),
localized_data
.
get
(
"
days_per_dividend
"
,
"
####
"
),
localized_data
.
get
(
"
days_per_dividend
"
,
"
####
"
),
...
@@ -249,14 +249,14 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
...
@@ -249,14 +249,14 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
localized_data
[
"
growth
"
],
localized_data
[
"
days_per_dividend
"
]
localized_data
[
"
growth
"
],
localized_data
[
"
days_per_dividend
"
]
),
),
self
.
tr
(
"
Fundamental growth (c) / Delta time (dt)
"
),
self
.
tr
(
"
Fundamental growth (c) / Delta time (dt)
"
),
self
.
tr
(
"
UDĞ(t) = UDĞ(t-1) + c²*M(t
-1
)/N(t
-1
)
"
),
self
.
tr
(
"
UDĞ(t) = UDĞ(t-1) + c²*M(t)/N(t)
"
),
self
.
tr
(
"
Universal Dividend (formula)
"
),
self
.
tr
(
"
Universal Dividend (formula)
"
),
self
.
tr
(
"
{:} = {:} + {:2.2%}² * {:} / {:}
"
).
format
(
self
.
tr
(
"
{:} = {:} + {:2.2%}² * {:} / {:}
"
).
format
(
localized_data
.
get
(
"
ud_plus_1
"
,
"
####
"
),
localized_data
.
get
(
"
ud_plus_1
"
,
"
####
"
),
localized_data
.
get
(
"
ud
"
,
"
####
"
),
localized_data
.
get
(
"
ud
"
,
"
####
"
),
localized_data
.
get
(
"
growth
"
,
"
####
"
),
localized_data
.
get
(
"
growth
"
,
"
####
"
),
localized_data
.
get
(
"
mass
_minus_1
"
,
"
####
"
),
localized_data
.
get
(
"
mass
"
,
"
####
"
),
localized_data
.
get
(
"
members_count
_minus_1
"
,
"
####
"
),
localized_data
.
get
(
"
members_count
"
,
"
####
"
),
),
),
self
.
tr
(
"
Universal Dividend (computed)
"
),
self
.
tr
(
"
Universal Dividend (computed)
"
),
)
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment