// 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);
}
{
inherited::copy(other);
name = other.name;
+ TeX_name = other.TeX_name;
serial = other.serial;
ef = other.ef;
if (other.number != 0)
// 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);
}
//////////
}
//////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
//////////
// public
{
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
+ } else if (is_a<print_latex>(c))
+ c.s << TeX_name;
+ else
c.s << name;
}
// 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
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;
+ 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;
+ const constant &o = static_cast<const constant &>(other);
+
+ return serial == o.serial;
}
unsigned constant::calchash(void) const
//////////
/** 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