Skip to content

Commit

Permalink
ladata
Browse files Browse the repository at this point in the history
  • Loading branch information
grahamstark committed Dec 4, 2024
1 parent f0422ad commit bbfc50c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion scripts/walestax.jl
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ end

# output formatters
countfmt = (v, i, j) -> fmt(v)
pctfmt = (v, i, j) Format.format(v, precision=2)
pctfmt = (v, i, j) = Format.format(v, precision=2)

function how_we_doing_fmt(val, row, col )
if col == 1 # name col
Expand Down
14 changes: 10 additions & 4 deletions src/LocalTaxRunner.jl
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,11 @@ const PROGRESSIVE_RELATIVITIES = Dict{CT_Band,Float64}(
Note ATM this is Scotland only!
"""
function do_local_level_run(;
target :: EqTargets,
systems :: Vector{TaxBenefitSystem},
settings::Settings,
ccode :: Symbol,
observer :: Observable
observer :: Observable,
reset = false,
restore = false )::DataFrame
@argcheck settings.target_nation == N_Scotland
Expand Down Expand Up @@ -143,9 +144,14 @@ function do_local_level_run(;

base_cost = get_base_cost( ;
settings = settings, base_sys=system[1], observer = observer )

# FIXME this adds an initial value
# progressive_ct_sys.loctax.ct.band_d[code] += fairer_bands_band_d / WEEKS_PER_YEAR

local_income_tax = equalise(
target,
system[2],
settings,
base_cost,
obs )


# always reload data at the end so we haven't messed up councils and weights
if restore
Expand Down

0 comments on commit bbfc50c

Please sign in to comment.