Merge pull request #14 from ckingdon95/mimi-update

Update run_sim for Mimi 0.8.3
fund-model · Apr 19, 2019 · 6020b1d · 6020b1d
2 parents 838f656 + 24f8c73
commit 6020b1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/montecarlo/run_fund_mcs.jl b/src/montecarlo/run_fund_mcs.jl
@@ -18,12 +18,15 @@ function run_fund_mcs(trials = 10000; ntimesteps = MimiFUND.default_nsteps + 1,
 
     # Generate trials
     if save_trials
-        generate_trials!(mcs, trials; filename = joinpath(output_dir, "trials.csv"))
+        filename = joinpath("$output_dir/trials.csv")
+        generate_trials!(mcs, trials; filename=filename)
+    else
+        generate_trials!(mcs, trials)
     end
 
     # Run monte carlo trials
     set_models!(mcs, getfund())
-    run_sim(mcs; ntimesteps = ntimesteps, output_dir = "$output_dir/results")
+    run_sim(mcs; trials = trials, ntimesteps = ntimesteps, output_dir = "$output_dir/results")
 
     return nothing
 end
diff --git a/src/montecarlo/run_fund_scc_mcs.jl b/src/montecarlo/run_fund_scc_mcs.jl
@@ -29,8 +29,12 @@ function run_fund_scc_mcs(trials = 10000; years = [2020], rates = [0.03], ntimes
     mcs = getmcs()
 
     # Generate trials
-    filename = save_trials ? joinpath(@__DIR__, "$output_dir/trials.csv") : ""
-    generate_trials!(mcs, trials; filename=filename)
+    if save_trials
+        filename = joinpath(@__DIR__, "$output_dir/trials.csv")
+        generate_trials!(mcs, trials; filename=filename)
+    else
+        generate_trials!(mcs, trials)
+    end
 
     # Get FUND marginal model
     mm = create_marginal_FUND_model()