- changed behaviour of numeric::is_rational() and added numeric::is_cinteger()

[ginac.git] / ginac / constant.cpp

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 4e866eaf0d857b57b29f1ab21e7fbe9b5dc88ab9..cc02515389f8e046f846f5578fcc2e524d474def 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -26,6 +26,11 @@
 #include "constant.h"
 #include "numeric.h"
 #include "ex.h"
+#include "debugmsg.h"
+
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -33,6 +38,13 @@
 
 // public
 
+constant::constant() :
+    basic(TINFO_constant), name(""), ef(0),
+    number(0), serial(next_serial++)
+{
+    debugmsg("constant default constructor",LOGLEVEL_CONSTRUCT);
+}
+
 constant::~constant()
 {
     debugmsg("constant destructor",LOGLEVEL_DESTRUCT);
@@ -58,7 +70,7 @@ void constant::copy(constant const & other)
     } else {
         number = 0;
     }
-    fct_assigned=other.fct_assigned;
+    // fct_assigned=other.fct_assigned;
 }
 
 void constant::destroy(bool call_parent)
@@ -76,14 +88,15 @@ void constant::destroy(bool call_parent)
 
 constant::constant(string const & initname, ex (*efun)()) :
     basic(TINFO_constant), name(initname), ef(efun),
-    number(0), fct_assigned(true), serial(next_serial++)
+    // number(0), fct_assigned(true), serial(next_serial++)
+    number(0), serial(next_serial++)
 {
     debugmsg("constant constructor from string, function",LOGLEVEL_CONSTRUCT);
 }
 
 constant::constant(string const & initname, numeric const & initnumber) :
     basic(TINFO_constant), name(initname), ef(0),
-    number(new numeric(initnumber)), fct_assigned(false), serial(next_serial++)
+    number(new numeric(initnumber)), /* fct_assigned(false),*/ serial(next_serial++)
 {
     debugmsg("constant constructor from string, numeric",LOGLEVEL_CONSTRUCT);
 }
@@ -102,7 +115,7 @@ basic * constant::duplicate() const
 
 ex constant::evalf(int level) const
 {
-    if (fct_assigned) {
+    if (ef!=0) {
         return ef();
     } else if (number != 0) {
         return *number;
@@ -114,7 +127,7 @@ ex constant::evalf(int level) const
 
 int constant::compare_same_type(basic const & other) const
 {
-    ASSERT(is_exactly_of_type(other, constant));
+    GINAC_ASSERT(is_exactly_of_type(other, constant));
     // constant const & o=static_cast<constant &>(const_cast<basic &>(other));
     // return name.compare(o.name);
     const constant *o = static_cast<const constant *>(&other);
@@ -124,7 +137,7 @@ int constant::compare_same_type(basic const & other) const
 
 bool constant::is_equal_same_type(basic const & other) const
 {
-    ASSERT(is_exactly_of_type(other, constant));
+    GINAC_ASSERT(is_exactly_of_type(other, constant));
     const constant *o = static_cast<const constant *>(&other);
     return serial==o->serial;
 }
@@ -151,7 +164,7 @@ unsigned constant::next_serial=0;
 // global constants
 //////////
 
-const constant some_constant("",0);
+const constant some_constant;
 type_info const & typeid_constant=typeid(some_constant);
 
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */
@@ -161,3 +174,7 @@ const constant EulerGamma("EulerGamma", EulerGammaEvalf);
 /** Euler's constant. (0.57721...)  Sometimes called Euler-Mascheroni constant.
  *  Diverts straight into CLN for evalf(). */
 const constant Catalan("Catalan", CatalanEvalf);
+
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE