Add economic assumptions

policyengine_uk/parameters/gov/contrib/policyengine/economy/energy_bills.yaml

@@ -0,0 +1,6 @@
+description: Raise energy spending by this percentage.
+values:
+  2000-01-01: 0
+metadata:
+  unit: /1
+  label: Change to energy spending

policyengine_uk/parameters/gov/contrib/policyengine/economy/gdp_per_capita.yaml

@@ -0,0 +1,6 @@
+description: Raise all market incomes by this percentage.
+values:
+  2000-01-01: 0
+metadata:
+  unit: /1
+  label: Change to GDP per capita

policyengine_uk/parameters/gov/contrib/policyengine/economy/interest_rates.yaml

@@ -0,0 +1,6 @@
+description: Raise the interest rate on mortgages by this percentage.
+values:
+  2000-01-01: 0
+metadata:
+  unit: /1
+  label: Change to interest rates

policyengine_uk/parameters/gov/contrib/policyengine/economy/rent.yaml

@@ -0,0 +1,6 @@
+description: Raise rental expenses by this percentage.
+values:
+  2000-01-01: 0
+metadata:
+  unit: /1
+  label: Change to rents

policyengine_uk/parameters/gov/contrib/policyengine/economy/transport.yaml

@@ -0,0 +1,6 @@
+description: Raise transport expenses by this percentage.
+values:
+  2000-01-01: 0
+metadata:
+  unit: /1
+  label: Change to transport spending

policyengine_uk/variables/household/income/income.py

@@ -190,7 +190,7 @@ class inflation_adjustment(Variable):
     def formula(household, period, parameters):
         cpi = parameters.calibration.uprating.CPI
         current_period_cpi = cpi(period)
-        now_cpi = cpi(datetime.datetime.now().strftime("%Y-%m-%d"))
+        now_cpi = cpi(datetime.datetime.now().strftime("%Y-01-01"))
         return now_cpi / current_period_cpi
 
 
@@ -360,6 +360,11 @@ class household_market_income(Variable):
         "capital_gains",
     ]
 
+    def formula(person, period, parameters):
+        total = add(person, period, household_market_income.adds)
+        contrib = parameters(period).gov.contrib.policyengine.economy.gdp_per_capita
+        return total * (contrib + 1)
+
 
 class household_income_decile(Variable):
     label = "household income decile"