From 384d316b0b1fda1442229fbedce2d6669dbd541f Mon Sep 17 00:00:00 2001 From: jdebacker Date: Fri, 11 May 2018 15:08:27 +0530 Subject: [PATCH 1/2] run reform in example script --- run_examples/run_ogusa_example.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/run_examples/run_ogusa_example.py b/run_examples/run_ogusa_example.py index a907dbadd..5319af75d 100644 --- a/run_examples/run_ogusa_example.py +++ b/run_examples/run_ogusa_example.py @@ -89,6 +89,10 @@ def run_micro_macro(user_params): 'baseline_spending': False, 'data': 'cps', 'client': client, 'num_workers': num_workers} + start_time = time.time() + runner(**kwargs) + print('run time = ', time.time()-start_time) + # return ans - the percentage changes in macro aggregates and prices # due to policy changes from the baseline to the reform ans = postprocess.create_diff(baseline_dir=BASELINE_DIR, From 5480bc5424f4289a55c0e4eb694b2e7feeeb98d3 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Fri, 11 May 2018 19:18:18 +0530 Subject: [PATCH 2/2] update instructions for iwindows --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 86dc38bd1..29cc8f734 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ to release. Stay tuned for an upcoming release! * Install the [Anaconda distribution](https://www.anaconda.com/distribution/) of Python * Clone this repository to a directory on your computer * From the terminal (or Conda command prompt), navigate to the directory to which you cloned this repository and run `conda env create -f environment.yml` -* Then, `source activate ospcdyn` +* Then, `source activate ospcdyn` (on Mac/Linux) or `conda activate ospcdyn` on Windows. * Then install by `python setup.py install` (use `python setup.py develop` if you would like to modifty the code base and run the updated model) * Navigate to `./run_examples` * Run the model with an example reform from terminal/command prompt by typing `python run_ogusa_example.py`