Merge pull request #10 from SciML/master

SymPy fixed in tests

Author: shahriariravanian

Project.toml

@@ -1,23 +1,24 @@
 name = "SymbolicNumericIntegration"
 uuid = "78aadeae-fbc0-11eb-17b6-c7ec0477ba9e"
 authors = ["Shahriar Iravanian <[email protected]>"]
-version = "0.8.3"
+version = "0.8.4"
 
 [deps]
 DataDrivenDiffEq = "2445eb08-9709-466a-b3fc-47e12bd697a2"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+SymPy = "24249f21-da20-56a4-8eb1-6a02cf4ae2e6"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 
 [compat]
 DataDrivenDiffEq = "0.8"
 DataStructures = "0.18"
 PyCall = "1"
+SymPy = "1"
 SymbolicUtils = "0.19"
 Symbolics = "4"
-SymPy = "1"
 julia = "1.6"
 
 [extras]

test/axiom.jl

@@ -97,7 +97,7 @@ function accept_integral(sol, ans, x; radius=1.0, abstol=1e-3, n=5)
         ϵ = zeros(n)
         for i = 1:n
             x₀ = test_point(true, radius)
-            ϵ[i] = value(abs(substitute(sol - ans, Dict(x => x₀))))
+            ϵ[i] = Symbolics.value(abs(substitute(sol - ans, Dict(x => x₀))))
         end
         return maximum(ϵ) - minimum(ϵ) <= abstol
     catch e
@@ -127,7 +127,7 @@ function test_axiom(L, try_sympy=true; kwargs...)
         if isequal(sol, 0)
             printstyled("\tFailure\n"; color=:red)
             n_fail += 1
-        elseif accept_integral(value(sol), value(ans), x)
+        elseif accept_integral(Symbolics.value(sol), Symbolics.value(ans), x)
             printstyled("\tSuccess:\t", sol, '\n'; color=:cyan)
             n_ok += 1
         else

test/runtests.jl

@@ -5,7 +5,8 @@ using SymbolicUtils
 using SymbolicUtils.Rewriters
 
 using Test
-using PyCall, SymPy
+using PyCall
+import SymPy
 
 
 include("axiom.jl")