diff --git a/src/ConsumptionData.jl b/src/ConsumptionData.jl index af3c8438..184340b3 100644 --- a/src/ConsumptionData.jl +++ b/src/ConsumptionData.jl @@ -214,8 +214,7 @@ function uprate_expenditure( settings :: Settings ) f[sym] /= 1.05 elseif sym in DEFAULT_STANDARD_RATE f[sym] /= 1.20 - end - + end f[sym] = Uprating.uprate( f[sym], y, q, Uprating.upr_nominal_gdp ) end end diff --git a/src/ExampleHouseholdGetter.jl b/src/ExampleHouseholdGetter.jl index 4d5380cb..68900389 100644 --- a/src/ExampleHouseholdGetter.jl +++ b/src/ExampleHouseholdGetter.jl @@ -24,6 +24,10 @@ KEYMAP = Vector{AbstractString}() FIXME FIXME FIXME """ function find_consumption_for_example!( hh, settings ) + if size(ConsumptionData.IND_MATCHING)[1] == 0 + # lazy load matching data if we need it + ConsumptionData.init(settings) + end sv_hid = hh.hid sv_data_year = hh.data_year hh.hid = 1