X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Frelational.cpp;h=bd3b64421f75c6f1244c002a36e64b1619d7e6b9;hb=8c51f6869173c7eb163cd29f351ea9f1e3716062;hp=6d51a5634f34ef4f5f22cfa1d25f1413216fb359;hpb=d448856f20cb58f939ddbf636e7f72e3599b1468;p=ginac.git diff --git a/ginac/relational.cpp b/ginac/relational.cpp index 6d51a563..bd3b6442 100644 --- a/ginac/relational.cpp +++ b/ginac/relational.cpp @@ -3,7 +3,7 @@ * Implementation of relations between expressions */ /* - * 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 @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include "relational.h" @@ -27,20 +28,16 @@ #include "print.h" #include "archive.h" #include "utils.h" -#include "debugmsg.h" namespace GiNaC { GINAC_IMPLEMENT_REGISTERED_CLASS(relational, basic) ////////// -// default ctor, dtor, copy ctor assignment operator and helpers +// default ctor, dtor, copy ctor, assignment operator and helpers ////////// -relational::relational() : basic(TINFO_relational) -{ - debugmsg("relational default ctor",LOGLEVEL_CONSTRUCT); -} +relational::relational() : basic(TINFO_relational) {} void relational::copy(const relational & other) { @@ -58,13 +55,7 @@ DEFAULT_DESTROY(relational) // public -relational::relational(const ex & lhs, const ex & rhs, operators oper) : basic(TINFO_relational) -{ - debugmsg("relational ctor ex,ex,operator",LOGLEVEL_CONSTRUCT); - lh=lhs; - rh=rhs; - o=oper; -} +relational::relational(const ex & lhs, const ex & rhs, operators oper) : basic(TINFO_relational), lh(lhs), rh(rhs), o(oper) {} ////////// // archiving @@ -72,7 +63,6 @@ relational::relational(const ex & lhs, const ex & rhs, operators oper) : basic(T relational::relational(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) { - debugmsg("relational ctor from archive_node", LOGLEVEL_CONSTRUCT); unsigned int opi; if (!(n.find_unsigned("op", opi))) throw (std::runtime_error("unknown relational operator in archive")); @@ -99,62 +89,72 @@ DEFAULT_UNARCHIVE(relational) void relational::print(const print_context & c, unsigned level) const { - debugmsg("relational print",LOGLEVEL_PRINT); - if (is_a(c)) { inherited::print(c, level); } else { - if (precedence() <= level) - c.s << "("; - lh.print(c, precedence()); + if (is_a(c)) { + c.s << class_name() << '('; + lh.print(c); + c.s << ','; + rh.print(c); + c.s << ",'"; + } else { + if (precedence() <= level) + c.s << "("; + lh.print(c, precedence()); + } switch (o) { - case equal: - c.s << "=="; - break; - case not_equal: - c.s << "!="; - break; - case less: - c.s << "<"; - break; - case less_or_equal: - c.s << "<="; - break; - case greater: - c.s << ">"; - break; - case greater_or_equal: - c.s << ">="; - break; - default: - c.s << "(INVALID RELATIONAL OPERATOR)"; + case equal: + c.s << "=="; + break; + case not_equal: + c.s << "!="; + break; + case less: + c.s << "<"; + break; + case less_or_equal: + c.s << "<="; + break; + case greater: + c.s << ">"; + break; + case greater_or_equal: + c.s << ">="; + break; + default: + c.s << "(INVALID RELATIONAL OPERATOR)"; + } + if (is_a(c)) + c.s << "')"; + else { + rh.print(c, precedence()); + if (precedence() <= level) + c.s << ")"; } - rh.print(c, precedence()); - if (precedence() <= level) - c.s << ")"; } } bool relational::info(unsigned inf) const { switch (inf) { - case info_flags::relation: - return 1; - case info_flags::relation_equal: - return o==equal; - case info_flags::relation_not_equal: - return o==not_equal; - case info_flags::relation_less: - return o==less; - case info_flags::relation_less_or_equal: - return o==less_or_equal; - case info_flags::relation_greater: - return o==greater; - case info_flags::relation_greater_or_equal: - return o==greater_or_equal; + case info_flags::relation: + return 1; + case info_flags::relation_equal: + return o==equal; + case info_flags::relation_not_equal: + return o==not_equal; + case info_flags::relation_less: + return o==less; + case info_flags::relation_less_or_equal: + return o==less_or_equal; + case info_flags::relation_greater: + return o==greater; + case info_flags::relation_greater_or_equal: + return o==greater_or_equal; } return 0; } @@ -183,6 +183,17 @@ ex relational::eval(int level) const return (new relational(lh.eval(level-1),rh.eval(level-1),o))->setflag(status_flags::dynallocated | status_flags::evaluated); } +ex relational::subs(const lst & ls, const lst & lr, bool no_pattern) const +{ + const ex & subsed_lh = lh.subs(ls, lr, no_pattern); + const ex & subsed_rh = rh.subs(ls, lr, no_pattern); + + if (!are_ex_trivially_equal(lh, subsed_lh) || !are_ex_trivially_equal(rh, subsed_rh)) + return relational(subsed_lh, subsed_rh, o).basic::subs(ls, lr, no_pattern); + else + return basic::subs(ls, lr, no_pattern); +} + ex relational::simplify_ncmul(const exvector & v) const { return lh.simplify_ncmul(v); @@ -194,15 +205,33 @@ int relational::compare_same_type(const basic & other) const { GINAC_ASSERT(is_exactly_a(other)); const relational &oth = static_cast(other); - - if (o == oth.o) { - int cmpval = lh.compare(oth.lh); - if (cmpval) - return cmpval; - else - return rh.compare(oth.rh); + if (o==oth.o && lh.is_equal(oth.lh) && rh.is_equal(oth.rh)) + return 0; + switch (o) { + case equal: + case not_equal: + if (oth.o!=o) + return (o < oth.o) ? -1 : 1; + break; + case less: + if (oth.o!=greater) + return (o < oth.o) ? -1 : 1; + break; + case less_or_equal: + if (oth.o!=greater_or_equal) + return (o < oth.o) ? -1 : 1; + break; + case greater: + if (oth.o!=less) + return (o < oth.o) ? -1 : 1; + break; + case greater_or_equal: + if (oth.o!=less_or_equal) + return (o < oth.o) ? -1 : 1; + break; } - return (o < oth.o) ? -1 : 1; + const int lcmpval = lh.compare(oth.rh); + return (lcmpval!=0) ? lcmpval : rh.compare(oth.lh); } bool relational::match_same_type(const basic & other) const @@ -225,6 +254,48 @@ unsigned relational::return_type_tinfo(void) const return lh.return_type_tinfo(); } +unsigned relational::calchash(void) const +{ + unsigned v = golden_ratio_hash(tinfo()); + unsigned lhash = lh.gethash(); + unsigned rhash = rh.gethash(); + + v = rotate_left_31(v); + switch(o) { + case equal: + case not_equal: + if (lhash>rhash) { + v ^= lhash; + lhash = rhash; + } else { + v ^= rhash; + } + break; + case less: + case less_or_equal: + v ^= rhash; + break; + case greater: + case greater_or_equal: + v ^= lhash; + lhash = rhash; + break; + } + v = rotate_left_31(v); + v ^= lhash; + + // mask out numeric hashes: + v &= 0x7FFFFFFFU; + + // store calculated hash value only if object is already evaluated + if (flags & status_flags::evaluated) { + setflag(status_flags::hash_calculated); + hashvalue = v; + } + + return v; +} + ////////// // new virtual functions which can be overridden by derived classes ////////// @@ -258,20 +329,20 @@ relational::operator bool() const return o==not_equal ? true : false; switch (o) { - case equal: - return ex_to(df).is_zero(); - case not_equal: - return !ex_to(df).is_zero(); - case less: - return ex_to(df)<_num0(); - case less_or_equal: - return ex_to(df)<=_num0(); - case greater: - return ex_to(df)>_num0(); - case greater_or_equal: - return ex_to(df)>=_num0(); - default: - throw(std::logic_error("invalid relational operator")); + case equal: + return ex_to(df).is_zero(); + case not_equal: + return !ex_to(df).is_zero(); + case less: + return ex_to(df)<_num0; + case less_or_equal: + return ex_to(df)<=_num0; + case greater: + return ex_to(df)>_num0; + case greater_or_equal: + return ex_to(df)>=_num0; + default: + throw(std::logic_error("invalid relational operator")); } }