Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/monte_carlo.jl
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,14 @@ function mc(
params_i = NamedTuple(zip(first.(parameters_variation), values_i))
# take simulated values from solution
sv = sol.prob.kwargs[:callback].discrete_callbacks[1].affect!.saved_values
simulation = Simulation(sv, params_i, sol.retcode)

#simulation = Simulation(sv, params_i, sol.retcode)
if SciMLBase.successful_retcode(sol)
#println("Iteration is successful, val $(size(sv.u))")
simulation = Simulation(sv, params_i, sol.retcode)
else
#println("Iteration is failed with code $(sol.retcode), val $(size(sv.u))")
simulation = Simulation( params_i, sol.retcode)
end
return (output_func(simulation, i), false)
end

Expand Down Expand Up @@ -254,7 +260,14 @@ function mc(
params_i = parameters_pregenerated[iter_i[1]]
# take simulated values from solution
sv = sol.prob.kwargs[:callback].discrete_callbacks[1].affect!.saved_values
simulation = Simulation(sv, params_i, sol.retcode)
#simulation = Simulation(sv, params_i, sol.retcode)
if SciMLBase.successful_retcode(sol)
#println("Iteration is successful, val $(size(sv.u))")
simulation = Simulation(sv, params_i, sol.retcode)
else
#println("Iteration is failed with code $(sol.retcode), val $(size(sv.u))")
simulation = Simulation( params_i, sol.retcode)
end

return (output_func(simulation, i), false)
end
Expand Down
8 changes: 7 additions & 1 deletion src/simulate.jl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,13 @@ function sim(
#parameters_names = Symbol[first(x) for x in parameters]
#return build_results(sol, scenario, parameters_names)
sv = sol.prob.kwargs[:callback].discrete_callbacks[1].affect!.saved_values
simulation = Simulation(sv, parameters_nt, sol.retcode)
if SciMLBase.successful_retcode(sol)
println("Iteration is successful, val $(size(sv.u))")
simulation = Simulation(sv, parameters_nt, sol.retcode)
else
println("Iteration is failed with code $(sol.retcode), val $(size(sv.u))")
simulation = Simulation( parameters_nt, sol.retcode)
end

return SimResult(simulation, scenario)
end
Expand Down
14 changes: 10 additions & 4 deletions src/solution_interface.jl
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,18 @@ end

function DataFrame(mcr::MCResult; itercol=true, kwargs...)
# df performance
df = DataFrame(mcr[1]; iter=(itercol ? 1 : nothing), kwargs...)
j = 1
lmcr = length(mcr)

while mcr[j].status != Symbol(SciMLBase.ReturnCode.Success)
j+=1
end
df = DataFrame(mcr[j]; iter=(itercol ? 1 : nothing), kwargs...)
j+=1
if lmcr > 1
for i in 2:lmcr
append!(df, DataFrame(mcr[i]; iter=(itercol ? i : nothing), kwargs...))
for i in j:lmcr
if mcr[i].status == Symbol(SciMLBase.ReturnCode.Success)
append!(df, DataFrame(mcr[i]; iter=(itercol ? i : nothing), kwargs...))
end
end
end
return df
Expand Down
7 changes: 7 additions & 0 deletions src/types.jl
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,13 @@ Simulation(sv::SavedValues, params, status) = Simulation(
Symbol(status)
)

# copy fix is tmp needed not to rewrite SavedValues with new simulation
Simulation( params, status) = Simulation(
DiffEqArray([0],[0]),
Symbol("error"),
params,
Symbol(status)
)
status(s::Simulation) = s.status
times(s::Simulation) = s.vals.t
vals(s::Simulation) = s.vals.u
Expand Down