X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=c056a96a1d18b8664319aadefb36ea905547dbcd;hp=25efe77300bfd41dcb77293ffab95d75f2c20ea9;hb=43e0a8f5ca5e1c48cef5daaf014acdbca4e44568;hpb=7d10a252470cc6501b2c66bf9d6774c79b093761

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 25efe773..c056a96a 100644
--- 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
@@ -26,63 +26,50 @@
 #include "constant.h"
 #include "numeric.h"
 #include "ex.h"
+#include "print.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,26 +77,26 @@ 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);
 }
 
 //////////
 // archiving
 //////////
 
-/** 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. */
 ex constant::unarchive(const archive_node &n, const lst &sym_lst)
 {
 	// Find constant by name (!! this is bad: 'twould be better if there
@@ -128,7 +115,6 @@ ex constant::unarchive(const archive_node &n, const lst &sym_lst)
 		throw (std::runtime_error("unnamed constant in archive"));
 }
 
-/** Archive the object. */
 void constant::archive(archive_node &n) const
 {
 	inherited::archive(n);
@@ -141,38 +127,43 @@ 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);
-	os << name;
+void constant::print(const print_context & c, unsigned level) const
+{
+	debugmsg("constant print", LOGLEVEL_PRINT);
+
+	if (is_of_type(c, print_tree)) {
+		c.s << std::string(level, ' ') << name << " (" << class_name() << ")"
+		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+		    << std::endl;
+	} else if (is_of_type(c, print_latex)) {
+		if (name=="Pi")
+			c.s << "\\pi";
+		else if (name=="Euler")
+			c.s << "\\gamma_E";
+		else if (name=="Catalan")
+			c.s << "G";
+		else
+			c.s << "\\mbox{"+name+"}";
+	} else
+		c.s << name;
 }
 
-void constant::printraw(std::ostream & os) const
+int constant::degree(const ex & s) const
 {
-	debugmsg("constant printraw",LOGLEVEL_PRINT);
-	os << "constant(" << name << ")";
+	return is_equal(*s.bp) ? 1 : 0;
 }
 
-void constant::printtree(std::ostream & os, unsigned indent) const
+int constant::ldegree(const ex & s) const
 {
-	debugmsg("constant printtree",LOGLEVEL_PRINT);
-	os << std::string(indent,' ') << name
-	   << ", type=" << class_name()
-	   << ", hash=" << hashvalue
-	   << " (0x" << std::hex << hashvalue << std::dec << ")"
-	   << ", flags=" << flags << std::endl;
+	return is_equal(*s.bp) ? 1 : 0;
 }
 
-void constant::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const
+ex constant::coeff(const ex & s, int n) const
 {
-	debugmsg("constant print csrc",LOGLEVEL_PRINT);
-	os << name;
+	if (is_equal(*s.bp))
+		return n==1 ? _ex1() : _ex0();
+	else
+		return n==0 ? *this : _ex0();
 }
 
 ex constant::evalf(int level) const
@@ -180,7 +171,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 +203,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 +230,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 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