Generalized check_dependence to check_variables - now it also ensures the independent variable isn't in the dependent variables.

Author: lamorton

src/systems/control/controlsystem.jl

@@ -73,7 +73,7 @@ struct ControlSystem <: AbstractControlSystem
     """
     defaults::Dict
     function ControlSystem(loss, deqs, iv, dvs, controls,ps, observed, name, systems, defaults)
-        check_dependence(dvs,iv)
+        check_variables(dvs,iv)
         check_parameters(ps,iv)
         new(loss, deqs, iv, dvs, controls,ps, observed, name, systems, defaults)
     end

src/systems/diffeqs/odesystem.jl

@@ -75,7 +75,7 @@ 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

src/systems/diffeqs/sdesystem.jl

@@ -77,7 +77,7 @@ struct SDESystem <: AbstractODESystem
     connection_type::Any
 
     function SDESystem(deqs, neqs, iv, dvs, ps, observed, tgrad, jac, Wfact, Wfact_t, name, systems, defaults, connection_type)
-        check_dependence(dvs,iv)
+        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

src/systems/discrete_system/discrete_system.jl

@@ -50,7 +50,7 @@ struct DiscreteSystem <: AbstractSystem
     """
     default_p::Dict
     function DiscreteSystem(discreteEqs, iv, dvs, ps, observed, name, systems, default_u0, default_p)
-        check_dependence(dvs,iv)
+        check_variables(dvs,iv)
         check_parameters(ps,iv)
         new(discreteEqs, iv, dvs, ps, observed, name, systems, default_u0, default_p)
     end

src/systems/jumps/jumpsystem.jl

@@ -52,7 +52,7 @@ struct JumpSystem{U <: ArrayPartition} <: AbstractSystem
     """
     connection_type::Any
     function JumpSystem{U}(ap::U, iv, states, ps, observed, name, systems, defaults, connection_type) where U <: ArrayPartition
-        check_dependence(states,iv)
+        check_variables(states,iv)
         check_parameters(ps,iv)
         new{U}(ap, iv, states, ps, observed, name, systems, defaults, connection_type)
     end

src/systems/reaction/reactionsystem.jl

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

src/utils.jl

@@ -111,8 +111,9 @@ function check_parameters(ps,iv)
     end
 end
 
-function check_dependence(dvs,iv)
+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