Made log(exp(Pi)) evaluate to Pi.

[ginac.git] / ginac / constant.cpp

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 5cfecc96a6dde2e9c68483f4a1a0bef20dd6d64c..8ae372be1965c26a8d8549cad381a74e8f853ae0 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -44,7 +44,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(constant, basic,
 
 // public
 
 
 // public
 

-constant::constant() : basic(&constant::tinfo_static), ef(0), serial(next_serial++)
+constant::constant() : basic(&constant::tinfo_static), ef(0), serial(next_serial++), domain(domain::complex)

 {
        setflag(status_flags::evaluated | status_flags::expanded);
 }
 {
        setflag(status_flags::evaluated | status_flags::expanded);
 }


@@ -55,8 +55,8 @@ constant::constant() : basic(&constant::tinfo_static), ef(0), serial(next_serial
 
 // public
 
 
 // public
 

-constant::constant(const std::string & initname, evalffunctype efun, const std::string & texname)
-  : basic(&constant::tinfo_static), name(initname), ef(efun), serial(next_serial++)
+constant::constant(const std::string & initname, evalffunctype efun, const std::string & texname, unsigned dm)
+  : basic(&constant::tinfo_static), name(initname), ef(efun), serial(next_serial++), domain(dm)

 {
        if (texname.empty())
                TeX_name = "\\mbox{" + name + "}";
 {
        if (texname.empty())
                TeX_name = "\\mbox{" + name + "}";


@@ -65,8 +65,8 @@ constant::constant(const std::string & initname, evalffunctype efun, const std::
        setflag(status_flags::evaluated | status_flags::expanded);
 }
 
        setflag(status_flags::evaluated | status_flags::expanded);
 }
 

-constant::constant(const std::string & initname, const numeric & initnumber, const std::string & texname)
-  : basic(&constant::tinfo_static), name(initname), ef(0), number(initnumber), serial(next_serial++)
+constant::constant(const std::string & initname, const numeric & initnumber, const std::string & texname, unsigned dm)
+  : basic(&constant::tinfo_static), name(initname), ef(0), number(initnumber), serial(next_serial++), domain(dm)

 {
        if (texname.empty())
                TeX_name = "\\mbox{" + name + "}";
 {
        if (texname.empty())
                TeX_name = "\\mbox{" + name + "}";


@@ -136,6 +136,16 @@ void constant::do_print_python_repr(const print_python_repr & c, unsigned level)
        c.s << ')';
 }
 
        c.s << ')';
 }
 

+bool constant::info(unsigned inf) const
+{
+       if (inf == info_flags::polynomial)
+               return true;
+       if (inf == info_flags::real)
+               return domain == domain::real;
+       else
+               return inherited::info(inf);
+}
+

 ex constant::evalf(int level) const
 {
        if (ef!=0) {
 ex constant::evalf(int level) const
 {
        if (ef!=0) {


@@ -212,13 +222,13 @@ unsigned constant::next_serial = 0;
 //////////
 
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */
 //////////
 
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */

-const constant Pi("Pi", PiEvalf, "\\pi");
+const constant Pi("Pi", PiEvalf, "\\pi", domain::real);

 
 /** Euler's constant. (0.57721...)  Sometimes called Euler-Mascheroni constant.
  *  Diverts straight into CLN for evalf(). */
 
 /** Euler's constant. (0.57721...)  Sometimes called Euler-Mascheroni constant.
  *  Diverts straight into CLN for evalf(). */

-const constant Euler("Euler", EulerEvalf, "\\gamma_E");
+const constant Euler("Euler", EulerEvalf, "\\gamma_E", domain::real);

 
 /** Catalan's constant. (0.91597...)  Diverts straight into CLN for evalf(). */
 
 /** Catalan's constant. (0.91597...)  Diverts straight into CLN for evalf(). */

-const constant Catalan("Catalan", CatalanEvalf, "G");
+const constant Catalan("Catalan", CatalanEvalf, "G", domain::real);

 
 } // namespace GiNaC
 
 } // namespace GiNaC