#include "utils.h"
#include "hash_seed.h"
#include "indexed.h"
+#include "compiler.h"
#include <algorithm>
#include <iostream>
#include <iterator>
+#include <memory>
#include <stdexcept>
#include <string>
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");
+ auto first = n.find_first("rest");
+ auto last = n.find_last("coeff");
++last;
seq.reserve((last-first)/2);
- for (archive_node::archive_node_cit loc = first; loc < last;) {
+ for (auto loc = first; loc < last;) {
ex rest;
ex coeff;
n.find_ex_by_loc(loc++, rest, sym_lst);
void expairseq::archive(archive_node &n) const
{
inherited::archive(n);
- epvector::const_iterator i = seq.begin(), iend = seq.end();
- while (i != iend) {
- n.add_ex("rest", i->rest);
- n.add_ex("coeff", i->coeff);
- ++i;
+ for (auto & i : seq) {
+ n.add_ex("rest", i.rest);
+ n.add_ex("coeff", i.coeff);
}
n.add_ex("overall_coeff", overall_coeff);
}
return true;
else if (flags & status_flags::has_no_indices)
return false;
- for (epvector::const_iterator i = seq.begin(); i != seq.end(); ++i) {
- if (i->rest.info(info_flags::has_indices)) {
+ for (auto & i : seq) {
+ if (i.rest.info(info_flags::has_indices)) {
this->setflag(status_flags::has_indices);
this->clearflag(status_flags::has_no_indices);
return true;
epvector v;
v.reserve(seq.size()+1);
- epvector::const_iterator cit = seq.begin(), last = seq.end();
- while (cit != last) {
- v.push_back(split_ex_to_pair(f(recombine_pair_to_ex(*cit))));
- ++cit;
- }
+ for (auto & it : seq)
+ v.push_back(split_ex_to_pair(f(recombine_pair_to_ex(it))));
if (overall_coeff.is_equal(default_overall_coeff()))
return thisexpairseq(std::move(v), default_overall_coeff(), true);
epvector evaled = evalchildren(level);
if (!evaled.empty())
- return (new expairseq(std::move(evaled), overall_coeff))->setflag(status_flags::dynallocated | status_flags::evaluated);
+ return dynallocate<expairseq>(std::move(evaled), overall_coeff).setflag(status_flags::evaluated);
else
return this->hold();
}
epvector* conjugateepvector(const epvector&epv)
{
- epvector *newepv = 0;
- for (epvector::const_iterator i=epv.begin(); i!=epv.end(); ++i) {
- if(newepv) {
+ epvector *newepv = nullptr;
+ for (auto i=epv.begin(); i!=epv.end(); ++i) {
+ if (newepv) {
newepv->push_back(i->conjugate());
continue;
}
ex expairseq::conjugate() const
{
- epvector* newepv = conjugateepvector(seq);
+ std::unique_ptr<epvector> newepv(conjugateepvector(seq));
ex x = overall_coeff.conjugate();
if (newepv) {
- ex result = thisexpairseq(std::move(*newepv), x);
- delete newepv;
- return result;
+ return thisexpairseq(std::move(*newepv), x);
}
if (are_ex_trivially_equal(x, overall_coeff)) {
return *this;
ex p = pattern.op(i);
if (has_global_wildcard && p.is_equal(global_wildcard))
continue;
- exvector::iterator it = ops.begin(), itend = ops.end();
+ auto it = ops.begin(), itend = ops.end();
while (it != itend) {
if (it->match(p, tmp_repl)) {
ops.erase(it);
for (size_t i=0; i<num; i++)
vp.push_back(split_ex_to_pair(ops[i]));
ex rest = thisexpairseq(std::move(vp), default_overall_coeff());
- 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)) {
+ for (auto & it : tmp_repl) {
+ if (it.first.is_equal(global_wildcard)) {
+ if (rest.is_equal(it.second)) {
repl_lst = tmp_repl;
return true;
}
if (cmpval!=0)
return cmpval;
- epvector::const_iterator cit1 = seq.begin();
- epvector::const_iterator cit2 = o.seq.begin();
- epvector::const_iterator last1 = seq.end();
- epvector::const_iterator last2 = o.seq.end();
-
- for (; (cit1!=last1)&&(cit2!=last2); ++cit1, ++cit2) {
+ auto cit1 = seq.begin(), last1 = seq.end();
+ auto cit2 = o.seq.begin(), last2 = o.seq.end();
+ for (; (cit1!=last1) && (cit2!=last2); ++cit1, ++cit2) {
cmpval = (*cit1).compare(*cit2);
if (cmpval!=0) return cmpval;
}
if (!overall_coeff.is_equal(o.overall_coeff))
return false;
- epvector::const_iterator cit1 = seq.begin();
- epvector::const_iterator cit2 = o.seq.begin();
- epvector::const_iterator last1 = seq.end();
-
- while (cit1!=last1) {
- if (!(*cit1).is_equal(*cit2)) return false;
- ++cit1;
+ auto cit2 = o.seq.begin();
+ for (auto & cit1 : seq) {
+ if (!cit1.is_equal(*cit2))
+ return false;
++cit2;
}
unsigned expairseq::calchash() const
{
unsigned v = make_hash_seed(typeid(*this));
- epvector::const_iterator i = seq.begin();
- const epvector::const_iterator end = seq.end();
- while (i != end) {
- v ^= i->rest.gethash();
+ for (auto & i : seq) {
+ v ^= i.rest.gethash();
v = rotate_left(v);
- v ^= i->coeff.gethash();
- ++i;
+ v ^= i.coeff.gethash();
}
v ^= overall_coeff.gethash();
{
if (this_precedence <= upper_precedence)
c.s << "(";
- epvector::const_iterator it, it_last = seq.end() - 1;
- for (it=seq.begin(); it!=it_last; ++it) {
+ auto it = seq.begin(), it_last = seq.end() - 1;
+ for (; it!=it_last; ++it) {
printpair(c, *it, this_precedence);
c.s << delim;
}
* @see expairseq::split_ex_to_pair() */
ex expairseq::recombine_pair_to_ex(const expair &p) const
{
- return lst(p.rest,p.coeff);
+ return lst{p.rest, p.coeff};
}
bool expairseq::expair_needs_further_processing(epp it)
combine_overall_coeff(s1.overall_coeff);
combine_overall_coeff(s2.overall_coeff);
- epvector::const_iterator first1 = s1.seq.begin();
- epvector::const_iterator last1 = s1.seq.end();
- epvector::const_iterator first2 = s2.seq.begin();
- epvector::const_iterator last2 = s2.seq.end();
+ auto first1 = s1.seq.begin(), last1 = s1.seq.end();
+ auto first2 = s2.seq.begin(), last2 = s2.seq.end();
seq.reserve(s1.seq.size()+s2.seq.size());
}
if (needs_further_processing) {
- epvector v = seq;
- seq.clear();
+ // Clear seq and start over.
+ epvector v = std::move(seq);
construct_from_epvector(std::move(v));
}
}
return;
}
- epvector::const_iterator first = s.seq.begin();
- epvector::const_iterator last = s.seq.end();
+ auto first = s.seq.begin(), last = s.seq.end();
expair p = split_ex_to_pair(e);
seq.reserve(s.seq.size()+1);
}
if (needs_further_processing) {
- epvector v = seq;
- seq.clear();
+ // Clear seq and start over.
+ epvector v = std::move(seq);
construct_from_epvector(std::move(v));
}
}
* It cares for associativity as well as for special handling of numerics. */
void expairseq::make_flat(const exvector &v)
{
- exvector::const_iterator cit;
-
// count number of operands which are of same expairseq derived type
// and their cumulative number of operands
int nexpairseqs = 0;
int noperands = 0;
bool do_idx_rename = false;
- cit = v.begin();
- while (cit!=v.end()) {
- if (typeid(ex_to<basic>(*cit)) == typeid(*this)) {
+ for (auto & cit : v) {
+ if (typeid(ex_to<basic>(cit)) == typeid(*this)) {
++nexpairseqs;
- noperands += ex_to<expairseq>(*cit).seq.size();
+ noperands += ex_to<expairseq>(cit).seq.size();
}
if (is_a<mul>(*this) && (!do_idx_rename) &&
- cit->info(info_flags::has_indices))
+ cit.info(info_flags::has_indices))
do_idx_rename = true;
- ++cit;
}
// reserve seq and coeffseq which will hold all operands
// copy elements and split off numerical part
make_flat_inserter mf(v, do_idx_rename);
- cit = v.begin();
- while (cit!=v.end()) {
- if (typeid(ex_to<basic>(*cit)) == typeid(*this)) {
- ex newfactor = mf.handle_factor(*cit, _ex1);
+ for (auto & cit : v) {
+ if (typeid(ex_to<basic>(cit)) == typeid(*this)) {
+ ex newfactor = mf.handle_factor(cit, _ex1);
const expairseq &subseqref = ex_to<expairseq>(newfactor);
combine_overall_coeff(subseqref.overall_coeff);
- epvector::const_iterator cit_s = subseqref.seq.begin();
- while (cit_s!=subseqref.seq.end()) {
- seq.push_back(*cit_s);
- ++cit_s;
+ for (auto & cit_s : subseqref.seq) {
+ seq.push_back(cit_s);
}
} else {
- if (is_exactly_a<numeric>(*cit))
- combine_overall_coeff(*cit);
+ if (is_exactly_a<numeric>(cit))
+ combine_overall_coeff(cit);
else {
- ex newfactor = mf.handle_factor(*cit, _ex1);
+ ex newfactor = mf.handle_factor(cit, _ex1);
seq.push_back(split_ex_to_pair(newfactor));
}
}
- ++cit;
}
}
* It cares for associativity as well as for special handling of numerics. */
void expairseq::make_flat(const epvector &v, bool do_index_renaming)
{
- epvector::const_iterator cit;
-
// count number of operands which are of same expairseq derived type
// and their cumulative number of operands
int nexpairseqs = 0;
int noperands = 0;
bool really_need_rename_inds = false;
- cit = v.begin();
- while (cit!=v.end()) {
- if (typeid(ex_to<basic>(cit->rest)) == typeid(*this)) {
+ for (auto & cit : v) {
+ if (typeid(ex_to<basic>(cit.rest)) == typeid(*this)) {
++nexpairseqs;
- noperands += ex_to<expairseq>(cit->rest).seq.size();
+ noperands += ex_to<expairseq>(cit.rest).seq.size();
}
if ((!really_need_rename_inds) && is_a<mul>(*this) &&
- cit->rest.info(info_flags::has_indices))
+ cit.rest.info(info_flags::has_indices))
really_need_rename_inds = true;
- ++cit;
}
do_index_renaming = do_index_renaming && really_need_rename_inds;
make_flat_inserter mf(v, do_index_renaming);
// copy elements and split off numerical part
- cit = v.begin();
- while (cit!=v.end()) {
- if ((typeid(ex_to<basic>(cit->rest)) == typeid(*this)) &&
- this->can_make_flat(*cit)) {
- ex newrest = mf.handle_factor(cit->rest, cit->coeff);
+ for (auto & cit : v) {
+ if (typeid(ex_to<basic>(cit.rest)) == typeid(*this) &&
+ this->can_make_flat(cit)) {
+ ex newrest = mf.handle_factor(cit.rest, cit.coeff);
const expairseq &subseqref = ex_to<expairseq>(newrest);
combine_overall_coeff(ex_to<numeric>(subseqref.overall_coeff),
- ex_to<numeric>(cit->coeff));
- epvector::const_iterator cit_s = subseqref.seq.begin();
- while (cit_s!=subseqref.seq.end()) {
- seq.push_back(expair(cit_s->rest,
- ex_to<numeric>(cit_s->coeff).mul_dyn(ex_to<numeric>(cit->coeff))));
- ++cit_s;
+ ex_to<numeric>(cit.coeff));
+ for (auto & cit_s : subseqref.seq) {
+ seq.push_back(expair(cit_s.rest,
+ ex_to<numeric>(cit_s.coeff).mul_dyn(ex_to<numeric>(cit.coeff))));
}
} else {
- if (cit->is_canonical_numeric())
- combine_overall_coeff(mf.handle_factor(cit->rest, _ex1));
+ if (cit.is_canonical_numeric())
+ combine_overall_coeff(mf.handle_factor(cit.rest, _ex1));
else {
- ex rest = cit->rest;
- ex newrest = mf.handle_factor(rest, cit->coeff);
+ ex rest = cit.rest;
+ ex newrest = mf.handle_factor(rest, cit.coeff);
if (are_ex_trivially_equal(newrest, rest))
- seq.push_back(*cit);
+ seq.push_back(cit);
else
- seq.push_back(expair(newrest, cit->coeff));
+ seq.push_back(expair(newrest, cit.coeff));
}
}
- ++cit;
}
}
bool needs_further_processing = false;
- epvector::iterator itin1 = seq.begin();
- epvector::iterator itin2 = itin1+1;
- epvector::iterator itout = itin1;
- epvector::iterator last = seq.end();
+ auto itin1 = seq.begin();
+ auto itin2 = itin1 + 1;
+ auto itout = itin1;
+ auto last = seq.end();
// must_copy will be set to true the first time some combination is
// possible from then on the sequence has changed and must be compacted
bool must_copy = false;
seq.erase(itout,last);
if (needs_further_processing) {
- epvector v = seq;
- seq.clear();
+ // Clear seq and start over.
+ epvector v = std::move(seq);
construct_from_epvector(std::move(v));
}
}
if (seq.size() <= 1)
return 1;
- epvector::const_iterator it = seq.begin(), itend = seq.end();
- epvector::const_iterator it_last = it;
+ auto it = seq.begin(), itend = seq.end();
+ auto it_last = it;
for (++it; it!=itend; it_last=it, ++it) {
if (!(it_last->is_less(*it) || it_last->is_equal(*it))) {
if (!is_exactly_a<numeric>(it_last->rest) ||
* had to be changed. */
epvector expairseq::expandchildren(unsigned options) const
{
- const epvector::const_iterator last = seq.end();
- epvector::const_iterator cit = seq.begin();
+ auto cit = seq.begin(), last = seq.end();
while (cit!=last) {
const ex &expanded_ex = cit->rest.expand(options);
if (!are_ex_trivially_equal(cit->rest,expanded_ex)) {
s.reserve(seq.size());
// copy parts of seq which are known not to have changed
- epvector::const_iterator cit2 = seq.begin();
+ auto cit2 = seq.begin();
while (cit2!=cit) {
s.push_back(*cit2);
++cit2;
* had to be changed. */
epvector expairseq::evalchildren(int level) const
{
- if (level==1)
+ if (likely(level==1))
return epvector(); // nothing had to be evaluated
if (level == -max_recursion_level)
throw(std::runtime_error("max recursion level reached"));
--level;
- epvector::const_iterator last = seq.end();
- epvector::const_iterator cit = seq.begin();
+ auto cit = seq.begin(), last = seq.end();
while (cit!=last) {
const ex evaled_ex = cit->rest.eval(level);
if (!are_ex_trivially_equal(cit->rest,evaled_ex)) {
s.reserve(seq.size());
// copy parts of seq which are known not to have changed
- epvector::const_iterator cit2=seq.begin();
+ auto cit2 = seq.begin();
while (cit2!=cit) {
s.push_back(*cit2);
++cit2;
if (!(options & (subs_options::pattern_is_product | subs_options::pattern_is_not_product))) {
// Search the list of substitutions and cache our findings
- for (exmap::const_iterator it = m.begin(); it != m.end(); ++it) {
- if (is_exactly_a<mul>(it->first) || is_exactly_a<power>(it->first)) {
+ for (auto & it : m) {
+ if (is_exactly_a<mul>(it.first) || is_exactly_a<power>(it.first)) {
options |= subs_options::pattern_is_product;
break;
}
if (options & subs_options::pattern_is_product) {
// Substitute in the recombined pairs
- epvector::const_iterator cit = seq.begin(), last = seq.end();
+ auto cit = seq.begin(), last = seq.end();
while (cit != last) {
const ex &orig_ex = recombine_pair_to_ex(*cit);
} else {
// Substitute only in the "rest" part of the pairs
- epvector::const_iterator cit = seq.begin(), last = seq.end();
+ auto cit = seq.begin(), last = seq.end();
while (cit != last) {
const ex &subsed_ex = cit->rest.subs(m, options);
git://www.ginac.de / ginac.git / blobdiff