Start on updating Example code for VAT and Wealth

grahamstark · Sep 7, 2023 · 72bce00 · 72bce00
1 parent 6d1eaa9
commit 72bce00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/ExampleHouseholdGetter.jl b/src/ExampleHouseholdGetter.jl
@@ -41,6 +41,10 @@ function initialise(
 
     global KEYMAP 
     global EXAMPLE_HOUSEHOLDS
+    # lazy load cons data if needs be
+    if settings.indirect_method == matching
+        ConsumptionData.init( settings ) 
+    end
     KEYMAP = Vector{AbstractString}()
     hh_dataset = CSV.File("$(MODEL_DATA_DIR)/$(household_name).tab", delim='\t' ) |> DataFrame
     people_dataset = CSV.File("$(MODEL_DATA_DIR)/$(people_name).tab", delim='\t' ) |> DataFrame

diff --git a/src/MatchingLibs.jl b/src/MatchingLibs.jl
@@ -1165,7 +1165,7 @@ function model_composition_map( hh :: Household ) :: Vector{Int}
     end
     c = -1
     num_adults = num_male_npens + num_male_pens + num_female_npens + num_female_pens
-    num_penss = num_male_pens + num_female_pens
+    num_pens = num_male_pens + num_female_pens
     if num_adults == 1
         if num_children == 0
             c = if num_male_pens == 1