X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.cpp;h=4c857044d5df509892cce89bfbafe8bd99b45c79;hp=353b4a7744079ec1d73549454746a5a36eaf632f;hb=694f839947982f5b12b6c629d5bab522c801630d;hpb=1531cd76f7b2159647bfddb0d9e9cc9b2a98b94e

diff --git a/ginac/add.cpp b/ginac/add.cpp
index 353b4a77..4c857044 100644
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's sums of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2007 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2009 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,9 +20,6 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <iostream>
-#include <stdexcept>
-
 #include "add.h"
 #include "mul.h"
 #include "archive.h"
@@ -32,6 +29,11 @@
 #include "clifford.h"
 #include "ncmul.h"
 
+#include <iostream>
+#include <limits>
+#include <stdexcept>
+#include <string>
+
 namespace GiNaC {
 
 GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(add, expairseq,
@@ -47,7 +49,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(add, expairseq,
 
 add::add()
 {
-	tinfo_key = &add::tinfo_static;
 }
 
 //////////
@@ -58,7 +59,6 @@ add::add()
 
 add::add(const ex & lh, const ex & rh)
 {
-	tinfo_key = &add::tinfo_static;
 	overall_coeff = _ex0;
 	construct_from_2_ex(lh,rh);
 	GINAC_ASSERT(is_canonical());
@@ -66,7 +66,6 @@ add::add(const ex & lh, const ex & rh)
 
 add::add(const exvector & v)
 {
-	tinfo_key = &add::tinfo_static;
 	overall_coeff = _ex0;
 	construct_from_exvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -74,7 +73,6 @@ add::add(const exvector & v)
 
 add::add(const epvector & v)
 {
-	tinfo_key = &add::tinfo_static;
 	overall_coeff = _ex0;
 	construct_from_epvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -82,7 +80,6 @@ add::add(const epvector & v)
 
 add::add(const epvector & v, const ex & oc)
 {
-	tinfo_key = &add::tinfo_static;
 	overall_coeff = oc;
 	construct_from_epvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -90,7 +87,6 @@ add::add(const epvector & v, const ex & oc)
 
 add::add(std::auto_ptr<epvector> vp, const ex & oc)
 {
-	tinfo_key = &add::tinfo_static;
 	GINAC_ASSERT(vp.get()!=0);
 	overall_coeff = oc;
 	construct_from_epvector(*vp);
@@ -101,7 +97,7 @@ add::add(std::auto_ptr<epvector> vp, const ex & oc)
 // archiving
 //////////
 
-DEFAULT_ARCHIVING(add)
+GINAC_BIND_UNARCHIVER(add);
 
 //////////
 // functions overriding virtual functions from base classes
@@ -171,37 +167,32 @@ void add::do_print_csrc(const print_csrc & c, unsigned level) const
 	if (precedence() <= level)
 		c.s << "(";
 	
-	// Print arguments, separated by "+"
+	// Print arguments, separated by "+" or "-"
 	epvector::const_iterator it = seq.begin(), itend = seq.end();
+	char separator = ' ';
 	while (it != itend) {
 		
-		// If the coefficient is -1, it is replaced by a single minus sign
-		if (it->coeff.is_equal(_ex1)) {
-			it->rest.print(c, precedence());
-		} else if (it->coeff.is_equal(_ex_1)) {
-			c.s << "-";
+		// If the coefficient is negative, separator is "-"
+		if (it->coeff.is_equal(_ex_1) || 
+			ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p))
+			separator = '-';
+		c.s << separator;
+		if (it->coeff.is_equal(_ex1) || it->coeff.is_equal(_ex_1)) {
 			it->rest.print(c, precedence());
-		} else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num1_p)) {
-			it->rest.print(c, precedence());
-			c.s << "/";
-			ex_to<numeric>(it->coeff).denom().print(c, precedence());
-		} else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p)) {
-			c.s << "-";
+		} else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num1_p) ||
+				 ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p))
+		{
 			it->rest.print(c, precedence());
-			c.s << "/";
+			c.s << '/';
 			ex_to<numeric>(it->coeff).denom().print(c, precedence());
 		} else {
 			it->coeff.print(c, precedence());
-			c.s << "*";
+			c.s << '*';
 			it->rest.print(c, precedence());
 		}
 		
-		// Separator is "+", except if the following expression would have a leading minus sign or the sign is sitting in parenthesis (as in a ctor)
 		++it;
-		if (it != itend
-		 && (is_a<print_csrc_cl_N>(c) || !it->coeff.info(info_flags::real)  // sign inside ctor arguments
-		  || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(*_num1_p) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative)))))
-			c.s << "+";
+		separator = '+';
 	}
 	
 	if (!overall_coeff.is_zero()) {
@@ -258,7 +249,7 @@ bool add::info(unsigned inf) const
 
 int add::degree(const ex & s) const
 {
-	int deg = INT_MIN;
+	int deg = std::numeric_limits<int>::min();
 	if (!overall_coeff.is_zero())
 		deg = 0;
 	
@@ -275,7 +266,7 @@ int add::degree(const ex & s) const
 
 int add::ldegree(const ex & s) const
 {
-	int deg = INT_MAX;
+	int deg = std::numeric_limits<int>::max();
 	if (!overall_coeff.is_zero())
 		deg = 0;
 	
@@ -501,10 +492,10 @@ unsigned add::return_type() const
 		return seq.begin()->rest.return_type();
 }
 
-tinfo_t add::return_type_tinfo() const
+return_type_t add::return_type_tinfo() const
 {
 	if (seq.empty())
-		return this;
+		return make_return_type_t<add>();
 	else
 		return seq.begin()->rest.return_type_tinfo();
 }