Skip to content

Commit 5a35cb2

Browse files
committed
Revert ordering change; Change name of function to indicate side effects
1 parent 3a3cf01 commit 5a35cb2

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/mcs/montecarlo.jl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ function Base.show(obj::T) where T <: AbstractSimulationData
5050
end
5151

5252
"""
53-
_store_param_results(m::AbstractModel, datum_key::Tuple{Symbol, Symbol},
53+
_store_param_results!(m::AbstractModel, datum_key::Tuple{Symbol, Symbol},
5454
trialnum::Int, scen_name::Union{Nothing, String},
5555
results::Dict{Tuple, DataFrame})
5656
5757
Store `results` for a single parameter `datum_key` in model `m` and return the
5858
dataframe for this particular `trial_num`/`scen_name` combination.
5959
"""
60-
function _store_param_results(m::AbstractModel, datum_key::Tuple{Symbol, Symbol},
60+
function _store_param_results!(m::AbstractModel, datum_key::Tuple{Symbol, Symbol},
6161
trialnum::Int, scen_name::Union{Nothing, String},
6262
results::Dict{Tuple, DataFrame})
6363
@debug "\nStoring trial results for $datum_key"
@@ -122,9 +122,13 @@ function _store_trial_results(sim_inst::SimulationInstance{T}, trialnum::Int,
122122

123123
model_index = 1
124124
for (m, results) in zip(sim_inst.models, sim_inst.results)
125-
for datum_key in savelist
125+
for datum_key in savelist
126+
127+
# store parameter results to the sim_inst.results dictionary and return the
128+
# trial df that can be optionally streamed out to a file
129+
trial_df = _store_param_results!(m, datum_key, trialnum, scen_name, results)
130+
126131
if output_dir !== nothing
127-
trial_df = _store_param_results(m, datum_key, trialnum, scen_name, results)
128132

129133
# get sub_dir, which is different from output_dir if there are multiple models
130134
if (length(sim_inst.results) > 1)

0 commit comments

Comments
 (0)