Merge pull request #61 from JuliaDiffEq/mtk

Change to ModelingToolkit

Author: ChrisRackauckas

.travis.yml

@@ -2,13 +2,11 @@
 language: julia
 os:
   - linux
-  - osx
 julia:
-  - 1.0
-  - nightly
-matrix:
-  allow_failures:
-    - julia: nightly
+  - 1
+#matrix:
+#  allow_failures:
+#    - julia: nightly
 notifications:
   email: false
 # uncomment the following lines to override the default test script

Project.toml

@@ -1,25 +1,24 @@
 name = "ParameterizedFunctions"
 uuid = "65888b18-ceab-5e60-b2b9-181511a3b968"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "4.2.1"
+version = "5.0.0"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-SymEngine = "123dc426-2d89-5057-bbad-38513e3affd8"
+ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 
 [compat]
 DataStructures = "0.17"
 DiffEqBase = "6.5"
-SymEngine = "0.7"
-julia = "1"
+ModelingToolkit = "1.3"
+julia = "1.3"
 
 [extras]
-DiffEqProblemLibrary = "a077e3f3-b75c-5d7f-a0c6-6bc4c8ec64a9"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["DiffEqProblemLibrary", "InteractiveUtils", "SpecialFunctions", "Test"]
+test = ["InteractiveUtils", "SpecialFunctions", "Test"]

appveyor.yml

@@ -1,8 +1,6 @@
 environment:
   matrix:
-  - julia_version: 0.7
   - julia_version: 1
-  - julia_version: nightly
 
 platform:
   - x86 # 32-bit

src/ParameterizedFunctions.jl

@@ -2,36 +2,17 @@ __precompile__()
 
 module ParameterizedFunctions
 
-  if haskey(ENV, "symengine_jl_safe_failure")
-    pre_env_value = ENV["symengine_jl_safe_failure"]
-  end
-
-  ENV["symengine_jl_safe_failure"] = "yes"
-
-  using SymEngine
-
-  if @isdefined pre_env_value
-    ENV["symengine_jl_safe_failure"] = pre_env_value
-  else
-    delete!(ENV,"symengine_jl_safe_failure")
-  end
-
-  using DataStructures, DiffEqBase
+  using DataStructures, DiffEqBase, ModelingToolkit
 
   import LinearAlgebra
 
   import Base: getindex
 
-  const FEM_SYMBOL_DICT = Dict{Symbol,Expr}(:x=>:(x[:,1]),:y=>:(x[:,2]),:z=>:(x[:,3]))
-
   include("ode_def_opts.jl")
-  include("symengine_utils.jl")
   include("ode_findrep.jl")
-  include("func_builds.jl")
-  include("maketype.jl")
+  include("utils.jl")
   include("dict_build.jl")
   include("macros.jl")
-  include("utils.jl")
 
   export @ode_def,ode_def_opts,@ode_def_bare, @ode_def_all
 end # module

src/func_builds.jl

@@ -8,8 +8,8 @@ macro ode_def(name,ex,params...)
     :build_hes => false,
     :build_invhes => false,
     :build_dpfuncs => true)
-    name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
-        ode_def_opts(name,opts,ex,params...)
+    name isa Expr ? ode_def_opts(gensym(),opts,__module__,name,ex,params...) :
+        ode_def_opts(name,opts,__module__,ex,params...)
 end
 
 macro ode_def_bare(name,ex,params...)
@@ -22,8 +22,8 @@ macro ode_def_bare(name,ex,params...)
     :build_hes => false,
     :build_invhes => false,
     :build_dpfuncs => false)
-    name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
-        ode_def_opts(name,opts,ex,params...)
+    name isa Expr ? ode_def_opts(gensym(),opts,__module__,name,ex,params...) :
+        ode_def_opts(name,opts,__module__,ex,params...)
 end
 
 macro ode_def_all(name,ex,params...)
@@ -36,6 +36,6 @@ macro ode_def_all(name,ex,params...)
     :build_hes => false,
     :build_invhes => false,
     :build_dpfuncs => true)
-    name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
-        ode_def_opts(name,opts,ex,params...)
+    name isa Expr ? ode_def_opts(gensym(),opts,__module__,name,ex,params...) :
+        ode_def_opts(name,opts,__module__,ex,params...)
 end