Wires in the money class.

[retire.git] / parameters.py

diff --git a/parameters.py b/parameters.py
index ae66e1560d2b6875ca1ffc380b6fe78c367b8c92..989d5265468cce99ea9f64589d4ba003cfbbd390 100644 (file)
--- a/parameters.py
+++ b/parameters.py
@@ -1,6 +1,7 @@
 import constants
 import utils
 from tax_brackets import tax_brackets
+from money import money
 
 class parameters(object):
     """A container to hold the initial states of several simulation
@@ -12,7 +13,7 @@ class parameters(object):
     def with_default_values(self):
         # Annual expenses in USD at the start of the simulation.  This
         # will be adjusted upwards with inflation_multiplier every year.
-        self.initial_annual_expenses = 144300
+        self.initial_annual_expenses = money(144300)
 
         # The average US inflation rate during the simulation.  The
         # Fed's target rate is 2.0% as of 2020.  The long term observed
@@ -47,9 +48,9 @@ class parameters(object):
         #      age 67 - $30,000              age 67 - $30,420
         #      age 70 - $37,200              age 70 - $37,728
         #
-        #                                        X  SCOTT   LYNN
-        self.social_security_age =             [ 0,    62,    62 ]
-        self.initial_social_security_dollars = [ 0, 21000, 21000 ]
+        #                                        X        SCOTT          LYNN
+        self.social_security_age =             [0,           62,           62 ]
+        self.initial_social_security_dollars = [0, money(21000), money(21000) ]
 
         # Tax details... the standard deduction amount and tax
         # brackets for ordinary income and long term capital gains.
@@ -131,7 +132,7 @@ class parameters(object):
     def dump(self):
         print "SIMULATION PARAMETERS"
         print "  {:<50}: {:>14}".format("Initial year annual expenses",
-                                        utils.format_money(self.initial_annual_expenses))
+                                        self.initial_annual_expenses)
         print "  {:<50}: {:>14}".format("Annual inflation rate",
                                         utils.format_rate(self.inflation_multiplier))
         print "  {:<50}: {:>14}".format("Average annual investment return rate",
@@ -141,11 +142,11 @@ class parameters(object):
         print "  {:<50}: {:>14}".format("Age at which Lynn takes social security",
                                         self.social_security_age[constants.LYNN])
         print "  {:<50}: {:>14}".format("Lynn's first year social security benefit",
-                                        utils.format_money(self.initial_social_security_dollars[constants.LYNN]))
+                                        self.initial_social_security_dollars[constants.LYNN])
         print "  {:<50}: {:>14}".format("Age at which Scott takes social security",
                                         self.social_security_age[constants.SCOTT])
         print "  {:<50}: {:>14}".format("Scott's first year social security benefit",
-                                        utils.format_money(self.initial_social_security_dollars[constants.SCOTT]))
+                                        self.initial_social_security_dollars[constants.SCOTT])
         print "  Federal tax brackets ["
         self.federal_ordinary_income_tax_brackets.dump()
         print "  ]"