indirect taxes - VAT in output and equalising

grahamstark · Aug 30, 2023 · 5979163 · 5979163
1 parent 2801872
commit 5979163
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/ExampleHouseholdGetter.jl b/src/ExampleHouseholdGetter.jl
@@ -19,6 +19,20 @@ EXAMPLE_HOUSEHOLDS = Dict{String,Household}()
 
 KEYMAP = Vector{AbstractString}()
 
+"""
+FIXME FIXME FIXME
+"""
+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.hid = sv_hid
+    hh.data_year = sv_data_year
+end
 
 """
 return number of households available
@@ -42,8 +56,10 @@ function initialise(
         hhf = hh_dataset[hseq,:]
         push!( KEYMAP, hhf.name )
         println( "loading $(hhf.name) $(hhf.council)")
-        EXAMPLE_HOUSEHOLDS[hhf.name] = load_hhld_from_frame( 
+        hh = load_hhld_from_frame( 
             hseq, hhf, people_dataset, ExampleSource, settings )
+        find_consumption_for_example!( hh, settings )
+        EXAMPLE_HOUSEHOLDS[hhf.name] = hh
         println( EXAMPLE_HOUSEHOLDS[hhf.name].council )
     end
     return KEYMAP

diff --git a/test/equaliser_tests.jl b/test/equaliser_tests.jl
@@ -116,7 +116,7 @@ end
     base = get_system(year=2023, scotland=false )
     sys = get_system(year=2023, scotland=false )
     sys.ubi.abolished = false
-    sys.it.personal_allowance = 0.0
+    # sys.it.personal_allowance = 0.0
     make_ubi_pre_adjustments!( sys )
     base_res = do_one_run(
         settings,