X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=0cf7c77bbdcf4419d144abdf6c5d006506534700;hp=bc1179c5edbcdd8b6250d3c2024b401a5a273040;hb=7cf5e1f6346223de683c9e7986d098fd042d691c;hpb=1bd972bf8e4eeeb8aec6081100876e81a7f18450

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index bc1179c5..0cf7c77b 100644
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -22,82 +22,82 @@
 
 #include <string>
 #include <stdexcept>
+#include <iostream>
 
 #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() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++) {}
 
 // 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;
+	TeX_name = other.TeX_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
 
-constant::constant(const std::string & initname, evalffunctype efun)
+constant::constant(const std::string & initname, evalffunctype efun, const std::string & texname)
   : basic(TINFO_constant), name(initname), ef(efun), number(0), serial(next_serial++)
 {
-	debugmsg("constant constructor from string, function",LOGLEVEL_CONSTRUCT);
+	if (texname.empty())
+		TeX_name = "\\mbox{" + name + "}";
+	else
+		TeX_name = texname;
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-constant::constant(const std::string & initname, const numeric & initnumber)
+constant::constant(const std::string & initname, const numeric & initnumber, const std::string & texname)
   : basic(TINFO_constant), name(initname), ef(0), number(new numeric(initnumber)), serial(next_serial++)
 {
-	debugmsg("constant constructor from string, numeric",LOGLEVEL_CONSTRUCT);
+	if (texname.empty())
+		TeX_name = "\\mbox{" + name + "}";
+	else
+		TeX_name = texname;
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 //////////
 // 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);
-}
+constant::constant(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) {}
 
-/** 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
@@ -116,7 +116,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);
@@ -124,37 +123,39 @@ void constant::archive(archive_node &n) const
 }
 
 //////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
 //////////
 
 // public
 
-void constant::print(std::ostream & os, unsigned upper_precedence) const
+void constant::print(const print_context & c, unsigned level) const
 {
-	debugmsg("constant print",LOGLEVEL_PRINT);
-	os << name;
+	if (is_a<print_tree>(c)) {
+		c.s << std::string(level, ' ') << name << " (" << class_name() << ")"
+		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+		    << std::endl;
+	} else if (is_a<print_latex>(c))
+		c.s << TeX_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(ex_to<basic>(s)) ? 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(ex_to<basic>(s)) ? 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(ex_to<basic>(s)))
+		return n==1 ? _ex1 : _ex0;
+	else
+		return n==0 ? *this : _ex0;
 }
 
 ex constant::evalf(int level) const
@@ -162,36 +163,49 @@ ex constant::evalf(int level) const
 	if (ef!=0) {
 		return ef();
 	} else if (number != 0) {
-		return *number;
+		return number->evalf();
 	}
 	return *this;
 }
 
 // protected
 
-/** Implementation of ex::diff() for a constant. It always returns 0.
+/** Implementation of ex::diff() for a constant always returns 0.
  *
  *  @see ex::diff */
 ex constant::derivative(const symbol & s) const
 {
-	return _ex0();
+	return _ex0;
 }
 
 int constant::compare_same_type(const basic & other) const
 {
-	GINAC_ASSERT(is_exactly_of_type(other, constant));
-	// const constant & o=static_cast<constant &>(const_cast<basic &>(other));
-	// return name.compare(o.name);
-	const constant *o = static_cast<const constant *>(&other);
-	if (serial==o->serial) return 0;
-	return serial < o->serial ? -1 : 1;
+	GINAC_ASSERT(is_exactly_a<constant>(other));
+	const constant &o = static_cast<const constant &>(other);
+
+	if (serial == o.serial)
+		return 0;
+	else
+		return serial < o.serial ? -1 : 1;
 }
 
 bool constant::is_equal_same_type(const basic & other) const
 {
-	GINAC_ASSERT(is_exactly_of_type(other, constant));
-	const constant *o = static_cast<const constant *>(&other);
-	return serial==o->serial;
+	GINAC_ASSERT(is_exactly_a<constant>(other));
+	const constant &o = static_cast<const constant &>(other);
+
+	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;
 }
 
 //////////
@@ -210,22 +224,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
 //////////
 
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */
-const constant Pi("Pi", PiEvalf);
+const constant Pi("Pi", PiEvalf, "\\pi");
 
 /** Euler's constant. (0.57721...)  Sometimes called Euler-Mascheroni constant.
  *  Diverts straight into CLN for evalf(). */
-const constant Euler("Euler", EulerEvalf);
+const constant Euler("Euler", EulerEvalf, "\\gamma_E");
 
 /** Catalan's constant. (0.91597...)  Diverts straight into CLN for evalf(). */
-const constant Catalan("Catalan", CatalanEvalf);
+const constant Catalan("Catalan", CatalanEvalf, "G");
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC