* Implementation of sequences of expression pairs. */
/*
- * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2015 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <iostream>
-#include <algorithm>
-#include <string>
-#include <stdexcept>
-#include <iterator>
-
#include "expairseq.h"
#include "lst.h"
#include "add.h"
#include "archive.h"
#include "operators.h"
#include "utils.h"
+#include "hash_seed.h"
#include "indexed.h"
+#include "compiler.h"
+#include <algorithm>
#if EXPAIRSEQ_USE_HASHTAB
#include <cmath>
#endif // EXPAIRSEQ_USE_HASHTAB
+#include <iostream>
+#include <iterator>
+#include <stdexcept>
+#include <string>
namespace GiNaC {
// archiving
//////////
-expairseq::expairseq(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
-#if EXPAIRSEQ_USE_HASHTAB
- , hashtabsize(0)
-#endif
+void expairseq::read_archive(const archive_node &n, lst &sym_lst)
{
+ inherited::read_archive(n, sym_lst);
archive_node::archive_node_cit first = n.find_first("rest");
archive_node::archive_node_cit last = n.find_last("coeff");
++last;
n.add_ex("overall_coeff", overall_coeff);
}
-DEFAULT_UNARCHIVE(expairseq)
//////////
// functions overriding virtual functions from base classes
return *this;
}
ex result = thisexpairseq(newepv ? *newepv : seq, x);
- if (newepv) {
- delete newepv;
- }
+ delete newepv;
return result;
}
-bool expairseq::is_polynomial(const ex & var) const
-{
- if (!is_exactly_a<add>(*this) && !is_exactly_a<mul>(*this))
- return basic::is_polynomial(var);
- for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) {
- if (!(i->rest).is_polynomial(var))
- return false;
- }
- return true;
-}
-
bool expairseq::match(const ex & pattern, exmap & repl_lst) const
{
// This differs from basic::match() because we want "a+b+c+d" to
}
}
+ // Even if the expression does not match the pattern, some of
+ // its subexpressions could match it. For example, x^5*y^(-1)
+ // does not match the pattern $0^5, but its subexpression x^5
+ // does. So, save repl_lst in order to not add bogus entries.
+ exmap tmp_repl = repl_lst;
+
// Unfortunately, this is an O(N^2) operation because we can't
// sort the pattern in a useful way...
continue;
exvector::iterator it = ops.begin(), itend = ops.end();
while (it != itend) {
- if (it->match(p, repl_lst)) {
+ if (it->match(p, tmp_repl)) {
ops.erase(it);
goto found;
}
for (size_t i=0; i<num; i++)
vp->push_back(split_ex_to_pair(ops[i]));
ex rest = thisexpairseq(vp, default_overall_coeff());
- for (exmap::const_iterator it = repl_lst.begin(); it != repl_lst.end(); ++it) {
- if (it->first.is_equal(global_wildcard))
- return rest.is_equal(it->second);
+ for (exmap::const_iterator it = tmp_repl.begin(); it != tmp_repl.end(); ++it) {
+ if (it->first.is_equal(global_wildcard)) {
+ if (rest.is_equal(it->second)) {
+ repl_lst = tmp_repl;
+ return true;
+ }
+ return false;
+ }
}
+ repl_lst = tmp_repl;
repl_lst[global_wildcard] = rest;
return true;
// No global wildcard, then the match fails if there are any
// unmatched terms left
- return ops.empty();
+ if (ops.empty()) {
+ repl_lst = tmp_repl;
+ return true;
+ }
+ return false;
}
}
return inherited::match(pattern, repl_lst);
{
std::auto_ptr<epvector> vp = subschildren(m, options);
if (vp.get())
- return ex_to<basic>(thisexpairseq(vp, overall_coeff, true));
+ return ex_to<basic>(thisexpairseq(vp, overall_coeff, (options & subs_options::no_index_renaming) == 0));
else if ((options & subs_options::algebraic) && is_exactly_a<mul>(*this))
return static_cast<const mul *>(this)->algebraic_subs_mul(m, options);
else
unsigned expairseq::calchash() const
{
- const void* this_tinfo = (const void*)typeid(*this).name();
- unsigned v = golden_ratio_hash((p_int)this_tinfo);
+ unsigned v = make_hash_seed(typeid(*this));
epvector::const_iterator i = seq.begin();
const epvector::const_iterator end = seq.end();
while (i != end) {
* has (at least) two possible different semantics but we want to inherit
* methods thus avoiding code duplication. Sometimes a method in expairseq
* has to create a new one of the same semantics, which cannot be done by a
- * ctor because the name (add, mul,...) is unknown on the expaiseq level. In
+ * ctor because the name (add, mul,...) is unknown on the expairseq level. In
* order for this trick to work a derived class must of course override this
* definition. */
ex expairseq::thisexpairseq(const epvector &v, const ex &oc, bool do_index_renaming) const
}
void expairseq::construct_from_2_expairseq(const expairseq &s1,
- const expairseq &s2)
+ const expairseq &s2)
{
combine_overall_coeff(s1.overall_coeff);
combine_overall_coeff(s2.overall_coeff);
}
void expairseq::construct_from_expairseq_ex(const expairseq &s,
- const ex &e)
+ const ex &e)
{
combine_overall_coeff(s.overall_coeff);
if (is_exactly_a<numeric>(e)) {
{
// simplifications: +(a,+(b,c),d) -> +(a,b,c,d) (associativity)
// +(d,b,c,a) -> +(a,b,c,d) (canonicalization)
- // +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric())
+ // +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric)
// (same for (+,*) -> (*,^)
make_flat(v);
{
// simplifications: +(a,+(b,c),d) -> +(a,b,c,d) (associativity)
// +(d,b,c,a) -> +(a,b,c,d) (canonicalization)
- // +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric())
- // (same for (+,*) -> (*,^)
+ // +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric)
+ // same for (+,*) -> (*,^)
make_flat(v, do_index_renaming);
#if EXPAIRSEQ_USE_HASHTAB
}
void expairseq::add_numerics_to_hashtab(epvector::iterator first_numeric,
- epvector::const_iterator last_non_zero)
+ epvector::const_iterator last_non_zero)
{
if (first_numeric == seq.end()) return; // no numerics
return 1;
#if EXPAIRSEQ_USE_HASHTAB
- if (hashtabsize > 0) return 1; // not canoncalized
+ if (hashtabsize > 0) return 1; // not canonicalized
#endif // EXPAIRSEQ_USE_HASHTAB
epvector::const_iterator it = seq.begin(), itend = seq.end();
// returns a pointer to a newly created epvector otherwise
// (which has to be deleted somewhere else)
- if (level==1)
+ if (likely(level==1))
return std::auto_ptr<epvector>(0);
if (level == -max_recursion_level)
git://www.ginac.de / ginac.git / blobdiff