get odesystem tests to pass

Author: shashi

src/build_function.jl

@@ -455,7 +455,6 @@ end
 function term_to_symbol(t::Term)
     if operation(t) isa Sym
         s = nameof(operation(t))
-        @show s
     else
         error("really?")
     end

src/systems/diffeqs/abstractodesystem.jl

@@ -90,13 +90,11 @@ function calculate_massmatrix(sys::AbstractODESystem; simplify=true)
     dvs = states(sys)
     M = zeros(length(eqs),length(eqs))
     for (i,eq) in enumerate(eqs)
-        if eq.lhs isa Constant
-            @assert eq.lhs.value == 0
-        elseif eq.lhs.op isa Differential
+        if eq.lhs isa Term && eq.lhs.op isa Differential
             j = findfirst(x->isequal(term_to_symbol(x),term_to_symbol(var_from_nested_derivative(eq.lhs)[1])),dvs)
             M[i,j] = 1
         else
-            error("Only semi-explicit constant mass matrices are currently supported. Faulty equation: $eq.")
+            eq.lhs == 0 || error("Only semi-explicit constant mass matrices are currently supported. Faulty equation: $eq.")
         end
     end
     M = simplify ? ModelingToolkit.simplify.(M) : M
@@ -107,7 +105,7 @@ end
 
 jacobian_sparsity(sys::AbstractODESystem) =
     jacobian_sparsity([eq.rhs for eq ∈ equations(sys)],
-                      [dv(sys.iv()) for dv in states(sys)])
+                      [dv for dv in states(sys)])
 
 function DiffEqBase.ODEFunction(sys::AbstractODESystem, args...; kwargs...)
     ODEFunction{true}(sys, args...; kwargs...)

src/systems/diffeqs/modelingtoolkitize.jl

@@ -7,9 +7,10 @@ function modelingtoolkitize(prob::DiffEqBase.ODEProblem)
     prob.f isa DiffEqBase.AbstractParameterizedFunction &&
                             return (prob.f.sys, prob.f.sys.states, prob.f.sys.ps)
     @parameters t
-    vars = reshape([Variable(:x, i)(t) for i in eachindex(prob.u0)],size(prob.u0))
+    var(x, i) = Sym{FnType{Tuple{symtype(t)}, Number}}(nameof(Variable(:x, i)))
+    vars = reshape([var(:x, i)(t) for i in eachindex(prob.u0)],size(prob.u0))
     params = prob.p isa DiffEqBase.NullParameters ? [] :
-             reshape([Variable(:α,i)() for i in eachindex(prob.p)],size(prob.p))
+             reshape([Variable(:α,i) for i in eachindex(prob.p)],size(prob.p))
     @derivatives D'~t
 
     rhs = [D(var) for var in vars]

src/variables.jl

@@ -241,8 +241,8 @@ creates the array of values in the correct order
 function varmap_to_vars(varmap::AbstractArray{<:Pair},varlist)
     out = similar(varmap,typeof(last(first(varmap))))
     for i in 1:length(varmap)
-        ivar = convert(Variable,varmap[i][1])
-        j = findfirst(x->ivar.name == convert(Variable,x).name,varlist)
+        ivar = varmap[i][1]
+        j = findfirst(isequal(ivar),varlist)
         out[j] = varmap[i][2]
     end
 

test/odesystem.jl

@@ -50,7 +50,6 @@ u  = SVector(1:3...)
 p  = SVector(4:6...)
 @test f(u, p, 0.1) === @SArray [4, 0, -16]
 
-@show y
 eqs = [D(x) ~ σ*(y-x),
        D(y) ~ x*(ρ-z)-y*t,
        D(z) ~ x*y - β*z]