Merge pull request #964 from SciML/myb/ae

Fix faulty alias elimination

Author: YingboMa

src/systems/alias_elimination.jl

@@ -3,13 +3,8 @@ using SymbolicUtils: Rewriters
 const KEEP = typemin(Int)
 
 function alias_elimination(sys)
-    # FIXME: update `structure` too
-    #sys = flatten(sys)
-    #s = get_structure(sys)
-    #if !(s isa SystemStructure)
     sys = initialize_system_structure(sys)
     s = structure(sys)
-    #end
     is_linear_equations, eadj, cadj = find_linear_equations(sys)
 
     v_eliminated, v_types, n_null_vars, degenerate_equations, linear_equations = alias_eliminate_graph(

src/systems/systemstructure.jl

@@ -227,7 +227,7 @@ function find_linear_equations(sys)
             c = expand_derivatives(Differential(var)(term), false)
             # test if `var` is linear in `eq`.
             if !(c isa Symbolic) && c isa Number
-                if isinteger(c) && !iszero(c)
+                if c == 1 || c == -1
                     c = convert(Integer, c)
                     linear_term += c * var
                     push!(coeffs, c)

test/reduction.jl

@@ -247,3 +247,33 @@ eqs = [
       ]
 @named sys = ODESystem(eqs, t, sts, params)
 @test_throws ModelingToolkit.InvalidSystemException structural_simplify(sys)
+
+# issue #963
+@parameters t
+D = Differential(t)
+@variables v47(t) v57(t) v66(t) v25(t) i74(t) i75(t) i64(t) i71(t) v1(t) v2(t)
+
+eq = [
+      v47 ~ v1
+      v47 ~ sin(10t)
+      v57 ~ v1 - v2
+      v57 ~ 10.0i64
+      v66 ~ v2
+      v66 ~ 5.0i74
+      v25 ~ v2
+      i75 ~ 0.005 * D(v25)
+      0 ~ i74 + i75 - i64
+      0 ~ i64 + i71]
+
+
+sys0 = ODESystem(eq, t)
+sys = structural_simplify(sys0)
+@test length(equations(sys)) == 1
+eq = equations(sys)[1]
+@test isequal(eq.lhs, 0)
+dv25 = ModelingToolkit.value(ModelingToolkit.derivative(eq.rhs, v25))
+ddv25 = ModelingToolkit.value(ModelingToolkit.derivative(eq.rhs, D(v25)))
+dt = ModelingToolkit.value(ModelingToolkit.derivative(eq.rhs, sin(10t)))
+@test dv25 ≈ 0.3
+@test ddv25 == 0.005
+@test dt == -0.1