Merge pull request #72 from hetalang/emptysim

fix for empty vectors in simulations

Author: ivborissov

src/solution_interface.jl

@@ -1,7 +1,7 @@
 ############################ Accessing Solution Values #####################
 
 observables(sr::SimResult) = observables(sr.sim)
-observables(sim::Simulation) = collect(keys(sim.vals.u[1]))
+observables(sim::Simulation) = collect(LabelledArrays.symnames(eltype(sim.vals.u)))
 observables(sim::MCResult) = observables(sim[1])
 #parameters(sim::SimResult) = sim.scenario.prob.p
 

src/types.jl

@@ -231,12 +231,23 @@ end
 
 # copy fix is tmp needed not to rewrite SavedValues with new simulation
 Simulation(sv::SavedValues, params, status) = Simulation(
-  DiffEqArray(copy(sv.u),copy(sv.t)),
+  SciMLBase.RecursiveArrayTools.DiffEqArray(sv),
   copy(sv.scope),
   params,
   Symbol(status)
 ) 
 
+function SciMLBase.RecursiveArrayTools.DiffEqArray(sv::SavedValues, p=nothing; safetycopy=true)
+  vec = sv.u
+  ts = sv.t
+  vars = !isempty(vec) ? collect(symbols(vec[1])) : []
+  if safetycopy
+    return SciMLBase.RecursiveArrayTools.DiffEqArray(copy(vec), copy(ts), p; variables = vars)
+  else
+    return SciMLBase.RecursiveArrayTools.DiffEqArray(vec, ts, p; variables = vars)
+  end
+end
+
 status(s::Simulation) = s.status
 times(s::Simulation) = s.vals.t
 vals(s::Simulation) = s.vals.u