diff options
author | dos-reis <gdr@axiomatics.org> | 2011-03-12 06:16:57 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2011-03-12 06:16:57 +0000 |
commit | 42d38bee45a64edfc12641053e58581c20584363 (patch) | |
tree | 5e1edcd1575af28ed489ae4446563879e4837bc1 /src/algebra/integer.spad.pamphlet | |
parent | 4a92a0cc2bca6807ea4362797cfe6939bad4889b (diff) | |
download | open-axiom-42d38bee45a64edfc12641053e58581c20584363.tar.gz |
* algebra/si.spad.pamphlet (IntegerNumberSystem) [positive?]:
Remove definition.
(SingleInteger): Simplify implementation of random.
* algebra/sf.spad.pamphlet (DoubleFloat): Likewise.
[positive?]: Define.
* algebra/integer.spad.pamphlet (Integer): Tidy.
Diffstat (limited to 'src/algebra/integer.spad.pamphlet')
-rw-r--r-- | src/algebra/integer.spad.pamphlet | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/algebra/integer.spad.pamphlet b/src/algebra/integer.spad.pamphlet index 0b70def4..ac09f419 100644 --- a/src/algebra/integer.spad.pamphlet +++ b/src/algebra/integer.spad.pamphlet @@ -86,6 +86,7 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with import %icst1: % from Foreign Builtin import %ineg: % -> % from Foreign Builtin import %iabs: % -> % from Foreign Builtin + import %irandom: % -> % from Foreign Builtin import %iodd?: % -> Boolean from Foreign Builtin import %hash: % -> SingleInteger from Foreign Builtin import %iadd: (%,%) -> % from Foreign Builtin @@ -161,6 +162,7 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with dec x == x - 1@% hash x == %hash x negative? x == x < 0@% + positive? x == 0 < x coerce(x):OutputForm == outputForm(x pretend Integer) coerce(m:Integer):% == m pretend % convert(x:%):Integer == x pretend Integer @@ -199,7 +201,7 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with abs(x) == %iabs x random() == random()$Lisp - random(x) == RANDOM(x)$Lisp + random(x) == %irandom x x = y == %ieq(x,y) x < y == %ilt(x,y) x > y == %igt(x,y) |