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

[mod] hide computed UD because not accurate

todo: display again when we get an accurate previous monetary mass
parent f7cc1b9b
Branches
Tags
1 merge request!7750.50.0
...@@ -241,7 +241,6 @@ class ToolbarView(QFrame, Ui_SakiaToolbar): ...@@ -241,7 +241,6 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
<table cellpadding="5"> <table cellpadding="5">
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr> <tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr> <tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
</table> </table>
""" """
).format( ).format(
...@@ -249,16 +248,18 @@ class ToolbarView(QFrame, Ui_SakiaToolbar): ...@@ -249,16 +248,18 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
localized_data["growth"], localized_data["dt_reeval_in_days"] localized_data["growth"], localized_data["dt_reeval_in_days"]
), ),
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-1)/N(t)"),
self.tr("Universal Dividend (formula)"), self.tr("Universal Dividend (formula)"),
self.tr("{:} = {:} + {:}² * {:} / {:}").format( # fixme: re-display when the computed dividend will be accurate (need accurate previous monetary mass,
localized_data.get("ud_plus_1", "####"), # last mass just before reevaluation)
localized_data.get("ud", "####"), # self.tr("{:} = {:} + {:}² * {:} / {:}").format(
localized_data.get("growth_per_dt", "##########"), # localized_data.get("ud_plus_1", "####"),
localized_data.get("mass", "####"), # localized_data.get("ud", "####"),
localized_data.get("members_count", "####"), # localized_data.get("growth_per_dt", "##########"),
), # localized_data.get("mass", "####"),
self.tr("Universal Dividend (computed)"), # localized_data.get("members_count", "####"),
# ),
# self.tr("Universal Dividend (computed)"),
) )
def text_referential(self, ref): def text_referential(self, ref):
......
...@@ -168,6 +168,12 @@ class BlockchainService(QObject): ...@@ -168,6 +168,12 @@ class BlockchainService(QObject):
def computed_dividend(self): def computed_dividend(self):
""" """
Computes next dividend value Computes next dividend value
Duniter formula is:
HEAD.dividend = Math.ceil(HEAD_1.dividend + Math.pow(conf.c, 2) *
Math.ceil(HEAD_1.massReeval / Math.pow(10, previousUB)) / HEAD.membersCount / (conf.dtReeval / conf.dt));
:rtype: int :rtype: int
""" """
parameters = self.parameters() parameters = self.parameters()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment