Merge pull request #1064 from lamorton/fix_1063

Ensure independent variable is not in parameters

Author: ChrisRackauckas

src/systems/control/controlsystem.jl

@@ -72,6 +72,11 @@ struct ControlSystem <: AbstractControlSystem
     parameters are not supplied in `ODEProblem`.
     """
     defaults::Dict
+    function ControlSystem(loss, deqs, iv, dvs, controls,ps, observed, name, systems, defaults)
+        check_variables(dvs,iv)
+        check_parameters(ps,iv)
+        new(loss, deqs, iv, dvs, controls,ps, observed, name, systems, defaults)
+    end
 end
 
 function ControlSystem(loss, deqs::AbstractVector{<:Equation}, iv, dvs, controls, ps;

src/systems/diffeqs/odesystem.jl

@@ -75,17 +75,12 @@ struct ODESystem <: AbstractODESystem
     connection_type::Any
 
     function ODESystem(deqs, iv, dvs, ps, observed, tgrad, jac, Wfact, Wfact_t, name, systems, defaults, structure, connection_type)
-        check_dependence(dvs,iv)
+        check_variables(dvs,iv)
+        check_parameters(ps,iv)
         new(deqs, iv, dvs, ps, observed, tgrad, jac, Wfact, Wfact_t, name, systems, defaults, structure, connection_type)
     end
 end
 
-function check_dependence(dvs,iv)
-    for dv in dvs
-        isequal(iv, iv_from_nested_derivative(dv)) || throw(ArgumentError("Variable $dv is not a function of independent variable $iv."))
-    end
-end 
-
 function ODESystem(
                    deqs::AbstractVector{<:Equation}, iv, dvs, ps;
                    observed = Num[],
@@ -117,10 +112,6 @@ function ODESystem(
     ODESystem(deqs, iv′, dvs′, ps′, observed, tgrad, jac, Wfact, Wfact_t, name, systems, defaults, nothing, connection_type)
 end
 
-iv_from_nested_derivative(x::Term) = operation(x) isa Differential ? iv_from_nested_derivative(arguments(x)[1]) : arguments(x)[1]
-iv_from_nested_derivative(x::Sym) = x
-iv_from_nested_derivative(x) = missing
-
 vars(x::Sym) = Set([x])
 vars(exprs::Symbolic) = vars([exprs])
 vars(exprs) = foldl(vars!, exprs; init = Set())

src/systems/diffeqs/sdesystem.jl

@@ -75,6 +75,12 @@ struct SDESystem <: AbstractODESystem
     type: type of the system
     """
     connection_type::Any
+
+    function SDESystem(deqs, neqs, iv, dvs, ps, observed, tgrad, jac, Wfact, Wfact_t, name, systems, defaults, connection_type)
+        check_variables(dvs,iv)
+        check_parameters(ps,iv)
+        new(deqs, neqs, iv, dvs, ps, observed, tgrad, jac, Wfact, Wfact_t, name, systems, defaults, connection_type)
+    end
 end
 
 function SDESystem(deqs::AbstractVector{<:Equation}, neqs, iv, dvs, ps;

src/systems/discrete_system/discrete_system.jl

@@ -49,6 +49,11 @@ struct DiscreteSystem <: AbstractSystem
     in `DiscreteSystem`.
     """
     default_p::Dict
+    function DiscreteSystem(discreteEqs, iv, dvs, ps, observed, name, systems, default_u0, default_p)
+        check_variables(dvs,iv)
+        check_parameters(ps,iv)
+        new(discreteEqs, iv, dvs, ps, observed, name, systems, default_u0, default_p)
+    end
 end
 
 """

src/systems/jumps/jumpsystem.jl

@@ -51,6 +51,11 @@ struct JumpSystem{U <: ArrayPartition} <: AbstractSystem
     type: type of the system
     """
     connection_type::Any
+    function JumpSystem{U}(ap::U, iv, states, ps, observed, name, systems, defaults, connection_type) where U <: ArrayPartition
+        check_variables(states,iv)
+        check_parameters(ps,iv)
+        new{U}(ap, iv, states, ps, observed, name, systems, defaults, connection_type)
+    end
 end
 
 function JumpSystem(eqs, iv, states, ps;

src/systems/reaction/reactionsystem.jl

@@ -151,7 +151,12 @@ struct ReactionSystem <: AbstractSystem
     systems::Vector
 
     function ReactionSystem(eqs, iv, states, ps, observed, name, systems)
-        new(eqs, value(iv), value.(states), value.(ps), observed, name, systems)
+        iv′ = value(iv)
+        states′ = value.(states)
+        ps′ = value.(ps)
+        check_variables(states′,iv′)
+        check_parameters(ps′,iv′)
+        new(eqs, iv′, states′, ps′, observed, name, systems)
     end
 end
 

src/utils.jl

@@ -104,3 +104,20 @@ function _readable_code(ex)
     expr
 end
 readable_code(expr) = JuliaFormatter.format_text(string(Base.remove_linenums!(_readable_code(expr))))
+
+function check_parameters(ps,iv)
+    for p in ps
+        isequal(iv,p) && throw(ArgumentError("Independent variable $iv not allowed in parameters."))
+    end
+end
+
+function check_variables(dvs,iv)
+    for dv in dvs
+        isequal(iv,dv) && throw(ArgumentError("Independent variable $iv not allowed in dependent variables."))
+        isequal(iv, iv_from_nested_derivative(dv)) || throw(ArgumentError("Variable $dv is not a function of independent variable $iv."))
+    end
+end 
+
+iv_from_nested_derivative(x::Term) = operation(x) isa Differential ? iv_from_nested_derivative(arguments(x)[1]) : arguments(x)[1]
+iv_from_nested_derivative(x::Sym) = x
+iv_from_nested_derivative(x) = missing

test/jumpsystem.jl

@@ -3,7 +3,7 @@ MT = ModelingToolkit
 
 # basic MT SIR model with tweaks
 @parameters β γ t
-@variables S I R
+@variables S(t) I(t) R(t)
 rate₁   = β*S*I
 affect₁ = [S ~ S - 1, I ~ I + 1]
 rate₂   = γ*I+t

test/odesystem.jl

@@ -328,6 +328,11 @@ eqs = [
 ]
 @test_throws ArgumentError ODESystem(eqs,t,vars,pars)
 
+#Issue 1063/998
+pars =[t]
+vars = @variables((u1(t),))
+@test_throws ArgumentError ODESystem(eqs,t,vars,pars)
+
 @variables x(t)
 D = Differential(t)
 @parameters M b k