X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns_trans.cpp;h=57d13025c3447be0bba4206e910249f70dc5f618;hp=40402bb6cd87df33f0eea48dc1469bf13ad3143d;hb=3f0b0165865bbb297901e9542fced88a0e32298e;hpb=62a1dbf52d01b7f50cce2ed16219466ff7174c09

diff --git a/ginac/inifcns_trans.cpp b/ginac/inifcns_trans.cpp
index 40402bb6..57d13025 100644
--- a/ginac/inifcns_trans.cpp
+++ b/ginac/inifcns_trans.cpp
@@ -4,7 +4,7 @@
  *  functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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
@@ -830,9 +830,9 @@ static ex atan2_eval(const ex & y, const ex & x)
 		if (x.info(info_flags::positive))
 			return _ex0;
 
-		// atan(0, x), x real and negative -> -Pi
+		// atan(0, x), x real and negative -> Pi
 		if (x.info(info_flags::negative))
-			return _ex_1*Pi;
+			return Pi;
 	}
 
 	if (x.is_zero()) {
@@ -869,15 +869,15 @@ static ex atan2_eval(const ex & y, const ex & x)
 	}
 
 	// atan(float, float) -> float
-	if (is_a<numeric>(y) && is_a<numeric>(x) && !y.info(info_flags::crational)
-			&& !x.info(info_flags::crational))
+	if (is_a<numeric>(y) && !y.info(info_flags::crational) &&
+	    is_a<numeric>(x) && !x.info(info_flags::crational))
 		return atan(ex_to<numeric>(y), ex_to<numeric>(x));
 
 	// atan(real, real) -> atan(y/x) +/- Pi
 	if (y.info(info_flags::real) && x.info(info_flags::real)) {
 		if (x.info(info_flags::positive))
 			return atan(y/x);
-		else if(y.info(info_flags::positive))
+		else if (y.info(info_flags::positive))
 			return atan(y/x)+Pi;
 		else
 			return atan(y/x)-Pi;