X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fnumeric.cpp;h=f27fd3aca60d7d1b090a59aa6562e3bb2bc33620;hp=c86369fbe000cc2f885dac04a19ddcddb9c56394;hb=25b4d894b5b2f7f56fb49e62a7767ab969d5249f;hpb=852fb174c43b49a3ce1b568f959d23e8a1959ee1

diff --git a/ginac/numeric.cpp b/ginac/numeric.cpp
index c86369fb..f27fd3ac 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-2015 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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
@@ -714,8 +714,6 @@ bool numeric::info(unsigned inf) const
 			return is_odd();
 		case info_flags::prime:
 			return is_prime();
-		case info_flags::algebraic:
-			return !is_real();
 	}
 	return false;
 }
@@ -775,10 +773,8 @@ bool numeric::has(const ex &other, unsigned options) const
 
 
 /** Evaluation of numbers doesn't do anything at all. */
-ex numeric::eval(int level) const
+ex numeric::eval() const
 {
-	// Warning: if this is ever gonna do something, the ex ctors from all kinds
-	// of numbers should be checking for status_flags::evaluated.
 	return this->hold();
 }
 
@@ -788,11 +784,9 @@ ex numeric::eval(int level) const
  *  currently set.  In case the object already was a floating point number the
  *  precision is trimmed to match the currently set default.
  *
- *  @param level  ignored, only needed for overriding basic::evalf.
  *  @return  an ex-handle to a numeric. */
-ex numeric::evalf(int level) const
+ex numeric::evalf() const
 {
-	// level can safely be discarded for numeric objects.
 	return numeric(cln::cl_float(1.0, cln::default_float_format) * value);
 }
 
@@ -929,9 +923,8 @@ const numeric &numeric::add_dyn(const numeric &other) const
 		return other;
 	else if (&other==_num0_p)
 		return *this;
-	
-	return static_cast<const numeric &>((new numeric(value + other.value))->
-	                                    setflag(status_flags::dynallocated));
+
+	return dynallocate<numeric>(value + other.value);
 }
 
 
@@ -945,9 +938,8 @@ const numeric &numeric::sub_dyn(const numeric &other) const
 	// hack is supposed to keep the number of distinct numeric objects low.
 	if (&other==_num0_p || cln::zerop(other.value))
 		return *this;
-	
-	return static_cast<const numeric &>((new numeric(value - other.value))->
-	                                    setflag(status_flags::dynallocated));
+
+	return dynallocate<numeric>(value - other.value);
 }
 
 
@@ -964,8 +956,7 @@ const numeric &numeric::mul_dyn(const numeric &other) const
 	else if (&other==_num1_p)
 		return *this;
 	
-	return static_cast<const numeric &>((new numeric(value * other.value))->
-	                                    setflag(status_flags::dynallocated));
+	return dynallocate<numeric>(value * other.value);
 }
 
 
@@ -983,8 +974,8 @@ const numeric &numeric::div_dyn(const numeric &other) const
 		return *this;
 	if (cln::zerop(cln::the<cln::cl_N>(other.value)))
 		throw std::overflow_error("division by zero");
-	return static_cast<const numeric &>((new numeric(value / other.value))->
-	                                    setflag(status_flags::dynallocated));
+
+	return dynallocate<numeric>(value / other.value);
 }
 
 
@@ -1010,8 +1001,8 @@ const numeric &numeric::power_dyn(const numeric &other) const
 		else
 			return *_num0_p;
 	}
-	return static_cast<const numeric &>((new numeric(cln::expt(value, other.value)))->
-	                                     setflag(status_flags::dynallocated));
+
+	return dynallocate<numeric>(cln::expt(value, other.value));
 }