X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=d2a74b2d69205b53655fded7f46cabb7604afab2;hp=c056a96a1d18b8664319aadefb36ea905547dbcd;hb=d448856f20cb58f939ddbf636e7f72e3599b1468;hpb=7cad9b41c97f0b042ba4af8080e82c8ad4804560

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index c056a96a..d2a74b2d 100644
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -41,7 +41,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(constant, basic)
 
 // public
 
-constant::constant() : basic(TINFO_constant), name(""), ef(0), number(0), serial(next_serial++)
+constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++)
 {
 	debugmsg("constant default ctor",LOGLEVEL_CONSTRUCT);
 }
@@ -53,6 +53,7 @@ void constant::copy(const constant & other)
 {
 	inherited::copy(other);
 	name = other.name;
+	TeX_name = other.TeX_name;
 	serial = other.serial;
 	ef = other.ef;
 	if (other.number != 0)
@@ -74,18 +75,26 @@ void constant::destroy(bool call_parent)
 
 // 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 ctor from string, function",LOGLEVEL_CONSTRUCT);
-	setflag(status_flags::evaluated);
+	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 ctor from string, numeric",LOGLEVEL_CONSTRUCT);
-	setflag(status_flags::evaluated);
+	if (texname.empty())
+		TeX_name = "\\mbox{" + name + "}";
+	else
+		TeX_name = texname;
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 //////////
@@ -122,7 +131,7 @@ void constant::archive(archive_node &n) const
 }
 
 //////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
 //////////
 
 // public
@@ -131,36 +140,29 @@ void constant::print(const print_context & c, unsigned level) const
 {
 	debugmsg("constant print", LOGLEVEL_PRINT);
 
-	if (is_of_type(c, print_tree)) {
+	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_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
+	} else if (is_a<print_latex>(c))
+		c.s << TeX_name;
+	else
 		c.s << name;
 }
 
 int constant::degree(const ex & s) const
 {
-	return is_equal(*s.bp) ? 1 : 0;
+	return is_equal(ex_to<basic>(s)) ? 1 : 0;
 }
 
 int constant::ldegree(const ex & s) const
 {
-	return is_equal(*s.bp) ? 1 : 0;
+	return is_equal(ex_to<basic>(s)) ? 1 : 0;
 }
 
 ex constant::coeff(const ex & s, int n) const
 {
-	if (is_equal(*s.bp))
+	if (is_equal(ex_to<basic>(s)))
 		return n==1 ? _ex1() : _ex0();
 	else
 		return n==0 ? *this : _ex0();
@@ -178,7 +180,7 @@ ex constant::evalf(int level) const
 
 // 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
@@ -188,19 +190,21 @@ ex constant::derivative(const symbol & s) const
 
 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
@@ -237,13 +241,13 @@ unsigned constant::next_serial = 0;
 //////////
 
 /**  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");
 
 } // namespace GiNaC