Make name obligatory

Author: YingboMa

src/systems/control/controlsystem.jl

@@ -87,7 +87,8 @@ function ControlSystem(loss, deqs::AbstractVector{<:Equation}, iv, dvs, controls
                        default_u0=Dict(),
                        default_p=Dict(),
                        defaults=_merge(Dict(default_u0), Dict(default_p)),
-                       name=gensym(:ControlSystem))
+                       name=nothing)
+    name === nothing && throw(ArgumentError("The `name` keyword must be provided. Please consider using the `@named` macro"))
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn("`default_u0` and `default_p` are deprecated. Use `defaults` instead.", :ControlSystem, force=true)
     end

src/systems/diffeqs/modelingtoolkitize.jl

@@ -62,6 +62,7 @@ function modelingtoolkitize(prob::DiffEqBase.ODEProblem; kwargs...)
     de = ODESystem(
         eqs, t, sts, params,
         defaults=merge(default_u0, default_p);
+        name=gensym(:MTKizedODE),
         kwargs...
     )
 
@@ -158,7 +159,9 @@ function modelingtoolkitize(prob::DiffEqBase.SDEProblem; kwargs...)
         Vector(vec(params))
     end
 
-    de = SDESystem(deqs,neqs,t,Vector(vec(vars)),params; kwargs...)
+    de = SDESystem(deqs,neqs,t,Vector(vec(vars)),params;
+                   name=gensym(:MTKizedSDE),
+                   kwargs...)
 
     de
 end
@@ -182,6 +185,8 @@ function modelingtoolkitize(prob::DiffEqBase.OptimizationProblem; kwargs...)
         reshape([variable(:α, i) for i in eachindex(p)],size(Array(p)))
 
     eqs = prob.f(vars, params)
-    de = OptimizationSystem(eqs,vec(vars),vec(params); kwargs...)
+    de = OptimizationSystem(eqs,vec(vars),vec(params);
+                            name=gensym(:MTKizedOpt),
+                            kwargs...)
     de
 end

src/systems/diffeqs/odesystem.jl

@@ -97,12 +97,13 @@ function ODESystem(
                    controls  = Num[],
                    observed = Num[],
                    systems = ODESystem[],
-                   name=gensym(:ODESystem),
+                   name=nothing,
                    default_u0=Dict(),
                    default_p=Dict(),
                    defaults=_merge(Dict(default_u0), Dict(default_p)),
                    connection_type=nothing,
                   )
+    name === nothing && throw(ArgumentError("The `name` keyword must be provided. Please consider using the `@named` macro"))
     deqs = collect(deqs)
     @assert all(control -> any(isequal.(control, ps)), controls) "All controls must also be parameters."
 

src/systems/diffeqs/sdesystem.jl

@@ -101,9 +101,10 @@ function SDESystem(deqs::AbstractVector{<:Equation}, neqs, iv, dvs, ps;
                    default_u0=Dict(),
                    default_p=Dict(),
                    defaults=_merge(Dict(default_u0), Dict(default_p)),
-                   name = gensym(:SDESystem),
+                   name=nothing,
                    connection_type=nothing,
                    )
+    name === nothing && throw(ArgumentError("The `name` keyword must be provided. Please consider using the `@named` macro"))
     deqs = collect(deqs)
     iv′ = value(iv)
     dvs′ = value.(dvs)

src/systems/discrete_system/discrete_system.jl

@@ -71,11 +71,12 @@ function DiscreteSystem(
                    controls = Num[],
                    observed = Num[],
                    systems = DiscreteSystem[],
-                   name=gensym(:DiscreteSystem),
+                   name=nothing,
                    default_u0=Dict(),
                    default_p=Dict(),
                    defaults=_merge(Dict(default_u0), Dict(default_p)),
                   )
+    name === nothing && throw(ArgumentError("The `name` keyword must be provided. Please consider using the `@named` macro"))
     eqs = collect(eqs)
     iv′ = value(iv)
     dvs′ = value.(dvs)

src/systems/jumps/jumpsystem.jl

@@ -1,4 +1,4 @@
-JumpType = Union{VariableRateJump, ConstantRateJump, MassActionJump}
+const JumpType = Union{VariableRateJump, ConstantRateJump, MassActionJump}
 
 """
 $(TYPEDEF)
@@ -66,10 +66,10 @@ function JumpSystem(eqs, iv, states, ps;
                     default_u0=Dict(),
                     default_p=Dict(),
                     defaults=_merge(Dict(default_u0), Dict(default_p)),
-                    name = gensym(:JumpSystem),
+                    name=nothing,
                     connection_type=nothing,
                     kwargs...)
-
+    name === nothing && throw(ArgumentError("The `name` keyword must be provided. Please consider using the `@named` macro"))
     eqs = collect(eqs)
     sysnames = nameof.(systems)
     if length(unique(sysnames)) != length(sysnames)
@@ -372,4 +372,4 @@ function (ratemap::JumpSysMajParamMapper{U,V,W})(maj::MassActionJump, newparams;
     end
     scale_rates && DiffEqJump.scalerates!(maj.scaled_rates, maj.reactant_stoch)
     nothing
-end
+end

src/systems/nonlinear/nonlinearsystem.jl

@@ -58,13 +58,14 @@ end
 
 function NonlinearSystem(eqs, states, ps;
                          observed=[],
-                         name=gensym(:NonlinearSystem),
+                         name=nothing,
                          default_u0=Dict(),
                          default_p=Dict(),
                          defaults=_merge(Dict(default_u0), Dict(default_p)),
                          systems=NonlinearSystem[],
                          connection_type=nothing,
                          )
+    name === nothing && throw(ArgumentError("The `name` keyword must be provided. Please consider using the `@named` macro"))
     # Move things over, but do not touch array expressions
     eqs = [0 ~ x.rhs - x.lhs for x in collect(eqs)]
 

src/systems/optimization/optimizationsystem.jl

@@ -50,8 +50,9 @@ function OptimizationSystem(op, states, ps;
                             default_u0=Dict(),
                             default_p=Dict(),
                             defaults=_merge(Dict(default_u0), Dict(default_p)),
-                            name = gensym(:OptimizationSystem),
+                            name=nothing,
                             systems = OptimizationSystem[])
+    name === nothing && throw(ArgumentError("The `name` keyword must be provided. Please consider using the `@named` macro"))
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn("`default_u0` and `default_p` are deprecated. Use `defaults` instead.", :OptimizationSystem, force=true)
     end

src/systems/reaction/reactionsystem.jl

@@ -168,12 +168,12 @@ end
 function ReactionSystem(eqs, iv, species, params;
                         observed = [],
                         systems = [],
-                        name = gensym(:ReactionSystem),
+                        name = nothing,
                         default_u0=Dict(),
                         default_p=Dict(),
                         defaults=_merge(Dict(default_u0), Dict(default_p)),
                         connection_type=nothing)
-
+    name === nothing && throw(ArgumentError("The `name` keyword must be provided. Please consider using the `@named` macro"))
     #isempty(species) && error("ReactionSystems require at least one species.")
     ReactionSystem(eqs, iv, species, params, observed, name, systems, defaults, connection_type)
 end
@@ -458,7 +458,7 @@ Finally, a `Vector{Num}` can be provided (the length must be equal to the number
 Here the noise for each reaction is scaled by the corresponding parameter in the input vector.
 This input may contain repeat parameters.
 """
-function Base.convert(::Type{<:SDESystem}, rs::ReactionSystem; 
+function Base.convert(::Type{<:SDESystem}, rs::ReactionSystem;
                       noise_scaling=nothing, name=nameof(rs), combinatoric_ratelaws=true, 
                       include_zero_odes=true, kwargs...)