X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.cpp;h=9110491e3246a7fc750f96fce18bdb3895e7fc24;hp=06ada496cfbe3c7ad999081eb6e702089751d69d;hb=6cac49558b75dce07f607e26ba74aa9148f92720;hpb=d327f3f00c66a79d42855939866047b3e8caa630

diff --git a/ginac/add.cpp b/ginac/add.cpp
index 06ada496..9110491e 100644
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's sums of expressions. */
 
 /*
- *  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
@@ -20,11 +20,6 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <iostream>
-#include <stdexcept>
-#include <limits>
-#include <string>
-
 #include "add.h"
 #include "mul.h"
 #include "archive.h"
@@ -33,6 +28,12 @@
 #include "utils.h"
 #include "clifford.h"
 #include "ncmul.h"
+#include "compiler.h"
+
+#include <iostream>
+#include <limits>
+#include <stdexcept>
+#include <string>
 
 namespace GiNaC {
 
@@ -224,6 +225,16 @@ bool add::info(unsigned inf) const
 		case info_flags::integer_polynomial:
 		case info_flags::cinteger_polynomial:
 		case info_flags::rational_polynomial:
+		case info_flags::real:
+		case info_flags::rational:
+		case info_flags::integer:
+		case info_flags::crational:
+		case info_flags::cinteger:
+		case info_flags::positive:
+		case info_flags::nonnegative:
+		case info_flags::posint:
+		case info_flags::nonnegint:
+		case info_flags::even:
 		case info_flags::crational_polynomial:
 		case info_flags::rational_function: {
 			epvector::const_iterator i = seq.begin(), end = seq.end();
@@ -232,6 +243,8 @@ bool add::info(unsigned inf) const
 					return false;
 				++i;
 			}
+			if (overall_coeff.is_zero() && (inf == info_flags::positive || inf == info_flags::posint))
+				return true;
 			return overall_coeff.info(inf);
 		}
 		case info_flags::algebraic: {
@@ -247,6 +260,16 @@ bool add::info(unsigned inf) const
 	return inherited::info(inf);
 }
 
+bool add::is_polynomial(const ex & var) const
+{
+	for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) {
+		if (!(i->rest).is_polynomial(var)) {
+			return false;
+		}
+	}
+	return true;
+}
+
 int add::degree(const ex & s) const
 {
 	int deg = std::numeric_limits<int>::min();
@@ -285,7 +308,7 @@ ex add::coeff(const ex & s, int n) const
 {
 	std::auto_ptr<epvector> coeffseq(new epvector);
 	std::auto_ptr<epvector> coeffseq_cliff(new epvector);
-	char rl = clifford_max_label(s);
+	int rl = clifford_max_label(s);
 	bool do_clifford = (rl != -1);
 	bool nonscalar = false;
 
@@ -293,14 +316,14 @@ ex add::coeff(const ex & s, int n) const
 	epvector::const_iterator i = seq.begin(), end = seq.end();
 	while (i != end) {
 		ex restcoeff = i->rest.coeff(s, n);
- 		if (!restcoeff.is_zero()) {
- 			if (do_clifford) {
- 				if (clifford_max_label(restcoeff) == -1) {
- 					coeffseq_cliff->push_back(combine_ex_with_coeff_to_pair(ncmul(restcoeff, dirac_ONE(rl)), i->coeff));
+		if (!restcoeff.is_zero()) {
+			if (do_clifford) {
+				if (clifford_max_label(restcoeff) == -1) {
+					coeffseq_cliff->push_back(combine_ex_with_coeff_to_pair(ncmul(restcoeff, dirac_ONE(rl)), i->coeff));
 				} else {
- 					coeffseq_cliff->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff));
+					coeffseq_cliff->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff));
 					nonscalar = true;
- 				}
+				}
 			}
 			coeffseq->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff));
 		}
@@ -331,9 +354,6 @@ ex add::eval(int level) const
 	epvector::const_iterator i = seq.begin(), end = seq.end();
 	while (i != end) {
 		GINAC_ASSERT(!is_exactly_a<add>(i->rest));
-		if (is_exactly_a<numeric>(i->rest))
-			dbgprint();
-		GINAC_ASSERT(!is_exactly_a<numeric>(i->rest));
 		++i;
 	}
 #endif // def DO_GINAC_ASSERT
@@ -354,6 +374,33 @@ ex add::eval(int level) const
 	} else if (!overall_coeff.is_zero() && seq[0].rest.return_type() != return_types::commutative) {
 		throw (std::logic_error("add::eval(): sum of non-commutative objects has non-zero numeric term"));
 	}
+	
+	// if any terms in the sum still are purely numeric, then they are more
+	// appropriately collected into the overall coefficient
+	epvector::const_iterator last = seq.end();
+	epvector::const_iterator j = seq.begin();
+	int terms_to_collect = 0;
+	while (j != last) {
+		if (unlikely(is_a<numeric>(j->rest)))
+			++terms_to_collect;
+		++j;
+	}
+	if (terms_to_collect) {
+		std::auto_ptr<epvector> s(new epvector);
+		s->reserve(seq_size - terms_to_collect);
+		numeric oc = *_num1_p;
+		j = seq.begin();
+		while (j != last) {
+			if (unlikely(is_a<numeric>(j->rest)))
+				oc = oc.mul(ex_to<numeric>(j->rest)).mul(ex_to<numeric>(j->coeff));
+			else
+				s->push_back(*j);
+			++j;
+		}
+		return (new add(s, ex_to<numeric>(overall_coeff).add_dyn(oc)))
+		        ->setflag(status_flags::dynallocated);
+	}
+	
 	return this->hold();
 }
 
@@ -528,7 +575,7 @@ expair add::split_ex_to_pair(const ex & e) const
 }
 
 expair add::combine_ex_with_coeff_to_pair(const ex & e,
-										  const ex & c) const
+                                          const ex & c) const
 {
 	GINAC_ASSERT(is_exactly_a<numeric>(c));
 	if (is_exactly_a<mul>(e)) {
@@ -554,7 +601,7 @@ expair add::combine_ex_with_coeff_to_pair(const ex & e,
 }
 
 expair add::combine_pair_with_coeff_to_pair(const expair & p,
-											const ex & c) const
+                                            const ex & c) const
 {
 	GINAC_ASSERT(is_exactly_a<numeric>(p.coeff));
 	GINAC_ASSERT(is_exactly_a<numeric>(c));
@@ -566,7 +613,7 @@ expair add::combine_pair_with_coeff_to_pair(const expair & p,
 
 	return expair(p.rest,ex_to<numeric>(p.coeff).mul_dyn(ex_to<numeric>(c)));
 }
-	
+
 ex add::recombine_pair_to_ex(const expair & p) const
 {
 	if (ex_to<numeric>(p.coeff).is_equal(*_num1_p))