Merge pull request #73 from shashi/s/mtk

fixes for new MTK

Author: ChrisRackauckas

Project.toml

@@ -15,7 +15,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 DataStructures = "0.17, 0.18"
 DiffEqBase = "6.5"
 Latexify = "0.11, 0.12, 0.13, 0.14"
-ModelingToolkit = "1.3, 2.0, 3.0"
+ModelingToolkit = "4.0"
 Reexport = "0.2"
 julia = "1.3"
 

src/ParameterizedFunctions.jl

@@ -5,6 +5,8 @@ module ParameterizedFunctions
   using DataStructures, DiffEqBase, Latexify
   using Reexport
   @reexport using ModelingToolkit
+  using ModelingToolkit: Sym, FnType, tosymbol
+
 
   import LinearAlgebra
 

src/ode_def_opts.jl

@@ -1,3 +1,9 @@
+findreplace(ex::Symbol, dict) = get(dict, ex, ex)
+function findreplace(ex::Expr, dict)
+    Expr(ex.head, map(x->findreplace(x, dict), ex.args)...)
+end
+findreplace(ex, dict) = ex
+
 function ode_def_opts(name::Symbol,opts::Dict{Symbol,Bool},curmod,ex::Expr,params...;depvar=:t)
   # depvar is the dependent variable. Defaults to t
   # M is the mass matrix in RosW, must be a constant!
@@ -14,15 +20,20 @@ function ode_def_opts(name::Symbol,opts::Dict{Symbol,Bool},curmod,ex::Expr,param
   ####
 
 
-  t = ModelingToolkit.Variable(:t)()
-  vars = [ModelingToolkit.Variable(x)(t) for x in syms]
-  params = [ModelingToolkit.Variable(x)() for x in Symbol[params...]]
+  t = Sym{Number}(:t)
+  vars = [Sym{FnType{Tuple, Number}}(x)(t) for x in syms]
+  params = [Sym{Number}(x) for x in Symbol[params...]]
+
+  vars_dict = Dict(x=>Symbol(v) for (x, v) in zip(syms, vars))
+
+  # replace x with x(t) if it's a var
+  ex = findreplace(ex, vars_dict)
 
   # Build the Expressions
 
   # Run find replace to make the function expression
   symex = copy(ex) # Different expression for symbolic computations
-  ode_findreplace(ex,symex,indvar_dict,params)
+  #ode_findreplace(ex,symex,indvar_dict,params)
   funcs = build_component_funcs(symex)
   mtk_ops = modelingtoolkitize_expr.(funcs,([t;vars;params],),(curmod,))
 

src/utils.jl

@@ -18,24 +18,25 @@ function build_component_funcs(symex)
 end
 
 function modelingtoolkitize_expr(ex::Expr,vars,curmod)
-    names = [x.op.name for x in vars]
+    names = [tosymbol(x) for x in vars]
     ex.head === :if && (ex = Expr(:call, ifelse, ex.args...))
     ex.head === :call || throw(ArgumentError("internal representation does not support non-call Expr"))
-    op = ex.args[1] ∈ names ? vars[findfirst(x->ex.args[1] == x.op.name,vars)] : getproperty(curmod,ex.args[1]) # HACK
-    args = Expression[modelingtoolkitize_expr(x,vars,curmod) for x in ex.args[2:end]]
-    return Operation(op, args)
+    op = ex.args[1] ∈ names ? vars[findfirst(x->ex.args[1] == tosymbol(x),vars)] : getproperty(curmod,ex.args[1]) # HACK
+    args = [modelingtoolkitize_expr(x,vars,curmod) for x in ex.args[2:end]]
+    return Term(op, args)
 end
 
-function modelingtoolkitize_expr(ex::Variable,vars,curmod)
-    convert(Operation,ex)
+function modelingtoolkitize_expr(ex::Sym,vars,curmod)
+    ex
 end
 
 function modelingtoolkitize_expr(ex::Symbol,vars,curmod)
-    names = [x.op.name for x in vars]
-    op = ex ∈ names ? vars[findfirst(x->ex == x.op.name,vars)] : getproperty(curmod,ex) # HACK
-    convert(Expression,op)
+    names = tosymbol.(vars)
+    idx = findfirst(x->ex == x, names)
+    op = idx !== nothing ? vars[idx] : getproperty(curmod,ex)
+    op
 end
 
 function modelingtoolkitize_expr(ex::Number,vars,curmod)
-    convert(Expression,ex)
+    ex
 end