From a2e3e641bdbcb6e77bbb572aea25a748a967abca Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sat, 12 Mar 2011 20:44:33 +0000 Subject: * src/algebra/: Systematically use negative? when comparing for equality with 0. --- src/algebra/si.spad.pamphlet | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/algebra/si.spad.pamphlet') diff --git a/src/algebra/si.spad.pamphlet b/src/algebra/si.spad.pamphlet index 888a40f3..f8296439 100644 --- a/src/algebra/si.spad.pamphlet +++ b/src/algebra/si.spad.pamphlet @@ -226,6 +226,7 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,BooleanLogic,OpenMath) w import %hash: % -> SingleInteger from Foreign Builtin import %ilength: % -> % from Foreign Builtin import %iodd?: % -> Boolean from Foreign Builtin + import %ieven?: % -> Boolean from Foreign Builtin import %ieq: (%,%) -> Boolean from Foreign Builtin import %ilt: (%,%) -> Boolean from Foreign Builtin import %ile: (%,%) -> Boolean from Foreign Builtin @@ -319,6 +320,7 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,BooleanLogic,OpenMath) w gcd(x,y) == %igcd(x,y) abs(x) == %iabs x odd?(x) == %iodd? x + even?(x) == %ieven? x zero?(x) == %ieq(x,%icst0) one?(x) == %ieq(x,%icst1) max(x,y) == %imax(x,y) @@ -334,7 +336,7 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,BooleanLogic,OpenMath) w (%icstmax - %icstmin + %icst1) pretend NonNegativeInteger index i == per(i + rep %icstmin - rep %icst1) lookup x == - (x - %icstmin + %icst1) pretend PositiveInteger + (rep x - rep %icstmin + rep %icst1) pretend PositiveInteger reducedSystem(m: Matrix %, v: Vector %) == @@ -353,9 +355,9 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,BooleanLogic,OpenMath) w UCA ==> Record(unit:%,canonical:%,associate:%) unitNormal x == - negative? x => [-1@%,-x,-1@%]$UCA - [1@%,x,1@%]$UCA - positive? x == 0 < x + negative? x => [-%icst1,-x,-%icst1]$UCA + [%icst1,x,%icst1]$UCA + positive? x == %icst0 < x @ -- cgit v1.2.3