quick hack for examples indirect

grahamstark · Aug 31, 2023 · 66780ee · 66780ee
1 parent d2abe61
commit 66780ee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/ExampleHouseholdGetter.jl b/src/ExampleHouseholdGetter.jl
@@ -12,7 +12,7 @@ using .Definitions
 using .ModelHousehold: Household
 using .ConsumptionData: find_consumption_for_hh!
 using .HouseholdFromFrame: load_hhld_from_frame
-using .RunSettings: Settings
+using .RunSettings
 
 export  initialise, get_household
 
@@ -27,10 +27,10 @@ function find_consumption_for_example!( hh, settings )
     sv_hid = hh.hid
     sv_data_year = hh.data_year
     hh.hid = 1
-    hh.data_year = 2020
-
-    find_consumption_for_hh!( hh, settings, 1 )
-
+    hh.data_year = 2021
+    if settings.indirect_method == matching
+        find_consumption_for_hh!( hh, settings, 1 )
+    end
     hh.hid = sv_hid
     hh.data_year = sv_data_year
 end

diff --git a/test/consumption_data_tests.jl b/test/consumption_data_tests.jl
@@ -15,6 +15,7 @@ using .STBParameters
 using .Uprating
 using .Utils
 using .Monitor: Progress
+using .ExampleHouseholdGetter
 
 settings = Settings()
 
@@ -52,6 +53,16 @@ end
     end
 end
 
+@testset "test examples consumption" begin
+    settings = get_all_uk_settings_2023() # so, with expenditure == matching jammed on
+    @test settings.indirect_method == matching
+    keys = ExampleHouseholdGetter.initialise( settings )
+    for k in keys
+        hh = ExampleHouseholdGetter.get_household( k )
+        @test ! isnothing(hh.expenditure)
+    end
+end
+
 @testset "Indirect Parameters" begin
     println( "default_exempt = $(DEFAULT_EXEMPT)")
     println( "default_reduced_rate = $(DEFAULT_REDUCED_RATE)")