X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=636eeae4104eb7ad3b82377ac0de0d5729d038f4;hp=5b2bfebe89c0dbfadcfb54fe2337c9e9631bd94b;hb=69f078195a11c1a9610a6577ce2b9a2ce81e8912;hpb=9c91319253425e66f9b6feb9e7036f841bc55e84 diff --git a/ginac/constant.cpp b/ginac/constant.cpp index 5b2bfebe..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-2001 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,12 +22,13 @@ #include #include +#include #include "constant.h" #include "numeric.h" #include "ex.h" +#include "print.h" #include "archive.h" -#include "debugmsg.h" #include "utils.h" namespace GiNaC { @@ -35,15 +36,12 @@ namespace GiNaC { GINAC_IMPLEMENT_REGISTERED_CLASS(constant, basic) ////////// -// default ctor, dtor, copy ctor 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 ctor",LOGLEVEL_CONSTRUCT); -} +constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++) {} // protected @@ -52,6 +50,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) @@ -73,28 +72,31 @@ 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); } ////////// // archiving ////////// -constant::constant(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) -{ - debugmsg("constant ctor from archive_node", LOGLEVEL_CONSTRUCT); -} +constant::constant(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) {} ex constant::unarchive(const archive_node &n, const lst &sym_lst) { @@ -121,37 +123,26 @@ 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 -{ - debugmsg("constant print",LOGLEVEL_PRINT); - os << name; -} - -void constant::printraw(std::ostream & os) const -{ - debugmsg("constant printraw",LOGLEVEL_PRINT); - os << class_name() << "(" << name << ")"; -} - -void constant::printtree(std::ostream & os, unsigned indent) 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; -} - -void constant::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const -{ - debugmsg("constant print csrc",LOGLEVEL_PRINT); - os << name; +void constant::print(const print_context & c, unsigned level) const +{ + if (is_a(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(c)) { + c.s << TeX_name; + } else if (is_a(c)) { + c.s << class_name() << "('" << name << "'"; + if (TeX_name != "\\mbox{" + name + "}") + c.s << ",TeX_name='" << TeX_name << "'"; + c.s << ')'; + } else + c.s << name; } ex constant::evalf(int level) const @@ -166,29 +157,31 @@ 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 { - 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(const_cast(other)); - // return name.compare(o.name); - const constant *o = static_cast(&other); - if (serial==o->serial) return 0; - return serial < o->serial ? -1 : 1; + GINAC_ASSERT(is_exactly_a(other)); + const constant &o = static_cast(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(&other); - return serial==o->serial; + GINAC_ASSERT(is_exactly_a(other)); + const constant &o = static_cast(other); + + return serial == o.serial; } unsigned constant::calchash(void) const @@ -225,13 +218,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