// public
-ncmul::ncmul(const ex & lh, const ex & rh) : inherited(lh,rh)
+ncmul::ncmul(const ex & lh, const ex & rh) : inherited{lh,rh}
{
}
-ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3) : inherited(f1,f2,f3)
+ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3) : inherited{f1,f2,f3}
{
}
ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3,
- const ex & f4) : inherited(f1,f2,f3,f4)
+ const ex & f4) : inherited{f1,f2,f3,f4}
{
}
ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3,
- const ex & f4, const ex & f5) : inherited(f1,f2,f3,f4,f5)
+ const ex & f4, const ex & f5) : inherited{f1,f2,f3,f4,f5}
{
}
ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3,
- const ex & f4, const ex & f5, const ex & f6) : inherited(f1,f2,f3,f4,f5,f6)
+ const ex & f4, const ex & f5, const ex & f6) : inherited{f1,f2,f3,f4,f5,f6}
{
}
-ncmul::ncmul(const exvector & v, bool discardable) : inherited(v,discardable)
+ncmul::ncmul(const exvector & v) : inherited(v)
{
}
-ncmul::ncmul(std::auto_ptr<exvector> vp) : inherited(vp)
+ncmul::ncmul(exvector && v) : inherited(std::move(v))
{
}
ex ncmul::expand(unsigned options) const
{
// First, expand the children
- std::auto_ptr<exvector> vp = expandchildren(options);
- const exvector &expanded_seq = vp.get() ? *vp : this->seq;
+ exvector v = expandchildren(options);
+ const exvector &expanded_seq = v.empty() ? this->seq : v;
// Now, look for all the factors that are sums and remember their
// position and number of terms.
size_t number_of_expanded_terms = 1;
size_t current_position = 0;
- exvector::const_iterator last = expanded_seq.end();
- for (exvector::const_iterator cit=expanded_seq.begin(); cit!=last; ++cit) {
- if (is_exactly_a<add>(*cit)) {
+ for (auto & it : expanded_seq) {
+ if (is_exactly_a<add>(it)) {
positions_of_adds[number_of_adds] = current_position;
- size_t num_ops = cit->nops();
+ size_t num_ops = it.nops();
number_of_add_operands[number_of_adds] = num_ops;
number_of_expanded_terms *= num_ops;
number_of_adds++;
// If there are no sums, we are done
if (number_of_adds == 0) {
- if (vp.get())
- return (new ncmul(vp))->
+ if (!v.empty())
+ return (new ncmul(std::move(v)))->
setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0));
else
return *this;
term[positions_of_adds[i]] = rename_dummy_indices_uniquely(va, expanded_seq[positions_of_adds[i]].op(k[i]), true);
}
- distrseq.push_back((new ncmul(term, true))->
+ distrseq.push_back((new ncmul(std::move(term)))->
setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0)));
// increment k[]
// Sum up degrees of factors
int deg_sum = 0;
- exvector::const_iterator i = seq.begin(), end = seq.end();
- while (i != end) {
- deg_sum += i->degree(s);
- ++i;
- }
+ for (auto & i : seq)
+ deg_sum += i.degree(s);
return deg_sum;
}
// Sum up degrees of factors
int deg_sum = 0;
- exvector::const_iterator i = seq.begin(), end = seq.end();
- while (i != end) {
- deg_sum += i->degree(s);
- ++i;
- }
+ for (auto & i : seq)
+ deg_sum += i.degree(s);
return deg_sum;
}
if (n == 0) {
// product of individual coeffs
// if a non-zero power of s is found, the resulting product will be 0
- exvector::const_iterator it=seq.begin();
- while (it!=seq.end()) {
- coeffseq.push_back((*it).coeff(s,n));
- ++it;
- }
- return (new ncmul(coeffseq,1))->setflag(status_flags::dynallocated);
+ for (auto & it : seq)
+ coeffseq.push_back(it.coeff(s,n));
+ return (new ncmul(std::move(coeffseq)))->setflag(status_flags::dynallocated);
}
- exvector::const_iterator i = seq.begin(), end = seq.end();
bool coeff_found = false;
- while (i != end) {
- ex c = i->coeff(s,n);
+ for (auto & i : seq) {
+ ex c = i.coeff(s,n);
if (c.is_zero()) {
- coeffseq.push_back(*i);
+ coeffseq.push_back(i);
} else {
coeffseq.push_back(c);
coeff_found = true;
}
- ++i;
}
- if (coeff_found) return (new ncmul(coeffseq,1))->setflag(status_flags::dynallocated);
+ if (coeff_found)
+ return (new ncmul(std::move(coeffseq)))->setflag(status_flags::dynallocated);
return _ex0;
}
// ncmul(...,*(x1,x2),...,ncmul(x3,x4),...) ->
// ncmul(...,x1,x2,...,x3,x4,...) (associativity)
size_t factors = 0;
- exvector::const_iterator cit = evaledseq.begin(), citend = evaledseq.end();
- while (cit != citend)
- factors += count_factors(*cit++);
+ for (auto & it : evaledseq)
+ factors += count_factors(it);
exvector assocseq;
assocseq.reserve(factors);
- cit = evaledseq.begin();
make_flat_inserter mf(evaledseq, true);
- while (cit != citend)
- { ex factor = mf.handle_factor(*(cit++), 1);
+ for (auto & it : evaledseq) {
+ ex factor = mf.handle_factor(it, 1);
append_factors(assocseq, factor);
}
size_t count_commutative=0;
size_t count_noncommutative=0;
size_t count_noncommutative_composite=0;
- cit = assocseq.begin(); citend = assocseq.end();
- while (cit != citend) {
- rettypes[i] = cit->return_type();
+ for (auto & it : assocseq) {
+ rettypes[i] = it.return_type();
switch (rettypes[i]) {
case return_types::commutative:
count_commutative++;
default:
throw(std::logic_error("ncmul::eval(): invalid return type"));
}
- ++i; ++cit;
+ ++i;
}
GINAC_ASSERT(count_commutative+count_noncommutative+count_noncommutative_composite==assocseq.size());
else
noncommutativeseq.push_back(assocseq[i]);
}
- commutativeseq.push_back((new ncmul(noncommutativeseq,1))->setflag(status_flags::dynallocated));
- return (new mul(commutativeseq))->setflag(status_flags::dynallocated);
+ commutativeseq.push_back((new ncmul(std::move(noncommutativeseq)))->setflag(status_flags::dynallocated));
+ return (new mul(std::move(commutativeseq)))->setflag(status_flags::dynallocated);
}
// ncmul(x1,y1,x2,y2) -> *(ncmul(x1,x2),ncmul(y1,y2))
evv.reserve(assoc_num);
rttinfos.reserve(assoc_num);
- cit = assocseq.begin(), citend = assocseq.end();
- while (cit != citend) {
- return_type_t ti = cit->return_type_tinfo();
+ for (auto & it : assocseq) {
+ return_type_t ti = it.return_type_tinfo();
size_t rtt_num = rttinfos.size();
// search type in vector of known types
for (i=0; i<rtt_num; ++i) {
if(ti == rttinfos[i]) {
- evv[i].push_back(*cit);
+ evv[i].push_back(it);
break;
}
}
rttinfos.push_back(ti);
evv.push_back(exvector());
(evv.end()-1)->reserve(assoc_num);
- (evv.end()-1)->push_back(*cit);
+ (evv.end()-1)->push_back(it);
}
- ++cit;
}
size_t evv_num = evv.size();
ex ncmul::evalm() const
{
// Evaluate children first
- std::auto_ptr<exvector> s(new exvector);
- s->reserve(seq.size());
- exvector::const_iterator it = seq.begin(), itend = seq.end();
- while (it != itend) {
- s->push_back(it->evalm());
- it++;
- }
+ exvector s;
+ s.reserve(seq.size());
+ for (auto & it : seq)
+ s.push_back(it.evalm());
// If there are only matrices, simply multiply them
- it = s->begin(); itend = s->end();
+ auto it = s.begin(), itend = s.end();
if (is_a<matrix>(*it)) {
matrix prod(ex_to<matrix>(*it));
it++;
}
no_matrix:
- return (new ncmul(s))->setflag(status_flags::dynallocated);
+ return (new ncmul(std::move(s)))->setflag(status_flags::dynallocated);
}
ex ncmul::thiscontainer(const exvector & v) const
return (new ncmul(v))->setflag(status_flags::dynallocated);
}
-ex ncmul::thiscontainer(std::auto_ptr<exvector> vp) const
+ex ncmul::thiscontainer(exvector && v) const
{
- return (new ncmul(vp))->setflag(status_flags::dynallocated);
+ return (new ncmul(std::move(v)))->setflag(status_flags::dynallocated);
}
ex ncmul::conjugate() const
exvector ev;
ev.reserve(nops());
- for (const_iterator i=end(); i!=begin();) {
+ for (auto i=end(); i!=begin();) {
--i;
ev.push_back(i->conjugate());
}
- return (new ncmul(ev, true))->setflag(status_flags::dynallocated).eval();
+ return (new ncmul(std::move(ev)))->setflag(status_flags::dynallocated).eval();
}
ex ncmul::real_part() const
return make_return_type_t<ncmul>();
// return type_info of first noncommutative element
- exvector::const_iterator i = seq.begin(), end = seq.end();
- while (i != end) {
- if (i->return_type() == return_types::noncommutative)
- return i->return_type_tinfo();
- ++i;
- }
+ for (auto & i : seq)
+ if (i.return_type() == return_types::noncommutative)
+ return i.return_type_tinfo();
// no noncommutative element found, should not happen
return make_return_type_t<ncmul>();
// non-virtual functions in this class
//////////
-std::auto_ptr<exvector> ncmul::expandchildren(unsigned options) const
+exvector ncmul::expandchildren(unsigned options) const
{
- const_iterator cit = this->seq.begin(), end = this->seq.end();
+ auto cit = this->seq.begin(), end = this->seq.end();
while (cit != end) {
const ex & expanded_ex = cit->expand(options);
if (!are_ex_trivially_equal(*cit, expanded_ex)) {
// copy first part of seq which hasn't changed
- std::auto_ptr<exvector> s(new exvector(this->seq.begin(), cit));
- reserve(*s, this->seq.size());
+ exvector s(this->seq.begin(), cit);
+ s.reserve(this->seq.size());
// insert changed element
- s->push_back(expanded_ex);
+ s.push_back(expanded_ex);
++cit;
// copy rest
while (cit != end) {
- s->push_back(cit->expand(options));
+ s.push_back(cit->expand(options));
++cit;
}
++cit;
}
- return std::auto_ptr<exvector>(0); // nothing has changed
+ return exvector(); // nothing has changed
}
const exvector & ncmul::get_factors() const
git://www.ginac.de / ginac.git / blobdiff