X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fsymbol.cpp;h=6a07e2bd8967d80e6597ca3bdc02c963417e1ae7;hb=158748a96ae87d6d65a7c9eb475a96875c290fd4;hp=b15f9b784e47f18960a34687b56fb61fd25c7146;hpb=199b64938ab86af572d0816c15d7838730567b2d;p=ginac.git diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp index b15f9b78..6a07e2bd 100644 --- a/ginac/symbol.cpp +++ b/ginac/symbol.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's symbolic objects. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2002 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 @@ -27,20 +27,19 @@ #include "lst.h" #include "print.h" #include "archive.h" -#include "debugmsg.h" +#include "tostring.h" #include "utils.h" namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(symbol, basic) +GINAC_IMPLEMENT_REGISTERED_CLASS(symbol, basic) ////////// -// default ctor, dtor, copy ctor assignment operator and helpers +// default ctor, dtor, copy ctor, assignment operator and helpers ////////// symbol::symbol() : inherited(TINFO_symbol), serial(next_serial++) { - debugmsg("symbol default ctor", LOGLEVEL_CONSTRUCT); name = TeX_name = autoname_prefix()+ToString(serial); asexinfop = new assigned_ex_info; setflag(status_flags::evaluated | status_flags::expanded); @@ -54,7 +53,7 @@ void symbol::copy(const symbol & other) TeX_name = other.TeX_name; serial = other.serial; asexinfop = other.asexinfop; - ++asexinfop->refcount; + ++(asexinfop->refcount); } void symbol::destroy(bool call_parent) @@ -71,15 +70,8 @@ void symbol::destroy(bool call_parent) // public -symbol::symbol(const symbol & other) -{ - debugmsg("symbol copy ctor", LOGLEVEL_CONSTRUCT); - copy(other); -} - symbol::symbol(const std::string & initname) : inherited(TINFO_symbol) { - debugmsg("symbol ctor from string", LOGLEVEL_CONSTRUCT); name = initname; TeX_name = default_TeX_name(); serial = next_serial++; @@ -89,7 +81,6 @@ symbol::symbol(const std::string & initname) : inherited(TINFO_symbol) symbol::symbol(const std::string & initname, const std::string & texname) : inherited(TINFO_symbol) { - debugmsg("symbol ctor from string", LOGLEVEL_CONSTRUCT); name = initname; TeX_name = texname; serial = next_serial++; @@ -104,7 +95,6 @@ symbol::symbol(const std::string & initname, const std::string & texname) : inhe /** Construct object from archive_node. */ symbol::symbol(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) { - debugmsg("symbol ctor from archive_node", LOGLEVEL_CONSTRUCT); serial = next_serial++; if (!(n.find_string("name", name))) name = autoname_prefix() + ToString(serial); @@ -121,7 +111,7 @@ ex symbol::unarchive(const archive_node &n, const lst &sym_lst) // If symbol is in sym_lst, return the existing symbol for (unsigned i=0; i(sym_lst.op(i)).name == ex_to(s).name)) + if (is_a(sym_lst.op(i)) && (ex_to(sym_lst.op(i)).name == ex_to(s).name)) return sym_lst.op(i); } return s; @@ -137,31 +127,28 @@ void symbol::archive(archive_node &n) const } ////////// -// functions overriding virtual functions from bases classes +// functions overriding virtual functions from base classes ////////// // public -basic *symbol::duplicate() const -{ - debugmsg("symbol duplicate", LOGLEVEL_DUPLICATE); - return new symbol(*this); -} - void symbol::print(const print_context & c, unsigned level) const { - debugmsg("symbol print", LOGLEVEL_PRINT); - - if (is_of_type(c, print_tree)) { + if (is_a(c)) { c.s << std::string(level, ' ') << name << " (" << class_name() << ")" << ", serial=" << serial << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec << std::endl; - } else if (is_of_type(c, print_latex)) + } else if (is_a(c)) { c.s << TeX_name; - else + } else if (is_a(c)) { + c.s << class_name() << "('" << name; + if (TeX_name != default_TeX_name()) + c.s << "','" << TeX_name; + c.s << "')"; + } else c.s << name; } @@ -179,32 +166,6 @@ bool symbol::info(unsigned inf) const return inherited::info(inf); } -bool symbol::has(const ex & other) const -{ - if (this->is_equal(*other.bp)) - return true; - else - return false; -} - -int symbol::degree(const ex & s) const -{ - return is_equal(*s.bp) ? 1 : 0; -} - -int symbol::ldegree(const ex & s) const -{ - return is_equal(*s.bp) ? 1 : 0; -} - -ex symbol::coeff(const ex & s, int n) const -{ - if (is_equal(*s.bp)) - return n==1 ? _ex1() : _ex0(); - else - return n==0 ? *this : _ex0(); -} - ex symbol::eval(int level) const { if (level == -max_recursion_level) @@ -230,14 +191,14 @@ ex symbol::eval(int level) const ex symbol::derivative(const symbol & s) const { if (compare_same_type(s)) - return _ex0(); + return _ex0; else - return _ex1(); + return _ex1; } int symbol::compare_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other,symbol)); + GINAC_ASSERT(is_a(other)); const symbol *o = static_cast(&other); if (serial==o->serial) return 0; return serial < o->serial ? -1 : 1; @@ -245,27 +206,14 @@ int symbol::compare_same_type(const basic & other) const bool symbol::is_equal_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other,symbol)); + GINAC_ASSERT(is_a(other)); const symbol *o = static_cast(&other); return serial==o->serial; } -unsigned symbol::return_type(void) const -{ - return return_types::commutative; -} - -unsigned symbol::return_type_tinfo(void) const -{ - return tinfo_key; -} - unsigned symbol::calchash(void) const { - // this is where the schoolbook method - // (golden_ratio_hash(tinfo()) ^ serial) - // is not good enough yet... - hashvalue = golden_ratio_hash(golden_ratio_hash(tinfo()) ^ serial); + hashvalue = golden_ratio_hash(tinfo() ^ serial); setflag(status_flags::hash_calculated); return hashvalue; } @@ -293,7 +241,7 @@ void symbol::unassign(void) { if (asexinfop->is_assigned) { asexinfop->is_assigned = 0; - asexinfop->assigned_expression = _ex0(); + asexinfop->assigned_expression = _ex0; } setflag(status_flags::evaluated | status_flags::expanded); }