* Implementation of GiNaC's ABC. */
/*
- * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2019 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 <stdexcept>
-#ifdef DO_GINAC_ASSERT
-# include <typeinfo>
-#endif
-
#include "basic.h"
#include "ex.h"
#include "numeric.h"
#include "wildcard.h"
#include "archive.h"
#include "utils.h"
+#include "hash_seed.h"
#include "inifcns.h"
+#include <iostream>
+#include <stdexcept>
+#include <typeinfo>
+
namespace GiNaC {
GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(basic, void,
/** basic copy constructor: implicitly assumes that the other class is of
* the exact same type (as it's used by duplicate()), so it can copy the
* tinfo_key and the hash value. */
-basic::basic(const basic & other) : tinfo_key(other.tinfo_key), flags(other.flags & ~status_flags::dynallocated), hashvalue(other.hashvalue)
+basic::basic(const basic & other) : flags(other.flags & ~status_flags::dynallocated), hashvalue(other.hashvalue)
{
}
const basic & basic::operator=(const basic & other)
{
unsigned fl = other.flags & ~status_flags::dynallocated;
- if (tinfo_key != other.tinfo_key) {
+ if (typeid(*this) != typeid(other)) {
// The other object is of a derived class, so clear the flags as they
// might no longer apply (especially hash_calculated). Oh, and don't
// copy the tinfo_key: it is already set correctly for this object.
//////////
/** Construct object from archive_node. */
-basic::basic(const archive_node &n, lst &sym_lst) : flags(0)
-{
- // Reconstruct tinfo_key from class name
- std::string class_name;
- if (n.find_string("class", class_name))
- tinfo_key = find_tinfo_key(class_name);
- else
- throw (std::runtime_error("archive node contains no class name"));
-}
-
-/** Unarchive the object. */
-DEFAULT_UNARCHIVE(basic)
+void basic::read_archive(const archive_node& n, lst& syms)
+{ }
/** Archive the object. */
void basic::archive(archive_node &n) const
throw(std::range_error(std::string("basic::op(): ") + class_name() + std::string(" has no operands")));
}
-/** Return modifyable operand/member at position i. */
+/** Return modifiable operand/member at position i. */
ex & basic::let_op(size_t i)
{
ensure_if_modifiable();
* but e.has(x+y) is false. */
bool basic::has(const ex & pattern, unsigned options) const
{
- lst repl_lst;
+ exmap repl_lst;
if (match(pattern, repl_lst))
return true;
for (size_t i=0; i<nops(); i++)
if (num == 0)
return *this;
- basic *copy = NULL;
+ basic *copy = nullptr;
for (size_t i=0; i<num; i++) {
const ex & o = op(i);
const ex & n = f(o);
if (!are_ex_trivially_equal(o, n)) {
- if (copy == NULL)
+ if (copy == nullptr)
copy = duplicate();
copy->let_op(i) = n;
}
}
if (copy) {
- copy->setflag(status_flags::dynallocated);
copy->clearflag(status_flags::hash_calculated | status_flags::expanded);
return *copy;
} else
exmap cmap;
cmap[_ex1] = _ex0;
- for (const_iterator xi=x.begin(); xi!=x.end(); ++xi) {
+ for (const auto & xi : x) {
ex key = _ex1;
- ex pre_coeff = *xi;
- for (lst::const_iterator li=l.begin(); li!=l.end(); ++li) {
- int cexp = pre_coeff.degree(*li);
- pre_coeff = pre_coeff.coeff(*li, cexp);
- key *= pow(*li, cexp);
+ ex pre_coeff = xi;
+ for (auto & li : l) {
+ int cexp = pre_coeff.degree(li);
+ pre_coeff = pre_coeff.coeff(li, cexp);
+ key *= pow(li, cexp);
}
- exmap::iterator ci = cmap.find(key);
+ auto ci = cmap.find(key);
if (ci != cmap.end())
ci->second += pre_coeff;
else
}
exvector resv;
- for (exmap::const_iterator mi=cmap.begin(); mi != cmap.end(); ++mi)
- resv.push_back((mi->first)*(mi->second));
- return (new add(resv))->setflag(status_flags::dynallocated);
+ for (auto & mi : cmap)
+ resv.push_back((mi.first)*(mi.second));
+ return dynallocate<add>(resv);
} else {
}
/** Perform automatic non-interruptive term rewriting rules. */
-ex basic::eval(int level) const
+ex basic::eval() const
{
// There is nothing to do for basic objects:
return hold();
/** Function object to be applied by basic::evalf(). */
struct evalf_map_function : public map_function {
- int level;
- evalf_map_function(int l) : level(l) {}
- ex operator()(const ex & e) { return evalf(e, level); }
+ ex operator()(const ex & e) override { return evalf(e); }
};
/** Evaluate object numerically. */
-ex basic::evalf(int level) const
+ex basic::evalf() const
{
if (nops() == 0)
return *this;
else {
- if (level == 1)
- return *this;
- else if (level == -max_recursion_level)
- throw(std::runtime_error("max recursion level reached"));
- else {
- evalf_map_function map_evalf(level - 1);
- return map(map_evalf);
- }
+ evalf_map_function map_evalf;
+ return map(map_evalf);
}
}
/** Function object to be applied by basic::evalm(). */
struct evalm_map_function : public map_function {
- ex operator()(const ex & e) { return evalm(e); }
+ ex operator()(const ex & e) override { return evalm(e); }
} map_evalm;
/** Evaluate sums, products and integer powers of matrices. */
/** Function object to be applied by basic::eval_integ(). */
struct eval_integ_map_function : public map_function {
- ex operator()(const ex & e) { return eval_integ(e); }
+ ex operator()(const ex & e) override { return eval_integ(e); }
} map_eval_integ;
/** Evaluate integrals, if result is known. */
}
/** Check whether the expression matches a given pattern. For every wildcard
- * object in the pattern, an expression of the form "wildcard == matching_expression"
- * is added to repl_lst. */
-bool basic::match(const ex & pattern, lst & repl_lst) const
+ * object in the pattern, a pair with the wildcard as a key and matching
+ * expression as a value is added to repl_lst. */
+bool basic::match(const ex & pattern, exmap& repl_lst) const
{
/*
Sweet sweet shapes, sweet sweet shapes,
// Wildcard matches anything, but check whether we already have found
// a match for that wildcard first (if so, the earlier match must be
// the same expression)
- for (lst::const_iterator it = repl_lst.begin(); it != repl_lst.end(); ++it) {
- if (it->op(0).is_equal(pattern))
- return is_equal(ex_to<basic>(it->op(1)));
+ for (auto & it : repl_lst) {
+ if (it.first.is_equal(pattern))
+ return is_equal(ex_to<basic>(it.second));
}
- repl_lst.append(pattern == *this);
+ repl_lst[pattern] = *this;
return true;
} else {
// Expression must be of the same type as the pattern
- if (tinfo() != ex_to<basic>(pattern).tinfo())
+ if (typeid(*this) != typeid(ex_to<basic>(pattern)))
return false;
// Number of subexpressions must match
// 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.
- lst tmp_repl = repl_lst;
+ exmap tmp_repl = repl_lst;
// Otherwise the subexpressions must match one-to-one
for (size_t i=0; i<nops(); i++)
if (!op(i).match(pattern.op(i), tmp_repl))
/** Helper function for subs(). Does not recurse into subexpressions. */
ex basic::subs_one_level(const exmap & m, unsigned options) const
{
- exmap::const_iterator it;
-
if (options & subs_options::no_pattern) {
- ex thisex = *this;
- it = m.find(thisex);
+ ex thisex = *this; // NB: *this may be deleted here.
+ auto it = m.find(thisex);
if (it != m.end())
return it->second;
return thisex;
} else {
- for (it = m.begin(); it != m.end(); ++it) {
- lst repl_lst;
- if (match(ex_to<basic>(it->first), repl_lst))
- return it->second.subs(repl_lst, options | subs_options::no_pattern); // avoid infinite recursion when re-substituting the wildcards
+ for (auto & it : m) {
+ exmap repl_lst;
+ if (match(ex_to<basic>(it.first), repl_lst))
+ return it.second.subs(repl_lst, options | subs_options::no_pattern);
+ // avoid infinite recursion when re-substituting the wildcards
}
}
// Something changed, clone the object
basic *copy = duplicate();
- copy->setflag(status_flags::dynallocated);
copy->clearflag(status_flags::hash_calculated | status_flags::expanded);
// Substitute the changed operand
struct derivative_map_function : public map_function {
const symbol &s;
derivative_map_function(const symbol &sym) : s(sym) {}
- ex operator()(const ex & e) { return diff(e, s); }
+ ex operator()(const ex & e) override { return diff(e, s); }
};
/** Default implementation of ex::diff(). It maps the operation on the
return return_types::commutative;
}
-tinfo_t basic::return_type_tinfo() const
+return_type_t basic::return_type_tinfo() const
{
- return tinfo_key;
+ return_type_t rt;
+ rt.tinfo = &typeid(*this);
+ rt.rl = 0;
+ return rt;
}
/** Compute the hash value of an object and if it makes sense to store it in
* would all end up with the same hashvalue. */
unsigned basic::calchash() const
{
- unsigned v = golden_ratio_hash((p_int)tinfo());
+ unsigned v = make_hash_seed(typeid(*this));
for (size_t i=0; i<nops(); i++) {
v = rotate_left(v);
v ^= this->op(i).gethash();
struct expand_map_function : public map_function {
unsigned options;
expand_map_function(unsigned o) : options(o) {}
- ex operator()(const ex & e) { return e.expand(options); }
+ ex operator()(const ex & e) override { return e.expand(options); }
};
/** Expand expression, i.e. multiply it out and return the result as a new
compare_statistics.compare_same_hashvalue++;
#endif
- const tinfo_t typeid_this = tinfo();
- const tinfo_t typeid_other = other.tinfo();
- if (typeid_this==typeid_other) {
- GINAC_ASSERT(typeid(*this)==typeid(other));
+ const std::type_info& typeid_this = typeid(*this);
+ const std::type_info& typeid_other = typeid(other);
+ if (typeid_this == typeid_other) {
// int cmpval = compare_same_type(other);
// if (cmpval!=0) {
// std::cout << "hash collision, same type: "
// std::cout << " and ";
// other.print(print_tree(std::cout));
// std::cout << std::endl;
- return (typeid_this<typeid_other ? -1 : 1);
+ return (typeid_this.before(typeid_other) ? -1 : 1);
}
}
#ifdef GINAC_COMPARE_STATISTICS
compare_statistics.is_equal_same_hashvalue++;
#endif
- if (this->tinfo()!=other.tinfo())
+ if (typeid(*this) != typeid(other))
return false;
- GINAC_ASSERT(typeid(*this)==typeid(other));
-
#ifdef GINAC_COMPARE_STATISTICS
compare_statistics.is_equal_same_type++;
#endif
// global variables
//////////
-int max_recursion_level = 1024;
-
-
#ifdef GINAC_COMPARE_STATISTICS
compare_statistics_t::~compare_statistics_t()
{
git://www.ginac.de / ginac.git / blobdiff