Merge remote-tracking branch 'origin/s/array-fixes' into s/array-fixes

Author: shashi

Project.toml

@@ -69,8 +69,8 @@ SciMLBase = "1.3"
 Setfield = "0.7"
 SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0"
 StaticArrays = "0.10, 0.11, 0.12, 1.0"
-SymbolicUtils = "0.11.0"
-Symbolics = "0.1.21"
+SymbolicUtils = "0.12"
+Symbolics = "1"
 UnPack = "0.1, 1.0"
 Unitful = "1.1"
 julia = "1.2"

src/ModelingToolkit.jl

@@ -40,7 +40,7 @@ import JuliaFormatter
 using Reexport
 @reexport using Symbolics
 export @derivatives
-using Symbolics: _parse_vars, value, makesym, @derivatives, get_variables,
+using Symbolics: _parse_vars, value, @derivatives, get_variables,
                  exprs_occur_in, solve_for, build_expr
 import Symbolics: rename, get_variables!, _solve, hessian_sparsity,
                   jacobian_sparsity, islinear, _iszero, _isone,

src/systems/diffeqs/abstractodesystem.jl

@@ -79,7 +79,6 @@ function generate_function(
     # substitute x(t) by just x
     rhss = implicit_dae ? [_iszero(eq.lhs) ? eq.rhs : eq.rhs - eq.lhs for eq in eqs] :
                           [eq.rhs for eq in eqs]
-    #obss = [makesym(value(eq.lhs)) ~ substitute(eq.rhs, sub) for eq ∈ observed(sys)]
     #rhss = Let(obss, rhss)
 
     # TODO: add an optional check on the ordering of observed equations

src/systems/nonlinear/nonlinearsystem.jl

@@ -105,7 +105,6 @@ function generate_function(sys::NonlinearSystem, dvs = states(sys), ps = paramet
     #fulldvs = [dvs; obsvars]
 
     rhss = [deq.rhs for deq ∈ equations(sys)]
-    #obss = [makesym(value(eq.lhs)) ~ substitute(eq.rhs, sub) for eq ∈ observed(sys)]
     #rhss = Let(obss, rhss)
 
     return build_function(rhss, value.(dvs), value.(ps);