From f7cc1b9b6573f7c609b0ec2dcb563104ee489317 Mon Sep 17 00:00:00 2001
From: vtexier <vit@free.fr>
Date: Wed, 19 Feb 2020 16:20:15 +0100
Subject: [PATCH] [fix] fix computed dividend in about money
---
src/sakia/gui/main_window/toolbar/model.py | 3 +++
src/sakia/gui/main_window/toolbar/view.py | 4 ++--
src/sakia/services/blockchain.py | 3 +--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/sakia/gui/main_window/toolbar/model.py b/src/sakia/gui/main_window/toolbar/model.py
index 254c74bf..f09eac5d 100644
--- a/src/sakia/gui/main_window/toolbar/model.py
+++ b/src/sakia/gui/main_window/toolbar/model.py
@@ -76,6 +76,9 @@ class ToolbarModel(QObject):
localized_data["currency"] = ROOT_SERVERS[self.app.currency]["display"]
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(
params.dt_reeval / 86400, "f", 2
)
diff --git a/src/sakia/gui/main_window/toolbar/view.py b/src/sakia/gui/main_window/toolbar/view.py
index dfc7db26..0ed0d1ea 100644
--- a/src/sakia/gui/main_window/toolbar/view.py
+++ b/src/sakia/gui/main_window/toolbar/view.py
@@ -251,10 +251,10 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
self.tr("Fundamental growth (c) / Reevaluation delta time (dt_reeval)"),
self.tr("UDĞ(t) = UDĞ(t-1) + c²*M(t)/N(t)"),
self.tr("Universal Dividend (formula)"),
- self.tr("{:} = {:} + {:2.2%}² * {:} / {:}").format(
+ self.tr("{:} = {:} + {:}² * {:} / {:}").format(
localized_data.get("ud_plus_1", "####"),
localized_data.get("ud", "####"),
- localized_data.get("growth", "####"),
+ localized_data.get("growth_per_dt", "##########"),
localized_data.get("mass", "####"),
localized_data.get("members_count", "####"),
),
diff --git a/src/sakia/services/blockchain.py b/src/sakia/services/blockchain.py
index 99d322a9..6647a4a7 100644
--- a/src/sakia/services/blockchain.py
+++ b/src/sakia/services/blockchain.py
@@ -175,8 +175,7 @@ class BlockchainService(QObject):
last_ud = self.last_ud()[0] * 10 ** self.last_ud()[1]
next_ud = (
last_ud
- + parameters.c
- * parameters.c
+ + pow(parameters.c / (parameters.dt_reeval / parameters.dt), 2)
* self.previous_monetary_mass()
/ self.last_members_count()
)
--
GitLab