added tutorial section about indexed objects

[ginac.git] / ginac / constant.cpp

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 60ccc6a128306277af395b17f11f354dca1b8dcb..9002515452c7dc7eed3b39532aa4badec8b9ad3b 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's constant types and some special constants. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,61 +28,47 @@
 #include "ex.h"
 #include "archive.h"
 #include "debugmsg.h"
+#include "utils.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 GINAC_IMPLEMENT_REGISTERED_CLASS(constant, basic)
 
 //////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default ctor, dtor, copy ctor assignment operator and helpers
 //////////
 
 // 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);
-       destroy(0);
-}
-
-constant::constant(const constant & other)
-{
-       debugmsg("constant copy constructor",LOGLEVEL_CONSTRUCT);
-       copy(other);
+       debugmsg("constant default ctor",LOGLEVEL_CONSTRUCT);
 }
 
 // protected
 
+/** For use by copy ctor and assignment operator. */
 void constant::copy(const constant & other)
 {
-       basic::copy(other);
-       name=other.name;
-       serial=other.serial;
-       ef=other.ef;
-       if (other.number != 0) {
+       inherited::copy(other);
+       name = other.name;
+       serial = other.serial;
+       ef = other.ef;
+       if (other.number != 0)
                number = new numeric(*other.number);
-       } else {
+       else
                number = 0;
-       }
-       // fct_assigned=other.fct_assigned;
 }
 
 void constant::destroy(bool call_parent)
 {
        delete number;
        if (call_parent)
-               basic::destroy(call_parent);
+               inherited::destroy(call_parent);
 }
 
 //////////
-// other constructors
+// other ctors
 //////////
 
 // public
@@ -90,13 +76,15 @@ void constant::destroy(bool call_parent)
 constant::constant(const std::string & initname, evalffunctype efun)
   : basic(TINFO_constant), name(initname), ef(efun), number(0), serial(next_serial++)
 {
-       debugmsg("constant constructor from string, function",LOGLEVEL_CONSTRUCT);
+       debugmsg("constant ctor from string, function",LOGLEVEL_CONSTRUCT);
+       setflag(status_flags::evaluated);
 }
 
 constant::constant(const std::string & initname, const numeric & initnumber)
   : basic(TINFO_constant), name(initname), ef(0), number(new numeric(initnumber)), serial(next_serial++)
 {
-       debugmsg("constant constructor from string, numeric",LOGLEVEL_CONSTRUCT);
+       debugmsg("constant ctor from string, numeric",LOGLEVEL_CONSTRUCT);
+       setflag(status_flags::evaluated);
 }
 
 //////////
@@ -106,7 +94,7 @@ constant::constant(const std::string & initname, const numeric & initnumber)
 /** Construct object from archive_node. */
 constant::constant(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-       debugmsg("constant constructor from archive_node", LOGLEVEL_CONSTRUCT);
+       debugmsg("constant ctor from archive_node", LOGLEVEL_CONSTRUCT);
 }
 
 /** Unarchive the object. */
@@ -141,12 +129,6 @@ void constant::archive(archive_node &n) const
 
 // public
 
-basic * constant::duplicate() const
-{
-       debugmsg("constant duplicate",LOGLEVEL_DUPLICATE);
-       return new constant(*this);
-}
-
 void constant::print(std::ostream & os, unsigned upper_precedence) const
 {
        debugmsg("constant print",LOGLEVEL_PRINT);
@@ -156,7 +138,7 @@ void constant::print(std::ostream & os, unsigned upper_precedence) const
 void constant::printraw(std::ostream & os) const
 {
        debugmsg("constant printraw",LOGLEVEL_PRINT);
-       os << "constant(" << name << ")";
+       os << class_name() << "(" << name << ")";
 }
 
 void constant::printtree(std::ostream & os, unsigned indent) const
@@ -180,7 +162,7 @@ ex constant::evalf(int level) const
        if (ef!=0) {
                return ef();
        } else if (number != 0) {
-               return *number;
+               return number->evalf();
        }
        return *this;
 }
@@ -212,6 +194,17 @@ bool constant::is_equal_same_type(const basic & other) const
        return serial==o->serial;
 }
 
+unsigned constant::calchash(void) const
+{
+       hashvalue = golden_ratio_hash(tinfo() ^ serial);
+       // mask out numeric hashes:
+       hashvalue &= 0x7FFFFFFFU;
+       
+       setflag(status_flags::hash_calculated);
+       
+       return hashvalue;
+}
+
 //////////
 // new virtual functions which can be overridden by derived classes
 //////////
@@ -228,23 +221,20 @@ bool constant::is_equal_same_type(const basic & other) const
 // static member variables
 //////////
 
-unsigned constant::next_serial=0;
+unsigned constant::next_serial = 0;
 
 //////////
 // global constants
 //////////
 
-const constant some_constant;
-const std::type_info & typeid_constant = typeid(some_constant);
-
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */
 const constant Pi("Pi", PiEvalf);
+
 /** Euler's constant. (0.57721...)  Sometimes called Euler-Mascheroni constant.
  *  Diverts straight into CLN for evalf(). */
 const constant Euler("Euler", EulerEvalf);
+
 /** Catalan's constant. (0.91597...)  Diverts straight into CLN for evalf(). */
 const constant Catalan("Catalan", CatalanEvalf);
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC