Merge pull request #628 from SciML/s/catalyst-updates

Updates for Catalyst

Author: YingboMa

src/systems/diffeqs/abstractodesystem.jl

@@ -267,9 +267,9 @@ function DiffEqBase.ODEProblem{iip}(sys::AbstractODESystem,u0map,tspan,
     dvs = states(sys)
     ps = parameters(sys)
     u0map′ = [lower_varname(value(k), sys.iv) => value(v) for (k, v) in u0map]
-    parammap′ = [value(k) => value(v) for (k, v) in parammap]
     u0 = varmap_to_vars(u0map′,dvs)
     if !(parammap isa DiffEqBase.NullParameters)
+        parammap′ = [value(k) => value(v) for (k, v) in parammap]
         p = varmap_to_vars(parammap′,ps)
     else
         p = ps

src/systems/reaction/reactionsystem.jl

@@ -136,6 +136,10 @@ struct ReactionSystem <: AbstractSystem
     name::Symbol
     """systems: The internal systems"""
     systems::Vector{ReactionSystem}
+
+    function ReactionSystem(eqs, iv, states, ps, pins, observed, name, systems)
+        new(eqs, value(iv), value.(states), value.(ps), pins, observed, name, systems)
+    end
 end
 
 function ReactionSystem(eqs, iv, species, params;
@@ -145,8 +149,7 @@ function ReactionSystem(eqs, iv, species, params;
                         name = gensym(:ReactionSystem))
 
     isempty(species) && error("ReactionSystems require at least one species.")
-    ReactionSystem(eqs, value(iv), value.(species), value.(params),
-                   pins, observed, name, systems)
+    ReactionSystem(eqs, iv, species, params, pins, observed, name, systems)
 end
 
 """