Skip to content
Snippets Groups Projects
Commit f7cc1b9b authored by Vincent Texier's avatar Vincent Texier
Browse files

[fix] fix computed dividend in about money

parent 8d934203
No related branches found
No related tags found
1 merge request!7750.50.0
...@@ -76,6 +76,9 @@ class ToolbarModel(QObject): ...@@ -76,6 +76,9 @@ class ToolbarModel(QObject):
localized_data["currency"] = ROOT_SERVERS[self.app.currency]["display"] localized_data["currency"] = ROOT_SERVERS[self.app.currency]["display"]
localized_data["growth"] = params.c localized_data["growth"] = params.c
localized_data["growth_per_dt"] = QLocale().toString(
params.c / (params.dt_reeval / params.dt), "f", 8
)
localized_data["dt_reeval_in_days"] = QLocale().toString( localized_data["dt_reeval_in_days"] = QLocale().toString(
params.dt_reeval / 86400, "f", 2 params.dt_reeval / 86400, "f", 2
) )
......
...@@ -251,10 +251,10 @@ class ToolbarView(QFrame, Ui_SakiaToolbar): ...@@ -251,10 +251,10 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
self.tr("Fundamental growth (c) / Reevaluation delta time (dt_reeval)"), self.tr("Fundamental growth (c) / Reevaluation delta time (dt_reeval)"),
self.tr("UDĞ(t) = UDĞ(t-1) + c²*M(t)/N(t)"), 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("{:} = {:} + {:}² * {:} / {:}").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_per_dt", "##########"),
localized_data.get("mass", "####"), localized_data.get("mass", "####"),
localized_data.get("members_count", "####"), localized_data.get("members_count", "####"),
), ),
......
...@@ -175,8 +175,7 @@ class BlockchainService(QObject): ...@@ -175,8 +175,7 @@ class BlockchainService(QObject):
last_ud = self.last_ud()[0] * 10 ** self.last_ud()[1] last_ud = self.last_ud()[0] * 10 ** self.last_ud()[1]
next_ud = ( next_ud = (
last_ud last_ud
+ parameters.c + pow(parameters.c / (parameters.dt_reeval / parameters.dt), 2)
* parameters.c
* self.previous_monetary_mass() * self.previous_monetary_mass()
/ self.last_members_count() / self.last_members_count()
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment