robustness

Author: ChrisRackauckas

REQUIRE

@@ -3,3 +3,4 @@ SymEngine 0.1.2
 DataStructures 0.4.6
 DiffEqBase 0.14.0
 SimpleTraits 0.1.1
+Iterators

src/ParameterizedFunctions.jl

@@ -14,7 +14,7 @@ module ParameterizedFunctions
     delete!(ENV,"symengine_jl_safe_failure")
   end
 
-  using DataStructures, DiffEqBase, SimpleTraits
+  using DataStructures, DiffEqBase, SimpleTraits, Iterators
   import Base: getindex
 
   const FEM_SYMBOL_DICT = Dict{Symbol,Expr}(:x=>:(x[:,1]),:y=>:(x[:,2]),:z=>:(x[:,3]))

src/dict_build.jl

@@ -1,11 +1,17 @@
 function build_indvar_dict(ex)
   indvar_dict = OrderedDict{Symbol,Int}()
+  cur_sym = 0
   for i in 2:2:length(ex.args) #Every odd line is line number
     arg = ex.args[i].args[1] #Get the first thing, should be dsomething
-    nodarg = Symbol(string(arg)[2:end]) #Take off the d
-    if !haskey(indvar_dict,nodarg)
-      s = string(arg)
-      indvar_dict[Symbol(string(arg)[2:end])] = i/2 # and label it the next int if not seen before
+    firstarg = Symbol(first(string(arg))) # Check for d
+    if firstarg == :d
+      nodarg = Symbol(join(drop(string(arg), 1))) # join(drop(s, 1)) is 2:end
+      if !haskey(indvar_dict,nodarg)
+        cur_sym += 1
+        indvar_dict[nodarg] = cur_sym
+      else
+        error("The derivative term for $nodarg is repeated. This is not allowed.")
+      end
     end
   end
   syms = indvar_dict.keys

test/runtests.jl

@@ -18,6 +18,11 @@ f_t2 = @ode_def_noinvjac SymCheck2 begin # Checks for error due to symbol on 1
   dy = -c*y + d*x*y*t^2
 end a=>1.5 b=>1 c=3 d=1
 
+f_t3 = @ode_def_noinvjac ExprCheck begin # Checks for error due to symbol on 1
+  dx = a*x - b*x*y
+  dy = -c*y + d*x*y
+end a=>1.5 b=>2.0 c=t*x d=2pi # Change to π after unicode fix
+
 f = @ode_def_noinvhes LotkaVolterra begin
   dx = a*x - b*x*y
   dy = -c*y + d*x*y
@@ -123,16 +128,26 @@ println("Test booleans")
 
 @code_llvm has_paramjac(f)
 
+println("Test difficult differentiable")
+NJ = @ode_def_nohes DiffDiff begin
+  dx = a*x - b*x*y
+  dy = -c*y + erf(x*y/d)
+end a=>1.5 b=>1 c=3 d=4
+NJ(t,u,du)
+@test du == [-3.0;-3*3.0 + erf(2.0*3.0/4)]
+@test du == NJ(t,u)
+# NJ(Val{:jac},t,u,J) # Currently gives E not defined, will be fixed by the next SymEgine
+
 test_fail(x,y,d) = erf(x*y/d)
 println("Test non-differentiable")
 NJ = @ode_def NoJacTest begin
   dx = a*x - b*x*y
-  dy = -c*y + erf(x*y/d)
+  dy = -c*y + test_fail(x,y,d)
 end a=>1.5 b=>1 c=3 d=4
 NJ(t,u,du)
 @test du == [-3.0;-3*3.0 + erf(2.0*3.0/4)]
 @test du == NJ(t,u)
-
+# NJ(Val{:jac},t,u,J) # Currently gives E not defined, will be fixed by the next SymEgine
 ### FEM Macros
 
 println("Test FEM")