Skip to content

Commit 072ad2d

Browse files
committed
WIP
1 parent fc40a8a commit 072ad2d

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

ext/SymPyPythonCallSymbolicsExt.jl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ module SymPyPythonCallSymbolicsExt
22

33
# from https://github.com/JuliaSymbolics/Symbolics.jl/pull/957/
44
# by @jClugstor
5-
using SymPyPythonCall
5+
import SymPyPythonCall
66
const sp = SymPyPythonCall.sympy.py
77
const PythonCall = SymPyPythonCall.PythonCall
8-
import SymPyPythonCall.PythonCall: Py, pyisinstance, pyconvert
8+
import PythonCall: Py, pyisinstance, pyconvert
99

1010
import Symbolics
1111
import Symbolics: @variables
@@ -38,21 +38,20 @@ end
3838

3939
function pyconvert_rule_sympy_add(::Type{Symbolics.Num}, x::Py)
4040
if !pyisinstance(x,sp.Add)
41-
return PythonCall.pyconvert_unconverted()
41+
return PythonCall.pyconvert_unconverted()
4242
end
4343
sum = reduce(+, PythonCall.pyconvert.(Symbolics.Num,x.args))
4444
return PythonCall.pyconvert_return(sum)
4545
end
4646

4747
function pyconvert_rule_sympy_equality(::Type{Symbolics.Equation}, x::Py)
4848
if !pyisinstance(x,sp.Equality)
49-
return PythonCall.pyconvert_unconverted()
49+
return PythonCall.pyconvert_unconverted()
5050
end
5151
rhs = pyconvert(Symbolics.Num,x.rhs)
5252
lhs = pyconvert(Symbolics.Num,x.lhs)
5353
return PythonCall.pyconvert_return(rhs ~ lhs)
5454
end
55-
5655
function pyconvert_rule_sympy_derivative(::Type{Symbolics.Num}, x::Py)
5756
if !pyisinstance(x,sp.Derivative)
5857
return PythonCall.pyconvert_unconverted()
@@ -74,10 +73,10 @@ function pyconvert_rule_sympy_function(::Type{Symbolics.Num}, x::Py)
7473
end
7574

7675
# added rules
77-
PythonCall.pyconvert_add_rule("sympy.core.power:Pow", Symbolics.Num, pyconvert_rule_sympy_pow)
78-
7976
PythonCall.pyconvert_add_rule("sympy.core.symbol:Symbol", Symbolics.Num, pyconvert_rule_sympy_symbol)
8077

78+
PythonCall.pyconvert_add_rule("sympy.core.power:Pow", Symbolics.Num, pyconvert_rule_sympy_pow)
79+
8180
PythonCall.pyconvert_add_rule("sympy.core.mul:Mul", Symbolics.Num, pyconvert_rule_sympy_mul)
8281

8382
PythonCall.pyconvert_add_rule("sympy.core.add:Add", Symbolics.Num, pyconvert_rule_sympy_add)

0 commit comments

Comments
 (0)