Symbolic extensions (#401)

* widen applicability of equation syntax
JuliaMath · Sep 29, 2023 · 2e7c255 · 2e7c255 · jverzani · Sep 29, 2023
1 parent fbd0ad4
commit 2e7c255
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 0 deletions.
diff --git a/ext/RootsSymPyExt.jl b/ext/RootsSymPyExt.jl
@@ -11,5 +11,20 @@ function Roots.Callable_Function(M::Roots.AbstractUnivariateZeroMethod, f::SymPy
     Roots.Callable_Function(M, lambdify(f), p)
 end
 
+function Roots.FnWrapper(f::SymPy.Sym)
+    if f.is_Equality == true
+        f = lhs(f) - rhs(f)
+    end
+    Roots.FnWrapper(lambdify(f))
+end
+
+
+## allow find_zeros to use symbolic equation
+function Roots.find_zeros(f::SymPy.Sym, a, b=nothing; kwargs...)
+    if f.is_Equality == true
+        f = lhs(f) - rhs(f)
+    end
+    find_zeros(lambdify(f), a, b; kwargs...)
+end
 
 end
diff --git a/ext/RootsSymPyPythonCallExt.jl b/ext/RootsSymPyPythonCallExt.jl
@@ -11,5 +11,21 @@ function Roots.Callable_Function(M::Roots.AbstractUnivariateZeroMethod, f::SymPy
     Roots.Callable_Function(M, lambdify(f), p)
 end
 
+function Roots.FnWrapper(f::SymPyPythonCall.Sym)
+    if f.is_Equality == true
+        f = lhs(f) - rhs(f)
+    end
+    Roots.FnWrapper(lambdify(f))
+end
+
+
+## allow find_zeros to use symbolic equation
+function Roots.find_zeros(f::SymPyPythonCall.Sym, a, b=nothing; kwargs...)
+    if f.is_Equality == true
+        f = lhs(f) - rhs(f)
+    end
+    find_zeros(lambdify(f), a, b; kwargs...)
+end
+
 
 end
diff --git a/test/test_extensions.jl b/test/test_extensions.jl
@@ -2,19 +2,47 @@
 using SymPy
 @testset "SymPy" begin
     SymPy.@syms x
+
     @test find_zero(cos(x) ~ 1/2, (0, pi/2)) ≈ find_zero(x -> cos(x) - 1/2, (0, pi/2))
     @test find_zero(1/2 ~ cos(x), (0, pi/2)) ≈ find_zero(x -> 1/2 - cos(x), (0, pi/2))
     @test find_zero(cos(x) ~ x/2, (0, pi/2)) ≈ find_zero(x -> cos(x) - x/2, (0, pi/2))
+
+    @test find_zeros(cos(x) ~ 1/2, (0, pi/2)) ≈ find_zeros(x -> cos(x) - 1/2, (0, pi/2))
+    @test find_zeros(1/2 ~ cos(x), (0, pi/2)) ≈ find_zeros(x -> 1/2 - cos(x), (0, pi/2))
+    @test find_zeros(cos(x) ~ x/2, (0, pi/2)) ≈ find_zeros(x -> cos(x) - x/2, (0, pi/2))
+
+    @test fzero(cos(x) ~ 1/2, 0, pi/2) ≈ fzero(x -> cos(x) - 1/2, 0, pi/2)
+    @test fzero(1/2 ~ cos(x), 0, pi/2) ≈ fzero(x -> 1/2 - cos(x), 0, pi/2)
+    @test fzero(cos(x) ~ x/2, 0, pi/2) ≈ fzero(x -> cos(x) - x/2, 0, pi/2)
+
+    @test fzeros(cos(x) ~ 1/2, 0, pi/2) ≈ fzeros(x -> cos(x) - 1/2, 0, pi/2)
+    @test fzeros(1/2 ~ cos(x), 0, pi/2) ≈ fzeros(x -> 1/2 - cos(x), 0, pi/2)
+    @test fzeros(cos(x) ~ x/2, 0, pi/2) ≈ fzeros(x -> cos(x) - x/2, 0, pi/2)
+
 end
 =#
 
 #=
 using SymPyPythonCall
 @testset "SymPythonCall" begin
     SymPyPythonCall.@syms x
+
     @test find_zero(cos(x) ~ 1/2, (0, pi/2)) ≈ find_zero(x -> cos(x) - 1/2, (0, pi/2))
     @test find_zero(1/2 ~ cos(x), (0, pi/2)) ≈ find_zero(x -> 1/2 - cos(x), (0, pi/2))
     @test find_zero(cos(x) ~ x/2, (0, pi/2)) ≈ find_zero(x -> cos(x) - x/2, (0, pi/2))
+
+    @test find_zeros(cos(x) ~ 1/2, (0, pi/2)) ≈ find_zeros(x -> cos(x) - 1/2, (0, pi/2))
+    @test find_zeros(1/2 ~ cos(x), (0, pi/2)) ≈ find_zeros(x -> 1/2 - cos(x), (0, pi/2))
+    @test find_zeros(cos(x) ~ x/2, (0, pi/2)) ≈ find_zeros(x -> cos(x) - x/2, (0, pi/2))
+
+    @test fzero(cos(x) ~ 1/2, 0, pi/2) ≈ fzero(x -> cos(x) - 1/2, 0, pi/2)
+    @test fzero(1/2 ~ cos(x), 0, pi/2) ≈ fzero(x -> 1/2 - cos(x), 0, pi/2)
+    @test fzero(cos(x) ~ x/2, 0, pi/2) ≈ fzero(x -> cos(x) - x/2, 0, pi/2)
+
+    @test fzeros(cos(x) ~ 1/2, 0, pi/2) ≈ fzeros(x -> cos(x) - 1/2, 0, pi/2)
+    @test fzeros(1/2 ~ cos(x), 0, pi/2) ≈ fzeros(x -> 1/2 - cos(x), 0, pi/2)
+    @test fzeros(cos(x) ~ x/2, 0, pi/2) ≈ fzeros(x -> cos(x) - x/2, 0, pi/2)
+
 end
 =#