X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=86fb55b7b462b0ec4c418185e2f1f270587caf10;hp=371902bdebdbe1cd5a3badb8310ab59ffea1a62c;hb=29b420743599f001b8bfc8b63fb6ac81aa3dfba7;hpb=e7cc6a764ff67b5885d6633385fac23ccc1dc9a7 diff --git a/ginac/constant.cpp b/ginac/constant.cpp index 371902bd..86fb55b7 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-2002 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2006 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 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include @@ -27,53 +27,36 @@ #include "constant.h" #include "numeric.h" #include "ex.h" -#include "print.h" #include "archive.h" #include "utils.h" namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS(constant, basic) +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(constant, basic, + print_func(&constant::do_print). + print_func(&constant::do_print_latex). + print_func(&constant::do_print_tree). + print_func(&constant::do_print_python_repr)) ////////// -// default ctor, dtor, copy ctor, assignment operator and helpers +// default constructor ////////// // public -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) -{ - 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) +constant::constant() : basic(&constant::tinfo_static), ef(0), serial(next_serial++) { - delete number; - if (call_parent) - inherited::destroy(call_parent); + setflag(status_flags::evaluated | status_flags::expanded); } ////////// -// other ctors +// other constructors ////////// // public constant::constant(const std::string & initname, evalffunctype efun, const std::string & texname) - : basic(TINFO_constant), name(initname), ef(efun), number(0), serial(next_serial++) + : basic(&constant::tinfo_static), name(initname), ef(efun), serial(next_serial++) { if (texname.empty()) TeX_name = "\\mbox{" + name + "}"; @@ -83,7 +66,7 @@ constant::constant(const std::string & initname, evalffunctype efun, const std:: } 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++) + : basic(&constant::tinfo_static), name(initname), ef(0), number(initnumber), serial(next_serial++) { if (texname.empty()) TeX_name = "\\mbox{" + name + "}"; @@ -96,9 +79,9 @@ constant::constant(const std::string & initname, const numeric & initnumber, con // archiving ////////// -constant::constant(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) {} +constant::constant(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {} -ex constant::unarchive(const archive_node &n, const lst &sym_lst) +ex constant::unarchive(const archive_node &n, lst &sym_lst) { // Find constant by name (!! this is bad: 'twould be better if there // was a list of all global constants that we could search) @@ -128,47 +111,37 @@ void constant::archive(archive_node &n) const // public -void constant::print(const print_context & c, unsigned level) const +void constant::do_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; + c.s << name; } -int constant::degree(const ex & s) const +void constant::do_print_tree(const print_tree & c, unsigned level) const { - return is_equal(ex_to(s)) ? 1 : 0; + c.s << std::string(level, ' ') << name << " (" << class_name() << ")" << " @" << this + << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec + << std::endl; } -int constant::ldegree(const ex & s) const +void constant::do_print_latex(const print_latex & c, unsigned level) const { - return is_equal(ex_to(s)) ? 1 : 0; + c.s << TeX_name; } -ex constant::coeff(const ex & s, int n) const +void constant::do_print_python_repr(const print_python_repr & c, unsigned level) const { - if (is_equal(ex_to(s))) - return n==1 ? _ex1 : _ex0; - else - return n==0 ? *this : _ex0; + c.s << class_name() << "('" << name << "'"; + if (TeX_name != "\\mbox{" + name + "}") + c.s << ",TeX_name='" << TeX_name << "'"; + c.s << ')'; } ex constant::evalf(int level) const { if (ef!=0) { return ef(); - } else if (number != 0) { - return number->evalf(); + } else { + return number.evalf(); } return *this; } @@ -202,14 +175,12 @@ bool constant::is_equal_same_type(const basic & other) const return serial == o.serial; } -unsigned constant::calchash(void) const +unsigned constant::calchash() const { - hashvalue = golden_ratio_hash(tinfo() ^ serial); - // mask out numeric hashes: - hashvalue &= 0x7FFFFFFFU; - + hashvalue = golden_ratio_hash((p_int)tinfo() ^ serial); + setflag(status_flags::hash_calculated); - + return hashvalue; }