Skip to content

Commit 4d4a8c7

Browse files
Add --output-microdata, rename reform to policy, clean up CLI
- Add --output-microdata DIR: writes persons.csv, benunits.csv, households.csv with all input fields + baseline/reform simulation outputs (taxes, benefits, net income, equivalised income) - Rename --reform/--reform-json to --policy/--policy-json - Remove --deciles flag and decile table from pretty output - Default --output to json instead of pretty - Reorganise CLI help with MODEL RUNS / DATA CREATION / PARAMETER INSPECTION usage examples - Fix clean.rs BenUnit loading to use ..Default for new fields
1 parent 9865ec2 commit 4d4a8c7

File tree

4 files changed

+398
-175
lines changed

4 files changed

+398
-175
lines changed

api/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def _data_args(year: int) -> list[str]:
4747
def run_simulation(year: int, reform_json: Optional[str] = None) -> dict:
4848
cmd = [RUST_BINARY, "--year", str(year), "--output", "json"] + _data_args(year)
4949
if reform_json:
50-
cmd += ["--reform-json", reform_json]
50+
cmd += ["--policy-json", reform_json]
5151
try:
5252
result = subprocess.run(
5353
cmd, capture_output=True, text=True, timeout=120, cwd=ROOT_DIR

api/modal_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def run_simulation(year: int, reform_json: Optional[str] = None) -> dict:
9393
"--output", "json",
9494
] + _data_args()
9595
if reform_json:
96-
cmd += ["--reform-json", reform_json]
96+
cmd += ["--policy-json", reform_json]
9797
try:
9898
result = subprocess.run(
9999
cmd, capture_output=True, text=True, timeout=120,

0 commit comments

Comments
 (0)