From b1775a1e9deb6cb0bb059400438ceb32de3770ed Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Mon, 17 Oct 2016 13:44:04 +0200
Subject: [PATCH] Fixing duniter/duniter#606 Change UD formula in favor of DUG
---
app/js/controllers/main/home/tabs/OverviewController.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/js/controllers/main/home/tabs/OverviewController.js b/app/js/controllers/main/home/tabs/OverviewController.js
index a8c53f0..9a544d2 100644
--- a/app/js/controllers/main/home/tabs/OverviewController.js
+++ b/app/js/controllers/main/home/tabs/OverviewController.js
@@ -13,7 +13,8 @@ module.exports = ($scope, $interval, BMA, UIUtils, summary, bmapi, ws) => {
// const globalC = Math.round(Math.pow(1 + summary.parameters.c, nbUDperYear) * 100) / 100 - 1;
let UD = summary.parameters.ud0;
if (summary.lastUDBlock) {
- UD = (1 + summary.parameters.c) * summary.lastUDBlock.dividend * Math.pow(10, summary.lastUDBlock.unitbase);
+ const N = summary.current.membersCount;
+ UD = parseInt((summary.lastUDBlock.dividend * Math.pow(10, summary.lastUDBlock.unitbase) + Math.pow(summary.parameters.c, 2) * M / N).toFixed(0));
}
$scope.current = summary.current;
$scope.monetaryMass = parseInt(M / UD) || 0;
@@ -110,7 +111,8 @@ module.exports = ($scope, $interval, BMA, UIUtils, summary, bmapi, ws) => {
let M = summary.current.monetaryMass || 0;
let UD = summary.parameters.ud0;
if (summary.lastUDBlock) {
- UD = (1 + summary.parameters.c) * summary.lastUDBlock.dividend * Math.pow(10, summary.lastUDBlock.unitbase);
+ const N = summary.current.membersCount;
+ UD = parseInt((summary.lastUDBlock.dividend * Math.pow(10, summary.lastUDBlock.unitbase) + Math.pow(summary.parameters.c, 2) * M / N).toFixed(0));
}
$scope.monetaryMass = parseInt(M / UD) || 0;
$scope.$apply();
--
GitLab