Skip to content

Commit 20f5ad6

Browse files
authored
Merge branch 'master' into test
2 parents 8b0bc1e + 69c12f8 commit 20f5ad6

File tree

8 files changed

+788
-18
lines changed

8 files changed

+788
-18
lines changed

symengine/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
UndefFunction, Function, FunctionSymbol as AppliedUndef,
1010
have_numpy, true, false, Equality, Unequality, GreaterThan,
1111
LessThan, StrictGreaterThan, StrictLessThan, Eq, Ne, Ge, Le,
12-
Gt, Lt)
12+
Gt, Lt, GoldenRatio, Catalan, EulerGamma)
1313
from .utilities import var, symbols
1414
from .functions import *
1515

symengine/functions.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22
asin, acos, atan, acot, acsc, asec,
33
sinh, cosh, tanh, coth, sech, csch,
44
asinh, acosh, atanh, acoth, asech, acsch,
5-
gamma, log, atan2, sqrt, exp, Abs)
5+
gamma, log, atan2, sqrt, exp, Abs,
6+
LambertW, zeta, dirichlet_eta,
7+
KroneckerDelta, LeviCivita, erf, erfc,
8+
lowergamma, uppergamma, loggamma, beta,
9+
polygamma, sign, floor, ceiling,
10+
conjugate, digamma, trigamma)

symengine/lib/symengine.pxd

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,23 @@ cdef extern from "<symengine/basic.h>" namespace "SymEngine":
274274
bool is_a_StrictLessThan "SymEngine::is_a<SymEngine::StrictLessThan>"(const Basic &b) nogil
275275
bool is_a_PyNumber "SymEngine::is_a<SymEngine::PyNumber>"(const Basic &b) nogil
276276
bool is_a_ATan2 "SymEngine::is_a<SymEngine::ATan2>"(const Basic &b) nogil
277+
bool is_a_LambertW "SymEngine::is_a<SymEngine::LambertW>"(const Basic &b) nogil
278+
bool is_a_Zeta "SymEngine::is_a<SymEngine::Zeta>"(const Basic &b) nogil
279+
bool is_a_DirichletEta "SymEngine::is_a<SymEngine::Dirichlet_eta>"(const Basic &b) nogil
280+
bool is_a_KroneckerDelta "SymEngine::is_a<SymEngine::KroneckerDelta>"(const Basic &b) nogil
281+
bool is_a_LeviCivita "SymEngine::is_a<SymEngine::LeviCivita>"(const Basic &b) nogil
282+
bool is_a_Erf "SymEngine::is_a<SymEngine::Erf>"(const Basic &b) nogil
283+
bool is_a_Erfc "SymEngine::is_a<SymEngine::Erfc>"(const Basic &b) nogil
284+
bool is_a_LowerGamma "SymEngine::is_a<SymEngine::LowerGamma>"(const Basic &b) nogil
285+
bool is_a_UpperGamma "SymEngine::is_a<SymEngine::UpperGamma>"(const Basic &b) nogil
286+
bool is_a_LogGamma "SymEngine::is_a<SymEngine::LogGamma>"(const Basic &b) nogil
287+
bool is_a_Beta "SymEngine::is_a<SymEngine::Beta>"(const Basic &b) nogil
288+
bool is_a_PolyGamma "SymEngine::is_a<SymEngine::PolyGamma>"(const Basic &b) nogil
277289
bool is_a_PySymbol "SymEngine::is_a_sub<SymEngine::PySymbol>"(const Basic &b) nogil
290+
bool is_a_Sign "SymEngine::is_a<SymEngine::Sign>"(const Basic &b) nogil
291+
bool is_a_Floor "SymEngine::is_a<SymEngine::Floor>"(const Basic &b) nogil
292+
bool is_a_Ceiling "SymEngine::is_a<SymEngine::Ceiling>"(const Basic &b) nogil
293+
bool is_a_Conjugate "SymEngine::is_a<SymEngine::Conjugate>"(const Basic &b) nogil
278294

279295
RCP[const Basic] expand(RCP[const Basic] &o) nogil except +
280296

@@ -357,6 +373,9 @@ cdef extern from "<symengine/constants.h>" namespace "SymEngine":
357373
RCP[const Basic] I
358374
RCP[const Basic] E
359375
RCP[const Basic] pi
376+
RCP[const Basic] GoldenRatio
377+
RCP[const Basic] Catalan
378+
RCP[const Basic] EulerGamma
360379
RCP[const Basic] Inf
361380
RCP[const Basic] ComplexInf
362381
RCP[const Basic] Nan
@@ -461,6 +480,26 @@ cdef extern from "<symengine/functions.h>" namespace "SymEngine":
461480
cdef RCP[const Basic] min(const vec_basic &arg) nogil except+
462481
cdef RCP[const Basic] gamma(RCP[const Basic] &arg) nogil except+
463482
cdef RCP[const Basic] atan2(RCP[const Basic] &num, RCP[const Basic] &den) nogil except+
483+
cdef RCP[const Basic] lambertw(RCP[const Basic] &arg) nogil except+
484+
cdef RCP[const Basic] zeta(RCP[const Basic] &s) nogil except+
485+
cdef RCP[const Basic] zeta(RCP[const Basic] &s, RCP[const Basic] &a) nogil except+
486+
cdef RCP[const Basic] dirichlet_eta(RCP[const Basic] &s) nogil except+
487+
cdef RCP[const Basic] kronecker_delta(RCP[const Basic] &i, RCP[const Basic] &j) nogil except+
488+
cdef RCP[const Basic] levi_civita(const vec_basic &arg) nogil except+
489+
cdef RCP[const Basic] erf(RCP[const Basic] &arg) nogil except+
490+
cdef RCP[const Basic] erfc(RCP[const Basic] &arg) nogil except+
491+
cdef RCP[const Basic] lowergamma(RCP[const Basic] &s, RCP[const Basic] &x) nogil except+
492+
cdef RCP[const Basic] uppergamma(RCP[const Basic] &s, RCP[const Basic] &x) nogil except+
493+
cdef RCP[const Basic] loggamma(RCP[const Basic] &arg) nogil except+
494+
cdef RCP[const Basic] beta(RCP[const Basic] &x, RCP[const Basic] &y) nogil except+
495+
cdef RCP[const Basic] polygamma(RCP[const Basic] &n, RCP[const Basic] &x) nogil except+
496+
cdef RCP[const Basic] digamma(RCP[const Basic] &x) nogil except+
497+
cdef RCP[const Basic] trigamma(RCP[const Basic] &x) nogil except+
498+
cdef RCP[const Basic] sign(RCP[const Basic] &x) nogil except+
499+
cdef RCP[const Basic] floor(RCP[const Basic] &x) nogil except+
500+
cdef RCP[const Basic] ceiling(RCP[const Basic] &x) nogil except+
501+
cdef RCP[const Basic] conjugate(RCP[const Basic] &x) nogil except+
502+
464503

465504
cdef cppclass Function(Basic):
466505
pass
@@ -580,6 +619,54 @@ cdef extern from "<symengine/functions.h>" namespace "SymEngine":
580619
cdef cppclass ATan2(Function):
581620
pass
582621

622+
cdef cppclass LambertW(OneArgFunction):
623+
pass
624+
625+
cdef cppclass Zeta(Function):
626+
pass
627+
628+
cdef cppclass Dirichlet_eta(OneArgFunction):
629+
pass
630+
631+
cdef cppclass KroneckerDelta(Function):
632+
pass
633+
634+
cdef cppclass LeviCivita(Function):
635+
pass
636+
637+
cdef cppclass Erf(OneArgFunction):
638+
pass
639+
640+
cdef cppclass Erfc(OneArgFunction):
641+
pass
642+
643+
cdef cppclass LowerGamma(Function):
644+
pass
645+
646+
cdef cppclass UpperGamma(Function):
647+
pass
648+
649+
cdef cppclass LogGamma(OneArgFunction):
650+
pass
651+
652+
cdef cppclass Beta(Function):
653+
pass
654+
655+
cdef cppclass PolyGamma(Function):
656+
pass
657+
658+
cdef cppclass Sign(OneArgFunction):
659+
pass
660+
661+
cdef cppclass Floor(OneArgFunction):
662+
pass
663+
664+
cdef cppclass Ceiling(OneArgFunction):
665+
pass
666+
667+
cdef cppclass Conjugate(OneArgFunction):
668+
pass
669+
583670
IF HAVE_SYMENGINE_MPFR:
584671
cdef extern from "mpfr.h":
585672
ctypedef struct __mpfr_struct:

0 commit comments

Comments
 (0)