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

Calculate and display UD(t+1) in informations_tab computed formula

round values from referential in informations_tab
parent 80608cca
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,7 @@ Created on 31 janv. 2015 ...@@ -6,6 +6,7 @@ Created on 31 janv. 2015
import logging import logging
import datetime import datetime
import math
from PyQt5.QtWidgets import QWidget from PyQt5.QtWidgets import QWidget
from ..gen_resources.informations_tab_uic import Ui_InformationsTabWidget from ..gen_resources.informations_tab_uic import Ui_InformationsTabWidget
...@@ -50,23 +51,23 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -50,23 +51,23 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
self.label_general.setText( self.label_general.setText(
""" """
<table cellpadding="5"> <table cellpadding="5">
<tr><td align="right"><b>{:.2f}</b></div></td><td>{:} {:}</td></tr> <tr><td align="right"><b>{:}</b></div></td><td>{:} {:}</td></tr>
<tr><td align="right"><b>{:.2f}</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>{:.2f}</b></td><td>{:} {:}</td></tr> <tr><td align="right"><b>{:}</b></td><td>{:} {:}</td></tr>
<tr><td align="right"><b>{:2.2%} / {:} days</b></td><td>{:}</td></tr> <tr><td align="right"><b>{:2.2%} / {:} days</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(
self.get_referential_diff_value(block['dividend']), round(self.get_referential_diff_value(block['dividend'])),
'Universal Dividend UD(t) in', 'Universal Dividend UD(t) in',
self.get_referential_name(), self.get_referential_name(),
self.get_referential_value(block['monetaryMass']), round(self.get_referential_value(block['monetaryMass'])),
'Monetary Mass M(t) in', 'Monetary Mass M(t) in',
self.get_referential_name(), self.get_referential_name(),
block['membersCount'], block['membersCount'],
'Members N(t)', 'Members N(t)',
self.get_referential_value(block['monetaryMass'] / block['membersCount']), round(self.get_referential_value(block['monetaryMass'] / block['membersCount'])),
'Monetary Mass per member M(t)/N(t) in', 'Monetary Mass per member M(t)/N(t) in',
self.get_referential_name(), self.get_referential_name(),
block['dividend'] / (block_t_minus_1['monetaryMass'] / block['membersCount']), block['dividend'] / (block_t_minus_1['monetaryMass'] / block['membersCount']),
...@@ -125,11 +126,12 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -125,11 +126,12 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
'Fundamental growth (c) / Delta time (dt)', 'Fundamental growth (c) / Delta time (dt)',
'UD(t+1) = MAX { UD(t) ; c * M(t) / N(t) }', 'UD(t+1) = MAX { UD(t) ; c * M(t) / N(t) }',
'Universal Dividend (formula)', 'Universal Dividend (formula)',
'UD(t+1) = MAX {{ {:.2f} {:} ; {:2.0%} * {:.2f} {:} / {:} }}'.format( '{:} = MAX {{ {:} {:} ; {:2.0%} * {:} {:} / {:} }}'.format(
self.get_referential_diff_value(block['dividend']), math.ceil(max(block['dividend'], params['c'] * block['monetaryMass'] / block['membersCount'])),
round(self.get_referential_diff_value(block['dividend'])),
self.get_referential_name(), self.get_referential_name(),
params['c'], params['c'],
self.get_referential_value(block['monetaryMass']), round(self.get_referential_value(block['monetaryMass'])),
self.get_referential_name(), self.get_referential_name(),
block['membersCount'] block['membersCount']
), ),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment