From e6a83a9d4ebfb2abf0254ca7c41f2828fafa7b19 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Fri, 23 Jul 2010 02:23:43 +0000
Subject: 	* interp/g-util.boot (expandFeq): New. 	*
 algebra/sf.spad.pamphlet (DoubleFloat): Tidy.

---
 src/algebra/sf.spad.pamphlet | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/algebra/sf.spad.pamphlet')

diff --git a/src/algebra/sf.spad.pamphlet b/src/algebra/sf.spad.pamphlet
index 1b36780f..1b51d3a0 100644
--- a/src/algebra/sf.spad.pamphlet
+++ b/src/algebra/sf.spad.pamphlet
@@ -406,8 +406,8 @@ DoubleFloat(): Join(FloatingPointSystem, DifferentialRing, OpenMath,
    acoth x          == checkComplex ACOTH(x)$Lisp
    asech x          == checkComplex ASECH(x)$Lisp
    x:% / y:%        == %fdiv(x,y)
-   negative? x      == MINUSP(x)$Lisp
-   zero? x          == ZEROP(x)$Lisp
+   negative? x      == x < 0
+   zero? x          == x = 0
    one? x           == x = 1
    hash x           == HASHEQ(x)$Lisp
    recip(x)         == (zero? x => "failed"; 1 / x)
@@ -426,14 +426,14 @@ DoubleFloat(): Join(FloatingPointSystem, DifferentialRing, OpenMath,
    rationalApproximation(x, d) == rationalApproximation(x, d, 10)
 
    atan(x,y) ==
-      x = 0 =>
+      zero? x =>
          y > 0 => pi()/2
-         y < 0 => -pi()/2
+         negative? y => -pi()/2
          0
       -- Only count on first quadrant being on principal branch.
       theta := atan abs(y/x)
-      if x < 0 then theta := pi() - theta
-      if y < 0 then theta := - theta
+      if negative? x then theta := pi() - theta
+      if negative? y then theta := - theta
       theta
 
    retract(x:%):Fraction(Integer) ==
-- 
cgit v1.2.3