X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fexpairseq.cpp;h=a67eb4e0d1504e2f525559ccb71e37e296d8348d;hb=f532e05bf7638c592ee609943c349739500480bf;hp=e99d21fe0061d64d2102c9dd1df966decc27bb2b;hpb=6c946d4c762f5a0d6a3b742f03556dd018d63886;p=ginac.git

diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp
index e99d21fe..a67eb4e0 100644
--- a/ginac/expairseq.cpp
+++ b/ginac/expairseq.cpp
@@ -3,7 +3,7 @@
  *  Implementation of sequences of expression pairs. */
 
 /*
- *  GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2018 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
@@ -265,7 +265,7 @@ epvector* conjugateepvector(const epvector&epv)
 		}
 		newepv = new epvector;
 		newepv->reserve(epv.size());
-		for (epvector::const_iterator j=epv.begin(); j!=i; ++j) {
+		for (auto j=epv.begin(); j!=i; ++j) {
 			newepv->push_back(*j);
 		}
 		newepv->push_back(x);
@@ -599,19 +599,11 @@ bool expairseq::can_make_flat(const expair &p) const
 // non-virtual functions in this class
 //////////
 
-void expairseq::construct_from_2_ex_via_exvector(const ex &lh, const ex &rh)
-{
-	exvector v;
-	v.reserve(2);
-	v.push_back(lh);
-	v.push_back(rh);
-	construct_from_exvector(v);
-}
-
 void expairseq::construct_from_2_ex(const ex &lh, const ex &rh)
 {
-	if (typeid(ex_to<basic>(lh)) == typeid(*this)) {
-		if (typeid(ex_to<basic>(rh)) == typeid(*this)) {
+	const std::type_info& typeid_this = typeid(*this);
+	if (typeid(ex_to<basic>(lh)) == typeid_this) {
+		if (typeid(ex_to<basic>(rh)) == typeid_this) {
 			if (is_a<mul>(lh) && lh.info(info_flags::has_indices) && 
 				rh.info(info_flags::has_indices)) {
 				ex newrh=rename_dummy_indices_uniquely(lh, rh);
@@ -626,7 +618,7 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh)
 			construct_from_expairseq_ex(ex_to<expairseq>(lh), rh);
 			return;
 		}
-	} else if (typeid(ex_to<basic>(rh)) == typeid(*this)) {
+	} else if (typeid(ex_to<basic>(rh)) == typeid_this) {
 		construct_from_expairseq_ex(ex_to<expairseq>(rh),lh);
 		return;
 	}
@@ -828,9 +820,10 @@ void expairseq::make_flat(const exvector &v)
 	int nexpairseqs = 0;
 	int noperands = 0;
 	bool do_idx_rename = false;
-	
+
+	const std::type_info& typeid_this = typeid(*this);
 	for (auto & cit : v) {
-		if (typeid(ex_to<basic>(cit)) == typeid(*this)) {
+		if (typeid(ex_to<basic>(cit)) == typeid_this) {
 			++nexpairseqs;
 			noperands += ex_to<expairseq>(cit).seq.size();
 		}
@@ -845,7 +838,7 @@ void expairseq::make_flat(const exvector &v)
 	// copy elements and split off numerical part
 	make_flat_inserter mf(v, do_idx_rename);
 	for (auto & cit : v) {
-		if (typeid(ex_to<basic>(cit)) == typeid(*this)) {
+		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);
@@ -872,9 +865,10 @@ void expairseq::make_flat(const epvector &v, bool do_index_renaming)
 	int nexpairseqs = 0;
 	int noperands = 0;
 	bool really_need_rename_inds = false;
-	
+
+	const std::type_info& typeid_this = typeid(*this);
 	for (auto & cit : v) {
-		if (typeid(ex_to<basic>(cit.rest)) == typeid(*this)) {
+		if (typeid(ex_to<basic>(cit.rest)) == typeid_this) {
 			++nexpairseqs;
 			noperands += ex_to<expairseq>(cit.rest).seq.size();
 		}
@@ -890,12 +884,11 @@ void expairseq::make_flat(const epvector &v, bool do_index_renaming)
 	
 	// copy elements and split off numerical part
 	for (auto & cit : v) {
-		if (typeid(ex_to<basic>(cit.rest)) == typeid(*this) &&
+		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));
+			combine_overall_coeff(subseqref.overall_coeff, 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))));