X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=636eeae4104eb7ad3b82377ac0de0d5729d038f4;hp=f16a00f7f0c431626b8cb08aea0a33ee003626b5;hb=dbd9c306a74f1cb258c0d15a346b973b39deaad2;hpb=26741891dadf23162799009b6fd57b4984bd4ce5

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index f16a00f7..636eeae4 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 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -22,151 +22,177 @@
 
 #include <string>
 #include <stdexcept>
+#include <iostream>
 
 #include "constant.h"
 #include "numeric.h"
 #include "ex.h"
-#include "debugmsg.h"
+#include "print.h"
+#include "archive.h"
+#include "utils.h"
 
-#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+
+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(constant const & other)
-{
-    debugmsg("constant copy constructor",LOGLEVEL_CONSTRUCT);
-    copy(other);
-}
+constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++) {}
 
 // protected
 
-void constant::copy(constant const & other)
+/** 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) {
-        number = new numeric(*other.number);
-    } else {
-        number = 0;
-    }
-    // fct_assigned=other.fct_assigned;
+	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
+		number = 0;
 }
 
 void constant::destroy(bool call_parent)
 {
-    delete number;
-    if (call_parent)
-        basic::destroy(call_parent);
+	delete number;
+	if (call_parent)
+		inherited::destroy(call_parent);
 }
 
 //////////
-// other constructors
+// other ctors
 //////////
 
 // public
 
-constant::constant(string const & initname, ex (*efun)()) :
-    basic(TINFO_constant), name(initname), ef(efun),
-    // number(0), fct_assigned(true), serial(next_serial++)
-    number(0), serial(next_serial++)
+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(string const & initname, numeric const & initnumber) :
-    basic(TINFO_constant), name(initname), ef(0),
-    number(new numeric(initnumber)), /* fct_assigned(false),*/ serial(next_serial++)
+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);
 }
 
 //////////
-// functions overriding virtual functions from bases classes
+// archiving
 //////////
 
-// public
+constant::constant(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) {}
 
-basic * constant::duplicate() const
+ex constant::unarchive(const archive_node &n, const lst &sym_lst)
 {
-    debugmsg("constant duplicate",LOGLEVEL_DUPLICATE);
-    return new constant(*this);
+	// Find constant by name (!! this is bad: 'twould be better if there
+	// was a list of all global constants that we could search)
+	std::string s;
+	if (n.find_string("name", s)) {
+		if (s == Pi.name)
+			return Pi;
+		else if (s == Catalan.name)
+			return Catalan;
+		else if (s == Euler.name)
+			return Euler;
+		else
+			throw (std::runtime_error("unknown constant '" + s + "' in archive"));
+	} else
+		throw (std::runtime_error("unnamed constant in archive"));
 }
 
-void constant::print(ostream & os, unsigned upper_precedence) const
+void constant::archive(archive_node &n) const
 {
-    debugmsg("constant print",LOGLEVEL_PRINT);
-    os << name;
+	inherited::archive(n);
+	n.add_string("name", name);
 }
 
-void constant::printraw(ostream & os) const
+//////////
+// functions overriding virtual functions from base classes
+//////////
+
+// public
+
+void constant::print(const print_context & c, unsigned level) const
 {
-    debugmsg("constant printraw",LOGLEVEL_PRINT);
-    os << "constant(" << 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 if (is_a<print_python_repr>(c)) {
+		c.s << class_name() << "('" << name << "'";
+		if (TeX_name != "\\mbox{" + name + "}")
+			c.s << ",TeX_name='" << TeX_name << "'";
+		c.s << ')';
+	} else
+		c.s << name;
 }
 
-void constant::printtree(ostream & os, unsigned indent) const
+ex constant::evalf(int level) const
 {
-    debugmsg("constant printtree",LOGLEVEL_PRINT);
-    os << string(indent,' ') << name
-       << ", type=" << typeid(*this).name()
-       << ", hash=" << hashvalue << " (0x" << hex << hashvalue << dec << ")"
-       << ", flags=" << flags << endl;
+	if (ef!=0) {
+		return ef();
+	} else if (number != 0) {
+		return number->evalf();
+	}
+	return *this;
 }
 
-void constant::printcsrc(ostream & os, unsigned type, unsigned upper_precedence) const
+// protected
+
+/** Implementation of ex::diff() for a constant always returns 0.
+ *
+ *  @see ex::diff */
+ex constant::derivative(const symbol & s) const
 {
-    debugmsg("constant print csrc",LOGLEVEL_PRINT);
-    os << name;
+	return _ex0;
 }
 
-ex constant::evalf(int level) const
+int constant::compare_same_type(const basic & other) const
 {
-    if (ef!=0) {
-        return ef();
-    } else if (number != 0) {
-        return *number;
-    }
-    return *this;
-}
+	GINAC_ASSERT(is_exactly_a<constant>(other));
+	const constant &o = static_cast<const constant &>(other);
 
-// protected
+	if (serial == o.serial)
+		return 0;
+	else
+		return serial < o.serial ? -1 : 1;
+}
 
-int constant::compare_same_type(basic const & other) const
+bool constant::is_equal_same_type(const basic & other) const
 {
-    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);
-    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);
+
+	return serial == o.serial;
 }
 
-bool constant::is_equal_same_type(basic const & other) const
+unsigned constant::calchash(void) const
 {
-    GINAC_ASSERT(is_exactly_of_type(other, constant));
-    const constant *o = static_cast<const constant *>(&other);
-    return serial==o->serial;
+	hashvalue = golden_ratio_hash(tinfo() ^ serial);
+	// mask out numeric hashes:
+	hashvalue &= 0x7FFFFFFFU;
+	
+	setflag(status_flags::hash_calculated);
+	
+	return hashvalue;
 }
 
 //////////
@@ -185,23 +211,20 @@ bool constant::is_equal_same_type(basic const & other) const
 // static member variables
 //////////
 
-unsigned constant::next_serial=0;
+unsigned constant::next_serial = 0;
 
 //////////
 // global constants
 //////////
 
-const constant some_constant;
-type_info const & typeid_constant=typeid(some_constant);
-
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */
-const constant Pi("Pi", PiEvalf);
-/** Catalan's constant. (0.91597...)  Diverts straight into CLN for evalf(). */
-const constant EulerGamma("EulerGamma", EulerGammaEvalf);
+const constant Pi("Pi", PiEvalf, "\\pi");
+
 /** Euler's constant. (0.57721...)  Sometimes called Euler-Mascheroni constant.
  *  Diverts straight into CLN for evalf(). */
-const constant Catalan("Catalan", CatalanEvalf);
+const constant Euler("Euler", EulerEvalf, "\\gamma_E");
+
+/** Catalan's constant. (0.91597...)  Diverts straight into CLN for evalf(). */
+const constant Catalan("Catalan", CatalanEvalf, "G");
 
-#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE