X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fnumeric.cpp;h=c86369fbe000cc2f885dac04a19ddcddb9c56394;hp=795c76099172dba5d5284fd6fc08c4183428fc3d;hb=dfaba64cff32f7dfdd96c1a96d1744ce6c1d80ad;hpb=f282e2b3a3873619006b6ffd3fa7fe65010c1299

diff --git a/ginac/numeric.cpp b/ginac/numeric.cpp
index 795c7609..c86369fb 100644
--- a/ginac/numeric.cpp
+++ b/ginac/numeric.cpp
@@ -7,7 +7,7 @@
  *  of special functions or implement the interface to the bignum package. */
 
 /*
- *  GiNaC Copyright (C) 1999-2011 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
@@ -32,7 +32,6 @@
 #include "ex.h"
 #include "operators.h"
 #include "archive.h"
-#include "tostring.h"
 #include "utils.h"
 
 #include <limits>
@@ -225,7 +224,7 @@ numeric::numeric(const char *s)
 			// E to lower case
 			term = term.replace(term.find("E"),1,"e");
 			// append _<Digits> to term
-			term += "_" + ToString((unsigned)Digits);
+			term += "_" + std::to_string((unsigned)Digits);
 			// construct float using cln::cl_F(const char *) ctor.
 			if (imaginary)
 				ctorval = ctorval + cln::complex(cln::cl_I(0),cln::cl_F(term.c_str()));
@@ -502,20 +501,20 @@ static void print_real_cl_N(const print_context & c, const cln::cl_R & x)
 {
 	if (cln::instanceof(x, cln::cl_I_ring)) {
 
-    int dst;
-    // fixnum 
-    if (coerce(dst, cln::the<cln::cl_I>(x))) {
-      // can be converted to native int
-      if (dst < 0)
-        c.s << "(-" << dst << ")";
-      else
-        c.s << dst;
-    } else {
-      // bignum
-      c.s << "cln::cl_I(\"";
-      print_real_number(c, x);
-      c.s << "\")";
-    }
+		int dst;
+		// fixnum 
+		if (coerce(dst, cln::the<cln::cl_I>(x))) {
+			// can be converted to native int
+			if (dst < 0)
+				c.s << "(-" << dst << ")";
+			else
+				c.s << dst;
+		} else {
+			// bignum
+			c.s << "cln::cl_I(\"";
+			print_real_number(c, x);
+			c.s << "\")";
+		}
 	} else if (cln::instanceof(x, cln::cl_RA_ring)) {
 
 		// Rational number
@@ -1376,7 +1375,7 @@ const numeric numeric::numer() const
 		if (cln::instanceof(r, cln::cl_RA_ring) && cln::instanceof(i, cln::cl_RA_ring)) {
 			const cln::cl_I s = cln::lcm(cln::denominator(r), cln::denominator(i));
 			return numeric(cln::complex(cln::numerator(r)*(cln::exquo(s,cln::denominator(r))),
-			   	   	                    cln::numerator(i)*(cln::exquo(s,cln::denominator(i)))));
+			                            cln::numerator(i)*(cln::exquo(s,cln::denominator(i)))));
 		}
 	}
 	// at least one float encountered
@@ -1531,7 +1530,7 @@ const numeric atan(const numeric &y, const numeric &x)
 		return *_num0_p;
 	if (x.is_real() && y.is_real())
 		return numeric(cln::atan(cln::the<cln::cl_R>(x.to_cl_N()),
-		                 cln::the<cln::cl_R>(y.to_cl_N())));
+		                         cln::the<cln::cl_R>(y.to_cl_N())));
 
 	// Compute -I*log((x+I*y)/sqrt(x^2+y^2))
 	//      == -I*log((x+I*y)/sqrt((x+I*y)*(x-I*y)))
@@ -1775,8 +1774,8 @@ cln::cl_N lanczos_coeffs::calc_lanczos_A(const cln::cl_N &x) const
 {
 	cln::cl_N A = (*current_vector)[0];
 	int size = current_vector->size();
-  	for (int i=1; i<size; ++i)
-     	A = A + (*current_vector)[i]/(x+cln::cl_I(-1+i));
+	for (int i=1; i<size; ++i)
+		A = A + (*current_vector)[i]/(x+cln::cl_I(-1+i));
 	return A;
 }
 
@@ -2024,7 +2023,7 @@ lanczos_coeffs::lanczos_coeffs()
 	coeffs[3].swap(coeffs_120);
 }
 
-static const cln::float_format_t guess_precision(const cln::cl_N& x)
+static cln::float_format_t guess_precision(const cln::cl_N& x)
 {
 	cln::float_format_t prec = cln::default_float_format;
 	if (!instanceof(realpart(x), cln::cl_RA_ring))
@@ -2050,11 +2049,11 @@ const cln::cl_N lgamma(const cln::cl_N &x)
 				- lgamma(1 - x);
 		cln::cl_N A = lc.calc_lanczos_A(x);
 		cln::cl_N temp = x + lc.get_order() - cln::cl_N(1)/2;
-   	cln::cl_N result = log(cln::cl_I(2)*pi_val)/2
-		              + (x-cln::cl_N(1)/2)*log(temp)
-		              - temp
-		              + log(A);
-   	return result;
+		cln::cl_N result = log(cln::cl_I(2)*pi_val)/2
+		                 + (x-cln::cl_N(1)/2)*log(temp)
+		                 - temp
+		                 + log(A);
+		return result;
 	}
 	else 
 		throw dunno();
@@ -2077,10 +2076,10 @@ const cln::cl_N tgamma(const cln::cl_N &x)
 			return pi_val/(cln::sin(pi_val*x))/tgamma(1 - x);
 		cln::cl_N A = lc.calc_lanczos_A(x);
 		cln::cl_N temp = x + lc.get_order() - cln::cl_N(1)/2;
-   	cln::cl_N result
-			= sqrt(cln::cl_I(2)*pi_val) * expt(temp, x - cln::cl_N(1)/2)
-			  * exp(-temp) * A;
-   	return result;
+		cln::cl_N result = sqrt(cln::cl_I(2)*pi_val)
+		                 * expt(temp, x - cln::cl_N(1)/2)
+		                 * exp(-temp) * A;
+		return result;
 	}
 	else
 		throw dunno();
@@ -2244,7 +2243,7 @@ const numeric bernoulli(const numeric &nn)
 				c = cln::exquo((c * (p+3-2*k)) * (p/2-k+1), cln::cl_I(2*k-1)*k);
 				b = b + c*results[k-1];
 			}
- 		}
+		}
 		results.push_back(-b/(p+1));
 	}
 	next_r = n+2;
@@ -2539,9 +2538,8 @@ _numeric_digits& _numeric_digits::operator=(long prec)
 	cln::default_float_format = cln::float_format(prec);
 
 	// call registered callbacks
-	std::vector<digits_changed_callback>::const_iterator it = callbacklist.begin(),	end = callbacklist.end();
-	for (; it != end; ++it) {
-		(*it)(digitsdiff);
+	for (auto it : callbacklist) {
+		(it)(digitsdiff);
 	}
 
 	return *this;