@@ -182,6 +182,16 @@ cdef c2py(RCP[const symengine.Basic] o):
182182 r = Function.__new__ (conjugate)
183183 elif (symengine.is_a_PyNumber(deref(o))):
184184 r = PyNumber.__new__ (PyNumber)
185+ elif (symengine.is_a_Infty(deref(o))):
186+ r = Infinity.__new__ (Infinity)
187+ elif (symengine.is_a_Piecewise(deref(o))):
188+ r = Piecewise.__new__ (Piecewise)
189+ elif (symengine.is_a_Contains(deref(o))):
190+ r = Contains.__new__ (Contains)
191+ elif (symengine.is_a_BooleanAtom(deref(o))):
192+ r = BooleanAtom.__new__ (BooleanAtom)
193+ elif (symengine.is_a_Interval(deref(o))):
194+ r = Interval.__new__ (Interval)
185195 else :
186196 raise Exception (" Unsupported SymEngine class."
187197 r.thisptr = o
@@ -354,6 +364,22 @@ def sympy2symengine(a, raise_error=False):
354364 elif isinstance (a, sympy_AppliedUndef):
355365 name = str (a.func)
356366 return function_symbol(name, * (a.args))
367+ elif a == sympy.S.NegativeInfinity:
368+ return - oo
369+ elif a == sympy.S.Infinity:
370+ return oo
371+ elif a == sympy.S.ComplexInfinity:
372+ return zoo
373+ elif a == sympy.S.true:
374+ return BooleanTrue
375+ elif a == sympy.S.false:
376+ return BooleanFalse
377+ elif isinstance (a, (sympy.Piecewise)):
378+ return piecewise(* (a.args))
379+ elif isinstance (a, (sympy.Interval)):
380+ return interval(* (a.args))
381+ elif isinstance (a, (sympy.Contains)):
382+ return contains(* (a.args))
357383 elif isinstance (a, sympy.Function):
358384 return PyFunction(a, a.args, a.func, sympy_module)
359385 elif isinstance (a, sympy.MatrixBase):
@@ -2409,6 +2435,42 @@ class Subs(Basic):
24092435 return self .__class__
24102436
24112437
2438+ cdef class Piecewise(Basic):
2439+ def _sympy_ (self ):
2440+ import sympy
2441+ a = self .args
2442+ l = []
2443+ for i in range (0 , len (a), 2 ):
2444+ l.append((a[i]._sympy_(), a[i + 1 ]._sympy_()))
2445+ return sympy.Piecewise(* l)
2446+
2447+
2448+ cdef class Set(Basic):
2449+ def intersection (self , a ):
2450+ cdef Set other = sympify(a)
2451+ cdef RCP[const symengine.Set] other_ = symengine.rcp_static_cast_Set(other.thisptr)
2452+ return c2py(< RCP[const symengine.Basic]> (deref(symengine.rcp_static_cast_Set(self .thisptr))
2453+ .set_intersection(other_)))
2454+
2455+ def union (self , a ):
2456+ cdef Set other = sympify(a)
2457+ cdef RCP[const symengine.Set] other_ = symengine.rcp_static_cast_Set(other.thisptr)
2458+ return c2py(< RCP[const symengine.Basic]> (deref(symengine.rcp_static_cast_Set(self .thisptr))
2459+ .set_intersection(other_)))
2460+
2461+
2462+ cdef class Interval(Set):
2463+ def _sympy_ (self ):
2464+ import sympy
2465+ return sympy.Interval(* [arg._sympy_() for arg in self .args])
2466+
2467+
2468+ cdef class Contains(Boolean):
2469+ def _sympy_ (self ):
2470+ import sympy
2471+ return sympy.Contains(* [arg._sympy_() for arg in self .args])
2472+
2473+
24122474cdef class MatrixBase:
24132475
24142476 @property
@@ -3701,7 +3763,6 @@ def powermod(a, b, m):
37013763 cdef RCP[const symengine.Integer] m1 = symengine.rcp_static_cast_Integer(_m.thisptr)
37023764 cdef RCP[const symengine.Number] b1 = symengine.rcp_static_cast_Number(_b.thisptr)
37033765 cdef RCP[const symengine.Integer] root
3704-
37053766 cdef cppbool ret_val = symengine.powermod(symengine.outArg_Integer(root), a1, b1, m1)
37063767 if ret_val == 0 :
37073768 return None
@@ -4092,5 +4153,96 @@ def ccode(expr):
40924153 cdef Basic expr_ = sympify(expr)
40934154 return symengine.ccode(deref(expr_.thisptr)).decode(" utf-8"
40944155
4156+
4157+ def to_contains (relational ):
4158+ from sympy import (And, Or, Not, Intersection, Union, Complement,
4159+ S, GreaterThan, LessThan, StrictLessThan,
4160+ StrictGreaterThan, Interval)
4161+ if isinstance (relational, And):
4162+ l = [to_contains(i) for i in relational.args]
4163+ ex = l[0 ].args[0 ]
4164+ if all (elem.args[0 ] == ex for elem in l):
4165+ sset = l[0 ].args[1 ]
4166+ for elem in l:
4167+ sset = sset.intersection(elem.args[1 ])
4168+ return contains(ex, sset)
4169+ else :
4170+ ValueError (' Relational {} cannot be converted to a Contains'
4171+ elif isinstance (relational, Or):
4172+ l = [to_contains(i) for i in relational.args]
4173+ ex = l[0 ].args[0 ]
4174+ if all (elem.args[0 ] == ex for elem in l):
4175+ sset = l[0 ].args[1 ]
4176+ for elem in l:
4177+ sset = sset.union(elem.args[1 ])
4178+ return contains(ex, sset)
4179+ else :
4180+ ValueError (' Relational {} cannot be converted to a Contains'
4181+ elif isinstance (relational, Not):
4182+ elem = to_contains(relational.args[0 ])
4183+ return contains(elem.args[0 ], Complement(S.Reals, elem.args[1 ]._sympy_()))
4184+ if relational == S.true or relational == S.false:
4185+ return sympify(relational)
4186+
4187+ if len (relational.args) != 2 :
4188+ raise ValueError (' Relational must only have two arguments'
4189+
4190+ lhs = relational.args[0 ]
4191+ rhs = relational.args[1 ]
4192+ if isinstance (relational, GreaterThan):
4193+ if rhs.is_Number:
4194+ return contains(lhs, interval(rhs, oo, left_open = False ))
4195+ else :
4196+ return contains(rhs, interval(- oo, rhs, right_open = False ))
4197+ elif isinstance (relational, StrictGreaterThan):
4198+ if rhs.is_Number:
4199+ return contains(lhs, interval(rhs, oo, left_open = True ))
4200+ else :
4201+ return contains(rhs, interval(- oo, rhs, right_open = True ))
4202+ elif isinstance (relational, LessThan):
4203+ if rhs.is_Number:
4204+ return contains(lhs, interval(rhs, oo, left_open = False ))
4205+ else :
4206+ return contains(rhs, interval(- oo, rhs, right_open = False ))
4207+ elif isinstance (relational, StrictLessThan):
4208+ if rhs.is_Number:
4209+ return contains(lhs, interval(rhs, oo, left_open = True ))
4210+ else :
4211+ return contains(rhs, interval(- oo, rhs, right_open = True ))
4212+ else :
4213+ raise ValueError (' Unsupported Relational: {}' __class__ .__name__ ))
4214+
4215+
4216+ def piecewise (*v ):
4217+ cdef symengine.PiecewiseVec vec
4218+ cdef pair[RCP[symengine.const_Basic], RCP[symengine.const_Boolean]] p
4219+ cdef Basic e
4220+ cdef Boolean b
4221+ for expr, rel in v:
4222+ e = sympify(expr)
4223+ b = sympify(to_contains(rel))
4224+ p.first = < RCP[symengine.const_Basic]> e.thisptr
4225+ p.second = < RCP[symengine.const_Boolean]> symengine.rcp_static_cast_Boolean(b.thisptr)
4226+ vec.push_back(p)
4227+ return c2py(symengine.piecewise(symengine.std_move_PiecewiseVec(vec)))
4228+
4229+
4230+ def interval (start , end , left_open = False , right_open = False ):
4231+ cdef Number start_ = sympify(start)
4232+ cdef Number end_ = sympify(end)
4233+ cdef cppbool left_open_ = left_open
4234+ cdef cppbool right_open_ = right_open
4235+ cdef RCP[const symengine.Number] n1 = symengine.rcp_static_cast_Number(start_.thisptr)
4236+ cdef RCP[const symengine.Number] n2 = symengine.rcp_static_cast_Number(end_.thisptr)
4237+ return c2py(symengine.interval(n1, n2, left_open_, right_open_))
4238+
4239+
4240+ def contains (expr , sset ):
4241+ cdef Basic expr_ = sympify(expr)
4242+ cdef Set sset_ = sympify(sset)
4243+ cdef RCP[const symengine.Set] s = symengine.rcp_static_cast_Set(sset_.thisptr)
4244+ return c2py(< RCP[const symengine.Basic]> symengine.contains(expr_.thisptr, s))
4245+
4246+
40954247# Turn on nice stacktraces:
40964248symengine.print_stack_on_segfault()
0 commit comments