aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-06-01 06:10:07 +0000
committerdos-reis <gdr@axiomatics.org>2009-06-01 06:10:07 +0000
commit78dd44d657fa65a8029d996aaf7ac05d2133f509 (patch)
treed5e4072febd7a48afbc1d2c48c2be4f4a3539638 /src/algebra
parent803d7a62fb91bb4083a0aaaaa20749574292e967 (diff)
downloadopen-axiom-78dd44d657fa65a8029d996aaf7ac05d2133f509.tar.gz
* interp/compiler.boot (compGreaterThan): New. Compile
greater-than expressions. * interp/parse.boot (parseGreaterThan): Remove. * algebra/data.spad.pamphlet (Byte): Implement all comparison functions. * algebra/integer.spad.pamphlet (Integer): Likewise. * algebra/sf.spad.pamphlet (DoubleFloat): Likewise. * algebra/si.spad.pamphlet (SingleInteger): Likewise. * algebra/string.spad.pamphlet (Character): Likewise.
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/data.spad.pamphlet3
-rw-r--r--src/algebra/integer.spad.pamphlet3
-rw-r--r--src/algebra/sf.spad.pamphlet3
-rw-r--r--src/algebra/si.spad.pamphlet3
-rw-r--r--src/algebra/strap/CHAR.lsp222
-rw-r--r--src/algebra/strap/DFLOAT.lsp826
-rw-r--r--src/algebra/strap/INT.lsp359
-rw-r--r--src/algebra/strap/SINT.lsp388
-rw-r--r--src/algebra/string.spad.pamphlet3
9 files changed, 958 insertions, 852 deletions
diff --git a/src/algebra/data.spad.pamphlet b/src/algebra/data.spad.pamphlet
index 2760df04..6bc803dd 100644
--- a/src/algebra/data.spad.pamphlet
+++ b/src/algebra/data.spad.pamphlet
@@ -42,6 +42,9 @@ Byte(): Public == Private where
coerce(x: %): Character == char rep x
x = y == byteEqual(x,y)$Lisp
x < y == byteLessThan(x,y)$Lisp
+ x > y == byteGreaterThan(x,y)$Lisp
+ x <= y == byteLessEqual(x,y)$Lisp
+ x >= y == byteGreaterEqual(x,y)$Lisp
min() == per 0
max() == per 255
bitand(x,y) == bitand(x,y)$Lisp
diff --git a/src/algebra/integer.spad.pamphlet b/src/algebra/integer.spad.pamphlet
index ee06f056..6965144e 100644
--- a/src/algebra/integer.spad.pamphlet
+++ b/src/algebra/integer.spad.pamphlet
@@ -181,6 +181,9 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with
random(x) == RANDOM(x)$Lisp
x = y == EQL(x,y)$Lisp
x < y == (x<y)$Lisp
+ x > y == (x > y)$Lisp -- Don't rely on default; help the inliner
+ x <= y == (x <= y)$Lisp -- Ditto
+ x >= y == (x >= y)$Lisp -- Ditto
- x == (-x)$Lisp
x + y == (x+y)$Lisp
x - y == (x-y)$Lisp
diff --git a/src/algebra/sf.spad.pamphlet b/src/algebra/sf.spad.pamphlet
index 35c59b87..507957ad 100644
--- a/src/algebra/sf.spad.pamphlet
+++ b/src/algebra/sf.spad.pamphlet
@@ -342,6 +342,9 @@ DoubleFloat(): Join(FloatingPointSystem, DifferentialRing, OpenMath,
coerce(x:%):OutputForm == outputForm x
convert(x:%):InputForm == convert(x pretend DoubleFloat)$InputForm
x < y == (x<y)$Lisp
+ x > y == (x > y)$Lisp -- help inliner
+ x <= y == (x <= y)$Lisp -- ditto
+ x >= y == (x >= y)$Lisp -- ditto
- x == (-x)$Lisp
x + y == (x+y)$Lisp
x:% - y:% == (x-y)$Lisp
diff --git a/src/algebra/si.spad.pamphlet b/src/algebra/si.spad.pamphlet
index 605f78e5..63e6c1db 100644
--- a/src/algebra/si.spad.pamphlet
+++ b/src/algebra/si.spad.pamphlet
@@ -288,6 +288,9 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,Logic,OpenMath) with
Or(x,y) == LOGIOR(x,y)$Lisp
xor(x,y) == LOGXOR(x,y)$Lisp
x < y == QSLESSP(x,y)$Lisp
+ x > y == QSGREATERP(x,y)$Lisp
+ x <= y == (x <= y)$Lisp
+ x >= y == (x >= y)$Lisp
inc x == QSADD1(x)$Lisp
dec x == QSSUB1(x)$Lisp
- x == QSMINUS(x)$Lisp
diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp
index 6e24716c..7bd2bfbe 100644
--- a/src/algebra/strap/CHAR.lsp
+++ b/src/algebra/strap/CHAR.lsp
@@ -11,79 +11,94 @@
(PUT '|CHAR;<;2$B;2| '|SPADreplace| 'CHAR<)
+(DECLAIM (FTYPE (FUNCTION (|%Char| |%Char| |%Shell|) |%Boolean|)
+ |CHAR;>;2$B;3|))
+
+(PUT '|CHAR;>;2$B;3| '|SPADreplace| 'CHAR>)
+
+(DECLAIM (FTYPE (FUNCTION (|%Char| |%Char| |%Shell|) |%Boolean|)
+ |CHAR;<=;2$B;4|))
+
+(PUT '|CHAR;<=;2$B;4| '|SPADreplace| 'CHAR<=)
+
+(DECLAIM (FTYPE (FUNCTION (|%Char| |%Char| |%Shell|) |%Boolean|)
+ |CHAR;>=;2$B;5|))
+
+(PUT '|CHAR;>=;2$B;5| '|SPADreplace| 'CHAR>=)
+
(DECLAIM (FTYPE (FUNCTION (|%Shell|) (|%IntegerSection| 0))
- |CHAR;size;Nni;3|))
+ |CHAR;size;Nni;6|))
-(PUT '|CHAR;size;Nni;3| '|SPADreplace| '(XLAM NIL 256))
+(PUT '|CHAR;size;Nni;6| '|SPADreplace| '(XLAM NIL 256))
(DECLAIM (FTYPE (FUNCTION ((|%IntegerSection| 1) |%Shell|) |%Char|)
- |CHAR;index;Pi$;4|))
+ |CHAR;index;Pi$;7|))
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) (|%IntegerSection| 1))
- |CHAR;lookup;$Pi;5|))
+ |CHAR;lookup;$Pi;8|))
(DECLAIM (FTYPE (FUNCTION ((|%IntegerSection| 0) |%Shell|) |%Char|)
- |CHAR;char;Nni$;6|))
+ |CHAR;char;Nni$;9|))
-(PUT '|CHAR;char;Nni$;6| '|SPADreplace| 'CODE-CHAR)
+(PUT '|CHAR;char;Nni$;9| '|SPADreplace| 'CODE-CHAR)
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) (|%IntegerSection| 0))
- |CHAR;ord;$Nni;7|))
+ |CHAR;ord;$Nni;10|))
-(PUT '|CHAR;ord;$Nni;7| '|SPADreplace| 'CHAR-CODE)
+(PUT '|CHAR;ord;$Nni;10| '|SPADreplace| 'CHAR-CODE)
-(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;random;$;8|))
+(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;random;$;11|))
-(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;space;$;9|))
+(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;space;$;12|))
-(PUT '|CHAR;space;$;9| '|SPADreplace| '(XLAM NIL (CHAR " " 0)))
+(PUT '|CHAR;space;$;12| '|SPADreplace| '(XLAM NIL (CHAR " " 0)))
-(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;quote;$;10|))
+(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;quote;$;13|))
-(PUT '|CHAR;quote;$;10| '|SPADreplace| '(XLAM NIL (CHAR "\" " 0)))
+(PUT '|CHAR;quote;$;13| '|SPADreplace| '(XLAM NIL (CHAR "\" " 0)))
-(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;escape;$;11|))
+(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;escape;$;14|))
-(PUT '|CHAR;escape;$;11| '|SPADreplace| '(XLAM NIL (CHAR "_ " 0)))
+(PUT '|CHAR;escape;$;14| '|SPADreplace| '(XLAM NIL (CHAR "_ " 0)))
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Thing|)
- |CHAR;coerce;$Of;12|))
+ |CHAR;coerce;$Of;15|))
-(PUT '|CHAR;coerce;$Of;12| '|SPADreplace| '(XLAM (|c|) |c|))
+(PUT '|CHAR;coerce;$Of;15| '|SPADreplace| '(XLAM (|c|) |c|))
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Boolean|)
- |CHAR;digit?;$B;13|))
+ |CHAR;digit?;$B;16|))
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Boolean|)
- |CHAR;hexDigit?;$B;14|))
+ |CHAR;hexDigit?;$B;17|))
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Boolean|)
- |CHAR;upperCase?;$B;15|))
+ |CHAR;upperCase?;$B;18|))
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Boolean|)
- |CHAR;lowerCase?;$B;16|))
+ |CHAR;lowerCase?;$B;19|))
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Boolean|)
- |CHAR;alphabetic?;$B;17|))
+ |CHAR;alphabetic?;$B;20|))
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Boolean|)
- |CHAR;alphanumeric?;$B;18|))
+ |CHAR;alphanumeric?;$B;21|))
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%String|)
- |CHAR;latex;$S;19|))
+ |CHAR;latex;$S;22|))
(DECLAIM (FTYPE (FUNCTION (|%String| |%Shell|) |%Char|)
- |CHAR;char;S$;20|))
+ |CHAR;char;S$;23|))
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Char|)
- |CHAR;upperCase;2$;21|))
+ |CHAR;upperCase;2$;24|))
-(PUT '|CHAR;upperCase;2$;21| '|SPADreplace| 'CHAR-UPCASE)
+(PUT '|CHAR;upperCase;2$;24| '|SPADreplace| 'CHAR-UPCASE)
(DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Char|)
- |CHAR;lowerCase;2$;22|))
+ |CHAR;lowerCase;2$;25|))
-(PUT '|CHAR;lowerCase;2$;22| '|SPADreplace| 'CHAR-DOWNCASE)
+(PUT '|CHAR;lowerCase;2$;25| '|SPADreplace| 'CHAR-DOWNCASE)
(DEFUN |CHAR;=;2$B;1| (|a| |b| $)
(DECLARE (IGNORE $))
@@ -93,78 +108,92 @@
(DECLARE (IGNORE $))
(CHAR< |a| |b|))
-(DEFUN |CHAR;size;Nni;3| ($) (DECLARE (IGNORE $)) 256)
+(DEFUN |CHAR;>;2$B;3| (|a| |b| $)
+ (DECLARE (IGNORE $))
+ (CHAR> |a| |b|))
+
+(DEFUN |CHAR;<=;2$B;4| (|a| |b| $)
+ (DECLARE (IGNORE $))
+ (CHAR<= |a| |b|))
+
+(DEFUN |CHAR;>=;2$B;5| (|a| |b| $)
+ (DECLARE (IGNORE $))
+ (CHAR>= |a| |b|))
+
+(DEFUN |CHAR;size;Nni;6| ($) (DECLARE (IGNORE $)) 256)
-(DEFUN |CHAR;index;Pi$;4| (|n| $)
- (PROG (#0=#:G1402)
+(DEFUN |CHAR;index;Pi$;7| (|n| $)
+ (PROG (#0=#:G1405)
(RETURN
(CODE-CHAR
- (PROG1 (LETT #0# (- |n| 1) |CHAR;index;Pi$;4|)
+ (PROG1 (LETT #0# (- |n| 1) |CHAR;index;Pi$;7|)
(|check-subtype| (NOT (< #0# 0)) '(|NonNegativeInteger|)
#0#))))))
-(DEFUN |CHAR;lookup;$Pi;5| (|c| $)
- (PROG (#0=#:G1404)
+(DEFUN |CHAR;lookup;$Pi;8| (|c| $)
+ (PROG (#0=#:G1407)
(RETURN
- (PROG1 (LETT #0# (+ 1 (CHAR-CODE |c|)) |CHAR;lookup;$Pi;5|)
+ (PROG1 (LETT #0# (+ 1 (CHAR-CODE |c|)) |CHAR;lookup;$Pi;8|)
(|check-subtype| (< 0 #0#) '(|PositiveInteger|) #0#)))))
-(DEFUN |CHAR;char;Nni$;6| (|n| $)
+(DEFUN |CHAR;char;Nni$;9| (|n| $)
(DECLARE (IGNORE $))
(CODE-CHAR |n|))
-(DEFUN |CHAR;ord;$Nni;7| (|c| $) (DECLARE (IGNORE $)) (CHAR-CODE |c|))
+(DEFUN |CHAR;ord;$Nni;10| (|c| $)
+ (DECLARE (IGNORE $))
+ (CHAR-CODE |c|))
-(DEFUN |CHAR;random;$;8| ($) (CODE-CHAR (RANDOM 256)))
+(DEFUN |CHAR;random;$;11| ($) (CODE-CHAR (RANDOM 256)))
-(DEFUN |CHAR;space;$;9| ($) (DECLARE (IGNORE $)) (CHAR " " 0))
+(DEFUN |CHAR;space;$;12| ($) (DECLARE (IGNORE $)) (CHAR " " 0))
-(DEFUN |CHAR;quote;$;10| ($) (DECLARE (IGNORE $)) (CHAR "\" " 0))
+(DEFUN |CHAR;quote;$;13| ($) (DECLARE (IGNORE $)) (CHAR "\" " 0))
-(DEFUN |CHAR;escape;$;11| ($) (DECLARE (IGNORE $)) (CHAR "_ " 0))
+(DEFUN |CHAR;escape;$;14| ($) (DECLARE (IGNORE $)) (CHAR "_ " 0))
-(DEFUN |CHAR;coerce;$Of;12| (|c| $) (DECLARE (IGNORE $)) |c|)
+(DEFUN |CHAR;coerce;$Of;15| (|c| $) (DECLARE (IGNORE $)) |c|)
-(DEFUN |CHAR;digit?;$B;13| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 29) (|getShellEntry| $ 31)))
+(DEFUN |CHAR;digit?;$B;16| (|c| $)
+ (SPADCALL |c| (|spadConstant| $ 32) (|getShellEntry| $ 34)))
-(DEFUN |CHAR;hexDigit?;$B;14| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 33) (|getShellEntry| $ 31)))
+(DEFUN |CHAR;hexDigit?;$B;17| (|c| $)
+ (SPADCALL |c| (|spadConstant| $ 36) (|getShellEntry| $ 34)))
-(DEFUN |CHAR;upperCase?;$B;15| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 35) (|getShellEntry| $ 31)))
+(DEFUN |CHAR;upperCase?;$B;18| (|c| $)
+ (SPADCALL |c| (|spadConstant| $ 38) (|getShellEntry| $ 34)))
-(DEFUN |CHAR;lowerCase?;$B;16| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 37) (|getShellEntry| $ 31)))
+(DEFUN |CHAR;lowerCase?;$B;19| (|c| $)
+ (SPADCALL |c| (|spadConstant| $ 40) (|getShellEntry| $ 34)))
-(DEFUN |CHAR;alphabetic?;$B;17| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 39) (|getShellEntry| $ 31)))
+(DEFUN |CHAR;alphabetic?;$B;20| (|c| $)
+ (SPADCALL |c| (|spadConstant| $ 42) (|getShellEntry| $ 34)))
-(DEFUN |CHAR;alphanumeric?;$B;18| (|c| $)
- (SPADCALL |c| (|spadConstant| $ 41) (|getShellEntry| $ 31)))
+(DEFUN |CHAR;alphanumeric?;$B;21| (|c| $)
+ (SPADCALL |c| (|spadConstant| $ 44) (|getShellEntry| $ 34)))
-(DEFUN |CHAR;latex;$S;19| (|c| $)
+(DEFUN |CHAR;latex;$S;22| (|c| $)
(STRCONC "\\mbox{`" (STRCONC (MAKE-FULL-CVEC 1 |c|) "'}")))
-(DEFUN |CHAR;char;S$;20| (|s| $)
+(DEFUN |CHAR;char;S$;23| (|s| $)
(COND
((EQL (QCSIZE |s|) 1)
- (SPADCALL |s| (SPADCALL |s| (|getShellEntry| $ 49))
- (|getShellEntry| $ 50)))
+ (SPADCALL |s| (SPADCALL |s| (|getShellEntry| $ 52))
+ (|getShellEntry| $ 53)))
('T (|userError| "String is not a single character"))))
-(DEFUN |CHAR;upperCase;2$;21| (|c| $)
+(DEFUN |CHAR;upperCase;2$;24| (|c| $)
(DECLARE (IGNORE $))
(CHAR-UPCASE |c|))
-(DEFUN |CHAR;lowerCase;2$;22| (|c| $)
+(DEFUN |CHAR;lowerCase;2$;25| (|c| $)
(DECLARE (IGNORE $))
(CHAR-DOWNCASE |c|))
(DEFUN |Character| ()
(PROG ()
(RETURN
- (PROG (#0=#:G1425)
+ (PROG (#0=#:G1428)
(RETURN
(COND
((LETT #0# (HGET |$ConstructorCache| '|Character|)
@@ -184,7 +213,7 @@
(RETURN
(PROGN
(LETT |dv$| '(|Character|) . #0=(|Character|))
- (LETT $ (|newShell| 55) . #0#)
+ (LETT $ (|newShell| 58) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -194,23 +223,24 @@
(MAKEPROP '|Character| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|Boolean|) |CHAR;=;2$B;1|
- |CHAR;<;2$B;2| (|NonNegativeInteger|) |CHAR;size;Nni;3|
+ |CHAR;<;2$B;2| |CHAR;>;2$B;3| |CHAR;<=;2$B;4|
+ |CHAR;>=;2$B;5| (|NonNegativeInteger|) |CHAR;size;Nni;6|
(|PositiveInteger|) (0 . |One|) (4 . |One|) (|Integer|)
- (8 . -) |CHAR;char;Nni$;6| |CHAR;index;Pi$;4|
- |CHAR;ord;$Nni;7| (14 . +) |CHAR;lookup;$Pi;5|
- (20 . |random|) |CHAR;random;$;8| |CHAR;space;$;9|
- |CHAR;quote;$;10| |CHAR;escape;$;11| (|OutputForm|)
- |CHAR;coerce;$Of;12| (|CharacterClass|) (25 . |digit|)
- (|Character|) (29 . |member?|) |CHAR;digit?;$B;13|
- (35 . |hexDigit|) |CHAR;hexDigit?;$B;14|
- (39 . |upperCase|) |CHAR;upperCase?;$B;15|
- (43 . |lowerCase|) |CHAR;lowerCase?;$B;16|
- (47 . |alphabetic|) |CHAR;alphabetic?;$B;17|
- (51 . |alphanumeric|) |CHAR;alphanumeric?;$B;18|
- (|String|) (55 . |new|) (61 . |concat|) |CHAR;latex;$S;19|
+ (8 . -) |CHAR;char;Nni$;9| |CHAR;index;Pi$;7|
+ |CHAR;ord;$Nni;10| (14 . +) |CHAR;lookup;$Pi;8|
+ (20 . |random|) |CHAR;random;$;11| |CHAR;space;$;12|
+ |CHAR;quote;$;13| |CHAR;escape;$;14| (|OutputForm|)
+ |CHAR;coerce;$Of;15| (|CharacterClass|) (25 . |digit|)
+ (|Character|) (29 . |member?|) |CHAR;digit?;$B;16|
+ (35 . |hexDigit|) |CHAR;hexDigit?;$B;17|
+ (39 . |upperCase|) |CHAR;upperCase?;$B;18|
+ (43 . |lowerCase|) |CHAR;lowerCase?;$B;19|
+ (47 . |alphabetic|) |CHAR;alphabetic?;$B;20|
+ (51 . |alphanumeric|) |CHAR;alphanumeric?;$B;21|
+ (|String|) (55 . |new|) (61 . |concat|) |CHAR;latex;$S;22|
(67 . |#|) (72 . |one?|) (77 . |minIndex|) (82 . |elt|)
- |CHAR;char;S$;20| |CHAR;upperCase;2$;21|
- |CHAR;lowerCase;2$;22| (|SingleInteger|))
+ |CHAR;char;S$;23| |CHAR;upperCase;2$;24|
+ |CHAR;lowerCase;2$;25| (|SingleInteger|))
'#(~= 88 |upperCase?| 94 |upperCase| 99 |space| 104 |size|
108 |random| 112 |quote| 116 |ord| 120 |min| 125 |max| 135
|lowerCase?| 145 |lowerCase| 150 |lookup| 155 |latex| 160
@@ -224,24 +254,24 @@
|BasicType&| NIL)
(CONS '#((|OrderedFinite|) (|OrderedSet|)
(|Finite|) (|SetCategory|) (|BasicType|)
- (|CoercibleTo| 26))
- (|makeByteWordVec2| 54
- '(0 11 0 12 0 9 0 13 2 14 0 0 0 15 2 9
- 0 0 0 19 1 9 0 0 21 0 28 0 29 2 28 6
- 30 0 31 0 28 0 33 0 28 0 35 0 28 0 37
- 0 28 0 39 0 28 0 41 2 43 0 9 30 44 2
- 43 0 0 0 45 1 43 9 0 47 1 9 6 0 48 1
- 43 14 0 49 2 43 30 0 14 50 2 0 6 0 0
- 1 1 0 6 0 36 1 0 0 0 52 0 0 0 23 0 0
- 9 10 0 0 0 22 0 0 0 24 1 0 9 0 18 0 0
- 0 1 2 0 0 0 0 1 0 0 0 1 2 0 0 0 0 1 1
- 0 6 0 38 1 0 0 0 53 1 0 11 0 20 1 0
- 43 0 46 1 0 0 11 17 1 0 6 0 34 1 0 54
- 0 1 0 0 0 25 1 0 6 0 32 1 0 26 0 27 1
- 0 0 43 51 1 0 0 9 16 2 0 6 0 0 1 1 0
- 6 0 42 1 0 6 0 40 2 0 6 0 0 1 2 0 6 0
- 0 1 2 0 6 0 0 7 2 0 6 0 0 1 2 0 6 0 0
- 8)))))
+ (|CoercibleTo| 29))
+ (|makeByteWordVec2| 57
+ '(0 14 0 15 0 12 0 16 2 17 0 0 0 18 2
+ 12 0 0 0 22 1 12 0 0 24 0 31 0 32 2
+ 31 6 33 0 34 0 31 0 36 0 31 0 38 0 31
+ 0 40 0 31 0 42 0 31 0 44 2 46 0 12 33
+ 47 2 46 0 0 0 48 1 46 12 0 50 1 12 6
+ 0 51 1 46 17 0 52 2 46 33 0 17 53 2 0
+ 6 0 0 1 1 0 6 0 39 1 0 0 0 55 0 0 0
+ 26 0 0 12 13 0 0 0 25 0 0 0 27 1 0 12
+ 0 21 0 0 0 1 2 0 0 0 0 1 0 0 0 1 2 0
+ 0 0 0 1 1 0 6 0 41 1 0 0 0 56 1 0 14
+ 0 23 1 0 46 0 49 1 0 0 14 20 1 0 6 0
+ 37 1 0 57 0 1 0 0 0 28 1 0 6 0 35 1 0
+ 29 0 30 1 0 0 46 54 1 0 0 12 19 2 0 6
+ 0 0 1 1 0 6 0 45 1 0 6 0 43 2 0 6 0 0
+ 11 2 0 6 0 0 9 2 0 6 0 0 7 2 0 6 0 0
+ 10 2 0 6 0 0 8)))))
'|lookupComplete|))
(MAKEPROP '|Character| 'NILADIC T)
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp
index 582076db..3096aacb 100644
--- a/src/algebra/strap/DFLOAT.lsp
+++ b/src/algebra/strap/DFLOAT.lsp
@@ -83,284 +83,298 @@
(PUT '|DFLOAT;<;2$B;20| '|SPADreplace| '<)
+(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
+ |%Boolean|)
+ |DFLOAT;>;2$B;21|))
+
+(PUT '|DFLOAT;>;2$B;21| '|SPADreplace| '>)
+
+(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
+ |%Boolean|)
+ |DFLOAT;<=;2$B;22|))
+
+(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
+ |%Boolean|)
+ |DFLOAT;>=;2$B;23|))
+
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;-;2$;21|))
+ |DFLOAT;-;2$;24|))
-(PUT '|DFLOAT;-;2$;21| '|SPADreplace| '-)
+(PUT '|DFLOAT;-;2$;24| '|SPADreplace| '-)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;+;3$;22|))
+ |DFLOAT;+;3$;25|))
-(PUT '|DFLOAT;+;3$;22| '|SPADreplace| '+)
+(PUT '|DFLOAT;+;3$;25| '|SPADreplace| '+)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;-;3$;23|))
+ |DFLOAT;-;3$;26|))
-(PUT '|DFLOAT;-;3$;23| '|SPADreplace| '-)
+(PUT '|DFLOAT;-;3$;26| '|SPADreplace| '-)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;*;3$;24|))
+ |DFLOAT;*;3$;27|))
-(PUT '|DFLOAT;*;3$;24| '|SPADreplace| '*)
+(PUT '|DFLOAT;*;3$;27| '|SPADreplace| '*)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;*;I2$;25|))
+ |DFLOAT;*;I2$;28|))
-(PUT '|DFLOAT;*;I2$;25| '|SPADreplace| '*)
+(PUT '|DFLOAT;*;I2$;28| '|SPADreplace| '*)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;max;3$;26|))
+ |DFLOAT;max;3$;29|))
-(PUT '|DFLOAT;max;3$;26| '|SPADreplace| 'MAX)
+(PUT '|DFLOAT;max;3$;29| '|SPADreplace| 'MAX)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;min;3$;27|))
+ |DFLOAT;min;3$;30|))
-(PUT '|DFLOAT;min;3$;27| '|SPADreplace| 'MIN)
+(PUT '|DFLOAT;min;3$;30| '|SPADreplace| 'MIN)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%Boolean|)
- |DFLOAT;=;2$B;28|))
+ |DFLOAT;=;2$B;31|))
-(PUT '|DFLOAT;=;2$B;28| '|SPADreplace| '=)
+(PUT '|DFLOAT;=;2$B;31| '|SPADreplace| '=)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Integer| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;/;$I$;29|))
+ |DFLOAT;/;$I$;32|))
-(PUT '|DFLOAT;/;$I$;29| '|SPADreplace| '/)
+(PUT '|DFLOAT;/;$I$;32| '|SPADreplace| '/)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;sqrt;2$;30|))
+ |DFLOAT;sqrt;2$;33|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;log10;2$;31|))
+ |DFLOAT;log10;2$;34|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Integer| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;**;$I$;32|))
+ |DFLOAT;**;$I$;35|))
-(PUT '|DFLOAT;**;$I$;32| '|SPADreplace| 'EXPT)
+(PUT '|DFLOAT;**;$I$;35| '|SPADreplace| 'EXPT)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;**;3$;33|))
+ |DFLOAT;**;3$;36|))
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%DoubleFloat|)
- |DFLOAT;coerce;I$;34|))
+ |DFLOAT;coerce;I$;37|))
-(PUT '|DFLOAT;coerce;I$;34| '|SPADreplace|
+(PUT '|DFLOAT;coerce;I$;37| '|SPADreplace|
'(XLAM (|i|) (FLOAT |i| |$DoubleFloatMaximum|)))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;exp;2$;35|))
+ |DFLOAT;exp;2$;38|))
-(PUT '|DFLOAT;exp;2$;35| '|SPADreplace| 'EXP)
+(PUT '|DFLOAT;exp;2$;38| '|SPADreplace| 'EXP)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;log;2$;36|))
+ |DFLOAT;log;2$;39|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;log2;2$;37|))
+ |DFLOAT;log2;2$;40|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;sin;2$;38|))
+ |DFLOAT;sin;2$;41|))
-(PUT '|DFLOAT;sin;2$;38| '|SPADreplace| 'SIN)
+(PUT '|DFLOAT;sin;2$;41| '|SPADreplace| 'SIN)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;cos;2$;39|))
+ |DFLOAT;cos;2$;42|))
-(PUT '|DFLOAT;cos;2$;39| '|SPADreplace| 'COS)
+(PUT '|DFLOAT;cos;2$;42| '|SPADreplace| 'COS)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;tan;2$;40|))
+ |DFLOAT;tan;2$;43|))
-(PUT '|DFLOAT;tan;2$;40| '|SPADreplace| 'TAN)
+(PUT '|DFLOAT;tan;2$;43| '|SPADreplace| 'TAN)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;cot;2$;41|))
+ |DFLOAT;cot;2$;44|))
-(PUT '|DFLOAT;cot;2$;41| '|SPADreplace| 'COT)
+(PUT '|DFLOAT;cot;2$;44| '|SPADreplace| 'COT)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;sec;2$;42|))
+ |DFLOAT;sec;2$;45|))
-(PUT '|DFLOAT;sec;2$;42| '|SPADreplace| 'SEC)
+(PUT '|DFLOAT;sec;2$;45| '|SPADreplace| 'SEC)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;csc;2$;43|))
+ |DFLOAT;csc;2$;46|))
-(PUT '|DFLOAT;csc;2$;43| '|SPADreplace| 'CSC)
+(PUT '|DFLOAT;csc;2$;46| '|SPADreplace| 'CSC)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;asin;2$;44|))
+ |DFLOAT;asin;2$;47|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;acos;2$;45|))
+ |DFLOAT;acos;2$;48|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;atan;2$;46|))
+ |DFLOAT;atan;2$;49|))
-(PUT '|DFLOAT;atan;2$;46| '|SPADreplace| 'ATAN)
+(PUT '|DFLOAT;atan;2$;49| '|SPADreplace| 'ATAN)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;acsc;2$;47|))
+ |DFLOAT;acsc;2$;50|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;acot;2$;48|))
+ |DFLOAT;acot;2$;51|))
-(PUT '|DFLOAT;acot;2$;48| '|SPADreplace| 'ACOT)
+(PUT '|DFLOAT;acot;2$;51| '|SPADreplace| 'ACOT)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;asec;2$;49|))
+ |DFLOAT;asec;2$;52|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;sinh;2$;50|))
+ |DFLOAT;sinh;2$;53|))
-(PUT '|DFLOAT;sinh;2$;50| '|SPADreplace| 'SINH)
+(PUT '|DFLOAT;sinh;2$;53| '|SPADreplace| 'SINH)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;cosh;2$;51|))
+ |DFLOAT;cosh;2$;54|))
-(PUT '|DFLOAT;cosh;2$;51| '|SPADreplace| 'COSH)
+(PUT '|DFLOAT;cosh;2$;54| '|SPADreplace| 'COSH)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;tanh;2$;52|))
+ |DFLOAT;tanh;2$;55|))
-(PUT '|DFLOAT;tanh;2$;52| '|SPADreplace| 'TANH)
+(PUT '|DFLOAT;tanh;2$;55| '|SPADreplace| 'TANH)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;csch;2$;53|))
+ |DFLOAT;csch;2$;56|))
-(PUT '|DFLOAT;csch;2$;53| '|SPADreplace| 'CSCH)
+(PUT '|DFLOAT;csch;2$;56| '|SPADreplace| 'CSCH)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;coth;2$;54|))
+ |DFLOAT;coth;2$;57|))
-(PUT '|DFLOAT;coth;2$;54| '|SPADreplace| 'COTH)
+(PUT '|DFLOAT;coth;2$;57| '|SPADreplace| 'COTH)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;sech;2$;55|))
+ |DFLOAT;sech;2$;58|))
-(PUT '|DFLOAT;sech;2$;55| '|SPADreplace| 'SECH)
+(PUT '|DFLOAT;sech;2$;58| '|SPADreplace| 'SECH)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;asinh;2$;56|))
+ |DFLOAT;asinh;2$;59|))
-(PUT '|DFLOAT;asinh;2$;56| '|SPADreplace| 'ASINH)
+(PUT '|DFLOAT;asinh;2$;59| '|SPADreplace| 'ASINH)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;acosh;2$;57|))
+ |DFLOAT;acosh;2$;60|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;atanh;2$;58|))
+ |DFLOAT;atanh;2$;61|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;acsch;2$;59|))
+ |DFLOAT;acsch;2$;62|))
-(PUT '|DFLOAT;acsch;2$;59| '|SPADreplace| 'ACSCH)
+(PUT '|DFLOAT;acsch;2$;62| '|SPADreplace| 'ACSCH)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;acoth;2$;60|))
+ |DFLOAT;acoth;2$;63|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;asech;2$;61|))
+ |DFLOAT;asech;2$;64|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;/;3$;62|))
+ |DFLOAT;/;3$;65|))
-(PUT '|DFLOAT;/;3$;62| '|SPADreplace| '/)
+(PUT '|DFLOAT;/;3$;65| '|SPADreplace| '/)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Boolean|)
- |DFLOAT;negative?;$B;63|))
+ |DFLOAT;negative?;$B;66|))
-(PUT '|DFLOAT;negative?;$B;63| '|SPADreplace| 'MINUSP)
+(PUT '|DFLOAT;negative?;$B;66| '|SPADreplace| 'MINUSP)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Boolean|)
- |DFLOAT;zero?;$B;64|))
+ |DFLOAT;zero?;$B;67|))
-(PUT '|DFLOAT;zero?;$B;64| '|SPADreplace| 'ZEROP)
+(PUT '|DFLOAT;zero?;$B;67| '|SPADreplace| 'ZEROP)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Boolean|)
- |DFLOAT;one?;$B;65|))
+ |DFLOAT;one?;$B;68|))
-(PUT '|DFLOAT;one?;$B;65| '|SPADreplace| '(XLAM (|x|) (= |x| 1.0)))
+(PUT '|DFLOAT;one?;$B;68| '|SPADreplace| '(XLAM (|x|) (= |x| 1.0)))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Short|)
- |DFLOAT;hash;$Si;66|))
+ |DFLOAT;hash;$Si;69|))
-(PUT '|DFLOAT;hash;$Si;66| '|SPADreplace| 'HASHEQ)
+(PUT '|DFLOAT;hash;$Si;69| '|SPADreplace| 'HASHEQ)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Pair|)
- |DFLOAT;recip;$U;67|))
+ |DFLOAT;recip;$U;70|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;differentiate;2$;68|))
+ |DFLOAT;differentiate;2$;71|))
-(PUT '|DFLOAT;differentiate;2$;68| '|SPADreplace| '(XLAM (|x|) 0.0))
+(PUT '|DFLOAT;differentiate;2$;71| '|SPADreplace| '(XLAM (|x|) 0.0))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;Gamma;2$;69|))
+ |DFLOAT;Gamma;2$;72|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;Beta;3$;70|))
+ |DFLOAT;Beta;3$;73|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Integer|)
- |DFLOAT;wholePart;$I;71|))
+ |DFLOAT;wholePart;$I;74|))
-(PUT '|DFLOAT;wholePart;$I;71| '|SPADreplace| 'FIX)
+(PUT '|DFLOAT;wholePart;$I;74| '|SPADreplace| 'FIX)
(DECLAIM (FTYPE (FUNCTION
(|%Integer| |%Integer| (|%IntegerSection| 1)
|%Shell|)
|%DoubleFloat|)
- |DFLOAT;float;2IPi$;72|))
+ |DFLOAT;float;2IPi$;75|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;convert;2$;73|))
+ |DFLOAT;convert;2$;76|))
-(PUT '|DFLOAT;convert;2$;73| '|SPADreplace| '(XLAM (|x|) |x|))
+(PUT '|DFLOAT;convert;2$;76| '|SPADreplace| '(XLAM (|x|) |x|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Thing|)
- |DFLOAT;convert;$F;74|))
+ |DFLOAT;convert;$F;77|))
(DECLAIM (FTYPE (FUNCTION
(|%DoubleFloat| (|%IntegerSection| 0) |%Shell|)
|%Thing|)
- |DFLOAT;rationalApproximation;$NniF;75|))
+ |DFLOAT;rationalApproximation;$NniF;78|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;atan;3$;76|))
+ |DFLOAT;atan;3$;79|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Thing|)
- |DFLOAT;retract;$F;77|))
+ |DFLOAT;retract;$F;80|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Pair|)
- |DFLOAT;retractIfCan;$U;78|))
+ |DFLOAT;retractIfCan;$U;81|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Integer|)
- |DFLOAT;retract;$I;79|))
+ |DFLOAT;retract;$I;82|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Pair|)
- |DFLOAT;retractIfCan;$U;80|))
+ |DFLOAT;retractIfCan;$U;83|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Integer|)
- |DFLOAT;sign;$I;81|))
+ |DFLOAT;sign;$I;84|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;abs;2$;82|))
+ |DFLOAT;abs;2$;85|))
-(PUT '|DFLOAT;abs;2$;82| '|SPADreplace|
+(PUT '|DFLOAT;abs;2$;85| '|SPADreplace|
'(XLAM (|x|) (FLOAT-SIGN 1.0 |x|)))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Pair|)
@@ -370,11 +384,11 @@
(|%DoubleFloat| (|%IntegerSection| 0)
(|%IntegerSection| 0) |%Shell|)
|%Thing|)
- |DFLOAT;rationalApproximation;$2NniF;84|))
+ |DFLOAT;rationalApproximation;$2NniF;87|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Thing| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;**;$F$;85|))
+ |DFLOAT;**;$F$;88|))
(DEFUN |DFLOAT;OMwrite;$S;1| (|x| $)
(PROG (|sp| |dev| |s|)
@@ -444,7 +458,7 @@
('T
(PROG1 (LETT #0#
(FIX (SPADCALL (FLOAT-DIGITS 0.0)
- (|DFLOAT;log2;2$;37|
+ (|DFLOAT;log2;2$;40|
(FLOAT (FLOAT-RADIX 0.0)
|$DoubleFloatMaximum|)
$)
@@ -486,211 +500,217 @@
(DEFUN |DFLOAT;<;2$B;20| (|x| |y| $) (DECLARE (IGNORE $)) (< |x| |y|))
-(DEFUN |DFLOAT;-;2$;21| (|x| $) (DECLARE (IGNORE $)) (- |x|))
+(DEFUN |DFLOAT;>;2$B;21| (|x| |y| $) (DECLARE (IGNORE $)) (> |x| |y|))
+
+(DEFUN |DFLOAT;<=;2$B;22| (|x| |y| $) (NOT (> |x| |y|)))
+
+(DEFUN |DFLOAT;>=;2$B;23| (|x| |y| $) (NOT (< |x| |y|)))
+
+(DEFUN |DFLOAT;-;2$;24| (|x| $) (DECLARE (IGNORE $)) (- |x|))
-(DEFUN |DFLOAT;+;3$;22| (|x| |y| $) (DECLARE (IGNORE $)) (+ |x| |y|))
+(DEFUN |DFLOAT;+;3$;25| (|x| |y| $) (DECLARE (IGNORE $)) (+ |x| |y|))
-(DEFUN |DFLOAT;-;3$;23| (|x| |y| $) (DECLARE (IGNORE $)) (- |x| |y|))
+(DEFUN |DFLOAT;-;3$;26| (|x| |y| $) (DECLARE (IGNORE $)) (- |x| |y|))
-(DEFUN |DFLOAT;*;3$;24| (|x| |y| $) (DECLARE (IGNORE $)) (* |x| |y|))
+(DEFUN |DFLOAT;*;3$;27| (|x| |y| $) (DECLARE (IGNORE $)) (* |x| |y|))
-(DEFUN |DFLOAT;*;I2$;25| (|i| |x| $) (DECLARE (IGNORE $)) (* |i| |x|))
+(DEFUN |DFLOAT;*;I2$;28| (|i| |x| $) (DECLARE (IGNORE $)) (* |i| |x|))
-(DEFUN |DFLOAT;max;3$;26| (|x| |y| $)
+(DEFUN |DFLOAT;max;3$;29| (|x| |y| $)
(DECLARE (IGNORE $))
(MAX |x| |y|))
-(DEFUN |DFLOAT;min;3$;27| (|x| |y| $)
+(DEFUN |DFLOAT;min;3$;30| (|x| |y| $)
(DECLARE (IGNORE $))
(MIN |x| |y|))
-(DEFUN |DFLOAT;=;2$B;28| (|x| |y| $) (DECLARE (IGNORE $)) (= |x| |y|))
+(DEFUN |DFLOAT;=;2$B;31| (|x| |y| $) (DECLARE (IGNORE $)) (= |x| |y|))
-(DEFUN |DFLOAT;/;$I$;29| (|x| |i| $) (DECLARE (IGNORE $)) (/ |x| |i|))
+(DEFUN |DFLOAT;/;$I$;32| (|x| |i| $) (DECLARE (IGNORE $)) (/ |x| |i|))
-(DEFUN |DFLOAT;sqrt;2$;30| (|x| $) (C-TO-R (SQRT |x|)))
+(DEFUN |DFLOAT;sqrt;2$;33| (|x| $) (C-TO-R (SQRT |x|)))
-(DEFUN |DFLOAT;log10;2$;31| (|x| $) (C-TO-R (|log| |x|)))
+(DEFUN |DFLOAT;log10;2$;34| (|x| $) (C-TO-R (|log| |x|)))
-(DEFUN |DFLOAT;**;$I$;32| (|x| |i| $)
+(DEFUN |DFLOAT;**;$I$;35| (|x| |i| $)
(DECLARE (IGNORE $))
(EXPT |x| |i|))
-(DEFUN |DFLOAT;**;3$;33| (|x| |y| $) (C-TO-R (EXPT |x| |y|)))
+(DEFUN |DFLOAT;**;3$;36| (|x| |y| $) (C-TO-R (EXPT |x| |y|)))
-(DEFUN |DFLOAT;coerce;I$;34| (|i| $)
+(DEFUN |DFLOAT;coerce;I$;37| (|i| $)
(DECLARE (IGNORE $))
(FLOAT |i| |$DoubleFloatMaximum|))
-(DEFUN |DFLOAT;exp;2$;35| (|x| $) (DECLARE (IGNORE $)) (EXP |x|))
+(DEFUN |DFLOAT;exp;2$;38| (|x| $) (DECLARE (IGNORE $)) (EXP |x|))
-(DEFUN |DFLOAT;log;2$;36| (|x| $) (C-TO-R (LN |x|)))
+(DEFUN |DFLOAT;log;2$;39| (|x| $) (C-TO-R (LN |x|)))
-(DEFUN |DFLOAT;log2;2$;37| (|x| $) (C-TO-R (LOG2 |x|)))
+(DEFUN |DFLOAT;log2;2$;40| (|x| $) (C-TO-R (LOG2 |x|)))
-(DEFUN |DFLOAT;sin;2$;38| (|x| $) (DECLARE (IGNORE $)) (SIN |x|))
+(DEFUN |DFLOAT;sin;2$;41| (|x| $) (DECLARE (IGNORE $)) (SIN |x|))
-(DEFUN |DFLOAT;cos;2$;39| (|x| $) (DECLARE (IGNORE $)) (COS |x|))
+(DEFUN |DFLOAT;cos;2$;42| (|x| $) (DECLARE (IGNORE $)) (COS |x|))
-(DEFUN |DFLOAT;tan;2$;40| (|x| $) (DECLARE (IGNORE $)) (TAN |x|))
+(DEFUN |DFLOAT;tan;2$;43| (|x| $) (DECLARE (IGNORE $)) (TAN |x|))
-(DEFUN |DFLOAT;cot;2$;41| (|x| $) (DECLARE (IGNORE $)) (COT |x|))
+(DEFUN |DFLOAT;cot;2$;44| (|x| $) (DECLARE (IGNORE $)) (COT |x|))
-(DEFUN |DFLOAT;sec;2$;42| (|x| $) (DECLARE (IGNORE $)) (SEC |x|))
+(DEFUN |DFLOAT;sec;2$;45| (|x| $) (DECLARE (IGNORE $)) (SEC |x|))
-(DEFUN |DFLOAT;csc;2$;43| (|x| $) (DECLARE (IGNORE $)) (CSC |x|))
+(DEFUN |DFLOAT;csc;2$;46| (|x| $) (DECLARE (IGNORE $)) (CSC |x|))
-(DEFUN |DFLOAT;asin;2$;44| (|x| $) (C-TO-R (ASIN |x|)))
+(DEFUN |DFLOAT;asin;2$;47| (|x| $) (C-TO-R (ASIN |x|)))
-(DEFUN |DFLOAT;acos;2$;45| (|x| $) (C-TO-R (ACOS |x|)))
+(DEFUN |DFLOAT;acos;2$;48| (|x| $) (C-TO-R (ACOS |x|)))
-(DEFUN |DFLOAT;atan;2$;46| (|x| $) (DECLARE (IGNORE $)) (ATAN |x|))
+(DEFUN |DFLOAT;atan;2$;49| (|x| $) (DECLARE (IGNORE $)) (ATAN |x|))
-(DEFUN |DFLOAT;acsc;2$;47| (|x| $) (C-TO-R (ACSC |x|)))
+(DEFUN |DFLOAT;acsc;2$;50| (|x| $) (C-TO-R (ACSC |x|)))
-(DEFUN |DFLOAT;acot;2$;48| (|x| $) (DECLARE (IGNORE $)) (ACOT |x|))
+(DEFUN |DFLOAT;acot;2$;51| (|x| $) (DECLARE (IGNORE $)) (ACOT |x|))
-(DEFUN |DFLOAT;asec;2$;49| (|x| $) (C-TO-R (ASEC |x|)))
+(DEFUN |DFLOAT;asec;2$;52| (|x| $) (C-TO-R (ASEC |x|)))
-(DEFUN |DFLOAT;sinh;2$;50| (|x| $) (DECLARE (IGNORE $)) (SINH |x|))
+(DEFUN |DFLOAT;sinh;2$;53| (|x| $) (DECLARE (IGNORE $)) (SINH |x|))
-(DEFUN |DFLOAT;cosh;2$;51| (|x| $) (DECLARE (IGNORE $)) (COSH |x|))
+(DEFUN |DFLOAT;cosh;2$;54| (|x| $) (DECLARE (IGNORE $)) (COSH |x|))
-(DEFUN |DFLOAT;tanh;2$;52| (|x| $) (DECLARE (IGNORE $)) (TANH |x|))
+(DEFUN |DFLOAT;tanh;2$;55| (|x| $) (DECLARE (IGNORE $)) (TANH |x|))
-(DEFUN |DFLOAT;csch;2$;53| (|x| $) (DECLARE (IGNORE $)) (CSCH |x|))
+(DEFUN |DFLOAT;csch;2$;56| (|x| $) (DECLARE (IGNORE $)) (CSCH |x|))
-(DEFUN |DFLOAT;coth;2$;54| (|x| $) (DECLARE (IGNORE $)) (COTH |x|))
+(DEFUN |DFLOAT;coth;2$;57| (|x| $) (DECLARE (IGNORE $)) (COTH |x|))
-(DEFUN |DFLOAT;sech;2$;55| (|x| $) (DECLARE (IGNORE $)) (SECH |x|))
+(DEFUN |DFLOAT;sech;2$;58| (|x| $) (DECLARE (IGNORE $)) (SECH |x|))
-(DEFUN |DFLOAT;asinh;2$;56| (|x| $) (DECLARE (IGNORE $)) (ASINH |x|))
+(DEFUN |DFLOAT;asinh;2$;59| (|x| $) (DECLARE (IGNORE $)) (ASINH |x|))
-(DEFUN |DFLOAT;acosh;2$;57| (|x| $) (C-TO-R (ACOSH |x|)))
+(DEFUN |DFLOAT;acosh;2$;60| (|x| $) (C-TO-R (ACOSH |x|)))
-(DEFUN |DFLOAT;atanh;2$;58| (|x| $) (C-TO-R (ATANH |x|)))
+(DEFUN |DFLOAT;atanh;2$;61| (|x| $) (C-TO-R (ATANH |x|)))
-(DEFUN |DFLOAT;acsch;2$;59| (|x| $) (DECLARE (IGNORE $)) (ACSCH |x|))
+(DEFUN |DFLOAT;acsch;2$;62| (|x| $) (DECLARE (IGNORE $)) (ACSCH |x|))
-(DEFUN |DFLOAT;acoth;2$;60| (|x| $) (C-TO-R (ACOTH |x|)))
+(DEFUN |DFLOAT;acoth;2$;63| (|x| $) (C-TO-R (ACOTH |x|)))
-(DEFUN |DFLOAT;asech;2$;61| (|x| $) (C-TO-R (ASECH |x|)))
+(DEFUN |DFLOAT;asech;2$;64| (|x| $) (C-TO-R (ASECH |x|)))
-(DEFUN |DFLOAT;/;3$;62| (|x| |y| $) (DECLARE (IGNORE $)) (/ |x| |y|))
+(DEFUN |DFLOAT;/;3$;65| (|x| |y| $) (DECLARE (IGNORE $)) (/ |x| |y|))
-(DEFUN |DFLOAT;negative?;$B;63| (|x| $)
+(DEFUN |DFLOAT;negative?;$B;66| (|x| $)
(DECLARE (IGNORE $))
(MINUSP |x|))
-(DEFUN |DFLOAT;zero?;$B;64| (|x| $) (DECLARE (IGNORE $)) (ZEROP |x|))
+(DEFUN |DFLOAT;zero?;$B;67| (|x| $) (DECLARE (IGNORE $)) (ZEROP |x|))
-(DEFUN |DFLOAT;one?;$B;65| (|x| $) (DECLARE (IGNORE $)) (= |x| 1.0))
+(DEFUN |DFLOAT;one?;$B;68| (|x| $) (DECLARE (IGNORE $)) (= |x| 1.0))
-(DEFUN |DFLOAT;hash;$Si;66| (|x| $) (DECLARE (IGNORE $)) (HASHEQ |x|))
+(DEFUN |DFLOAT;hash;$Si;69| (|x| $) (DECLARE (IGNORE $)) (HASHEQ |x|))
-(DEFUN |DFLOAT;recip;$U;67| (|x| $)
+(DEFUN |DFLOAT;recip;$U;70| (|x| $)
(COND ((ZEROP |x|) (CONS 1 "failed")) ('T (CONS 0 (/ 1.0 |x|)))))
-(DEFUN |DFLOAT;differentiate;2$;68| (|x| $) (DECLARE (IGNORE $)) 0.0)
+(DEFUN |DFLOAT;differentiate;2$;71| (|x| $) (DECLARE (IGNORE $)) 0.0)
-(DEFUN |DFLOAT;Gamma;2$;69| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 104)))
+(DEFUN |DFLOAT;Gamma;2$;72| (|x| $)
+ (SPADCALL |x| (|getShellEntry| $ 108)))
-(DEFUN |DFLOAT;Beta;3$;70| (|x| |y| $)
- (SPADCALL |x| |y| (|getShellEntry| $ 106)))
+(DEFUN |DFLOAT;Beta;3$;73| (|x| |y| $)
+ (SPADCALL |x| |y| (|getShellEntry| $ 110)))
-(DEFUN |DFLOAT;wholePart;$I;71| (|x| $)
+(DEFUN |DFLOAT;wholePart;$I;74| (|x| $)
(DECLARE (IGNORE $))
(FIX |x|))
-(DEFUN |DFLOAT;float;2IPi$;72| (|ma| |ex| |b| $)
+(DEFUN |DFLOAT;float;2IPi$;75| (|ma| |ex| |b| $)
(* |ma| (EXPT (FLOAT |b| |$DoubleFloatMaximum|) |ex|)))
-(DEFUN |DFLOAT;convert;2$;73| (|x| $) (DECLARE (IGNORE $)) |x|)
+(DEFUN |DFLOAT;convert;2$;76| (|x| $) (DECLARE (IGNORE $)) |x|)
-(DEFUN |DFLOAT;convert;$F;74| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 110)))
+(DEFUN |DFLOAT;convert;$F;77| (|x| $)
+ (SPADCALL |x| (|getShellEntry| $ 114)))
-(DEFUN |DFLOAT;rationalApproximation;$NniF;75| (|x| |d| $)
- (|DFLOAT;rationalApproximation;$2NniF;84| |x| |d| 10 $))
+(DEFUN |DFLOAT;rationalApproximation;$NniF;78| (|x| |d| $)
+ (|DFLOAT;rationalApproximation;$2NniF;87| |x| |d| 10 $))
-(DEFUN |DFLOAT;atan;3$;76| (|x| |y| $)
+(DEFUN |DFLOAT;atan;3$;79| (|x| |y| $)
(PROG (|theta|)
(RETURN
(SEQ (COND
((= |x| 0.0)
(COND
- ((< 0.0 |y|) (/ PI 2))
+ ((> |y| 0.0) (/ PI 2))
((< |y| 0.0) (- (/ PI 2)))
('T 0.0)))
('T
(SEQ (LETT |theta| (ATAN (FLOAT-SIGN 1.0 (/ |y| |x|)))
- |DFLOAT;atan;3$;76|)
+ |DFLOAT;atan;3$;79|)
(COND
((< |x| 0.0)
- (LETT |theta| (- PI |theta|) |DFLOAT;atan;3$;76|)))
+ (LETT |theta| (- PI |theta|) |DFLOAT;atan;3$;79|)))
(COND
((< |y| 0.0)
- (LETT |theta| (- |theta|) |DFLOAT;atan;3$;76|)))
+ (LETT |theta| (- |theta|) |DFLOAT;atan;3$;79|)))
(EXIT |theta|))))))))
-(DEFUN |DFLOAT;retract;$F;77| (|x| $)
- (PROG (#0=#:G1501)
+(DEFUN |DFLOAT;retract;$F;80| (|x| $)
+ (PROG (#0=#:G1504)
(RETURN
- (|DFLOAT;rationalApproximation;$2NniF;84| |x|
+ (|DFLOAT;rationalApproximation;$2NniF;87| |x|
(PROG1 (LETT #0# (- (FLOAT-DIGITS 0.0) 1)
- |DFLOAT;retract;$F;77|)
+ |DFLOAT;retract;$F;80|)
(|check-subtype| (NOT (< #0# 0)) '(|NonNegativeInteger|)
#0#))
(FLOAT-RADIX 0.0) $))))
-(DEFUN |DFLOAT;retractIfCan;$U;78| (|x| $)
- (PROG (#0=#:G1506)
+(DEFUN |DFLOAT;retractIfCan;$U;81| (|x| $)
+ (PROG (#0=#:G1509)
(RETURN
(CONS 0
- (|DFLOAT;rationalApproximation;$2NniF;84| |x|
+ (|DFLOAT;rationalApproximation;$2NniF;87| |x|
(PROG1 (LETT #0# (- (FLOAT-DIGITS 0.0) 1)
- |DFLOAT;retractIfCan;$U;78|)
+ |DFLOAT;retractIfCan;$U;81|)
(|check-subtype| (NOT (< #0# 0))
'(|NonNegativeInteger|) #0#))
(FLOAT-RADIX 0.0) $)))))
-(DEFUN |DFLOAT;retract;$I;79| (|x| $)
+(DEFUN |DFLOAT;retract;$I;82| (|x| $)
(PROG (|n|)
(RETURN
- (SEQ (LETT |n| (FIX |x|) |DFLOAT;retract;$I;79|)
+ (SEQ (LETT |n| (FIX |x|) |DFLOAT;retract;$I;82|)
(EXIT (COND
((= |x| (FLOAT |n| |$DoubleFloatMaximum|)) |n|)
('T (|error| "Not an integer"))))))))
-(DEFUN |DFLOAT;retractIfCan;$U;80| (|x| $)
+(DEFUN |DFLOAT;retractIfCan;$U;83| (|x| $)
(PROG (|n|)
(RETURN
- (SEQ (LETT |n| (FIX |x|) |DFLOAT;retractIfCan;$U;80|)
+ (SEQ (LETT |n| (FIX |x|) |DFLOAT;retractIfCan;$U;83|)
(EXIT (COND
((= |x| (FLOAT |n| |$DoubleFloatMaximum|))
(CONS 0 |n|))
('T (CONS 1 "failed"))))))))
-(DEFUN |DFLOAT;sign;$I;81| (|x| $)
- (|DFLOAT;retract;$I;79| (FLOAT-SIGN |x| 1.0) $))
+(DEFUN |DFLOAT;sign;$I;84| (|x| $)
+ (|DFLOAT;retract;$I;82| (FLOAT-SIGN |x| 1.0) $))
-(DEFUN |DFLOAT;abs;2$;82| (|x| $)
+(DEFUN |DFLOAT;abs;2$;85| (|x| $)
(DECLARE (IGNORE $))
(FLOAT-SIGN 1.0 |x|))
(DEFUN |DFLOAT;manexp| (|x| $)
- (PROG (|s| #0=#:G1527 |me| |two53|)
+ (PROG (|s| #0=#:G1530 |me| |two53|)
(RETURN
(SEQ (EXIT (COND
((ZEROP |x|) (CONS 0 0))
('T
- (SEQ (LETT |s| (|DFLOAT;sign;$I;81| |x| $)
+ (SEQ (LETT |s| (|DFLOAT;sign;$I;84| |x| $)
|DFLOAT;manexp|)
(LETT |x| (FLOAT-SIGN 1.0 |x|)
|DFLOAT;manexp|)
(COND
- ((< |$DoubleFloatMaximum| |x|)
+ ((> |x| |$DoubleFloatMaximum|)
(PROGN
(LETT #0#
(CONS
@@ -713,32 +733,32 @@
(- (QCDR |me|) (FLOAT-DIGITS 0.0))))))))
#0# (EXIT #0#)))))
-(DEFUN |DFLOAT;rationalApproximation;$2NniF;84| (|f| |d| |b| $)
- (PROG (|#G103| |nu| |ex| BASE #0=#:G1530 |de| |tol| |#G104| |q| |r|
- |p2| |q2| #1=#:G1539 |#G105| |#G106| |p0| |p1| |#G107|
- |#G108| |q0| |q1| |#G109| |#G110| |s| |t|)
+(DEFUN |DFLOAT;rationalApproximation;$2NniF;87| (|f| |d| |b| $)
+ (PROG (|#G109| |nu| |ex| BASE #0=#:G1533 |de| |tol| |#G110| |q| |r|
+ |p2| |q2| #1=#:G1542 |#G111| |#G112| |p0| |p1| |#G113|
+ |#G114| |q0| |q1| |#G115| |#G116| |s| |t|)
(RETURN
(SEQ (EXIT (SEQ (PROGN
- (LETT |#G103| (|DFLOAT;manexp| |f| $)
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |nu| (QCAR |#G103|)
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |ex| (QCDR |#G103|)
- |DFLOAT;rationalApproximation;$2NniF;84|)
- |#G103|)
+ (LETT |#G109| (|DFLOAT;manexp| |f| $)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |nu| (QCAR |#G109|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |ex| (QCDR |#G109|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ |#G109|)
(LETT BASE (FLOAT-RADIX 0.0)
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(EXIT (COND
((< |ex| 0)
(SEQ (LETT |de|
(EXPT BASE
(PROG1
(LETT #0# (- |ex|)
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(|check-subtype|
(NOT (< #0# 0))
'(|NonNegativeInteger|) #0#)))
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(EXIT
(COND
((< |b| 2)
@@ -746,37 +766,37 @@
('T
(SEQ
(LETT |tol| (EXPT |b| |d|)
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(LETT |s| |nu|
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(LETT |t| |de|
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(LETT |p0| 0
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(LETT |p1| 1
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(LETT |q0| 1
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(LETT |q1| 0
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(EXIT
(SEQ G190 NIL
(SEQ
(PROGN
- (LETT |#G104|
+ (LETT |#G110|
(DIVIDE2 |s| |t|)
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |q| (QCAR |#G104|)
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |r| (QCDR |#G104|)
- |DFLOAT;rationalApproximation;$2NniF;84|)
- |#G104|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |q| (QCAR |#G110|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |r| (QCDR |#G110|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ |#G110|)
(LETT |p2|
(+ (* |q| |p1|) |p0|)
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(LETT |q2|
(+ (* |q| |q1|) |q0|)
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(COND
((OR (EQL |r| 0)
(<
@@ -785,44 +805,44 @@
(- (* |nu| |q2|)
(* |de| |p2|)))
(|getShellEntry| $
- 141))
+ 145))
(* |de| (ABS |p2|))))
(EXIT
(PROGN
(LETT #1#
(SPADCALL |p2| |q2|
(|getShellEntry| $
- 139))
- |DFLOAT;rationalApproximation;$2NniF;84|)
+ 143))
+ |DFLOAT;rationalApproximation;$2NniF;87|)
(GO #1#)))))
(PROGN
- (LETT |#G105| |p1|
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |#G106| |p2|
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |p0| |#G105|
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |p1| |#G106|
- |DFLOAT;rationalApproximation;$2NniF;84|))
+ (LETT |#G111| |p1|
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |#G112| |p2|
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |p0| |#G111|
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |p1| |#G112|
+ |DFLOAT;rationalApproximation;$2NniF;87|))
(PROGN
- (LETT |#G107| |q1|
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |#G108| |q2|
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |q0| |#G107|
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |q1| |#G108|
- |DFLOAT;rationalApproximation;$2NniF;84|))
+ (LETT |#G113| |q1|
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |#G114| |q2|
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |q0| |#G113|
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |q1| |#G114|
+ |DFLOAT;rationalApproximation;$2NniF;87|))
(EXIT
(PROGN
- (LETT |#G109| |t|
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |#G110| |r|
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |s| |#G109|
- |DFLOAT;rationalApproximation;$2NniF;84|)
- (LETT |t| |#G110|
- |DFLOAT;rationalApproximation;$2NniF;84|))))
+ (LETT |#G115| |t|
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |#G116| |r|
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |s| |#G115|
+ |DFLOAT;rationalApproximation;$2NniF;87|)
+ (LETT |t| |#G116|
+ |DFLOAT;rationalApproximation;$2NniF;87|))))
NIL (GO G190) G191
(EXIT NIL)))))))))
('T
@@ -833,35 +853,35 @@
(|check-subtype|
(NOT (< |ex| 0))
'(|NonNegativeInteger|) |ex|))))
- (|getShellEntry| $ 142)))))))
+ (|getShellEntry| $ 146)))))))
#1# (EXIT #1#)))))
-(DEFUN |DFLOAT;**;$F$;85| (|x| |r| $)
- (PROG (|n| |d| #0=#:G1549)
+(DEFUN |DFLOAT;**;$F$;88| (|x| |r| $)
+ (PROG (|n| |d| #0=#:G1552)
(RETURN
(SEQ (EXIT (COND
((ZEROP |x|)
(COND
- ((SPADCALL |r| (|getShellEntry| $ 143))
+ ((SPADCALL |r| (|getShellEntry| $ 147))
(|error| "0**0 is undefined"))
- ((SPADCALL |r| (|getShellEntry| $ 144))
+ ((SPADCALL |r| (|getShellEntry| $ 148))
(|error| "division by 0"))
('T 0.0)))
- ((OR (SPADCALL |r| (|getShellEntry| $ 143))
+ ((OR (SPADCALL |r| (|getShellEntry| $ 147))
(= |x| 1.0))
1.0)
('T
(COND
- ((SPADCALL |r| (|getShellEntry| $ 145)) |x|)
+ ((SPADCALL |r| (|getShellEntry| $ 149)) |x|)
('T
(SEQ (LETT |n|
(SPADCALL |r|
- (|getShellEntry| $ 146))
- |DFLOAT;**;$F$;85|)
+ (|getShellEntry| $ 150))
+ |DFLOAT;**;$F$;88|)
(LETT |d|
(SPADCALL |r|
- (|getShellEntry| $ 147))
- |DFLOAT;**;$F$;85|)
+ (|getShellEntry| $ 151))
+ |DFLOAT;**;$F$;88|)
(EXIT (COND
((MINUSP |x|)
(COND
@@ -871,23 +891,23 @@
(PROGN
(LETT #0#
(-
- (|DFLOAT;**;$F$;85|
+ (|DFLOAT;**;$F$;88|
(- |x|) |r| $))
- |DFLOAT;**;$F$;85|)
+ |DFLOAT;**;$F$;88|)
(GO #0#)))
('T
(PROGN
(LETT #0#
- (|DFLOAT;**;$F$;85|
+ (|DFLOAT;**;$F$;88|
(- |x|) |r| $)
- |DFLOAT;**;$F$;85|)
+ |DFLOAT;**;$F$;88|)
(GO #0#)))))
('T (|error| "negative root"))))
((EQL |d| 2)
- (EXPT (|DFLOAT;sqrt;2$;30| |x| $)
+ (EXPT (|DFLOAT;sqrt;2$;33| |x| $)
|n|))
('T
- (|DFLOAT;**;3$;33| |x|
+ (|DFLOAT;**;3$;36| |x|
(/
(FLOAT |n|
|$DoubleFloatMaximum|)
@@ -899,7 +919,7 @@
(DEFUN |DoubleFloat| ()
(PROG ()
(RETURN
- (PROG (#0=#:G1561)
+ (PROG (#0=#:G1564)
(RETURN
(COND
((LETT #0# (HGET |$ConstructorCache| '|DoubleFloat|)
@@ -920,7 +940,7 @@
(RETURN
(PROGN
(LETT |dv$| '(|DoubleFloat|) . #0=(|DoubleFloat|))
- (LETT $ (|newShell| 161) . #0#)
+ (LETT $ (|newShell| 165) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -932,7 +952,7 @@
(LIST '#(NIL NIL NIL NIL NIL NIL (|OpenMathEncoding|)
(0 . |OMencodingXML|) (|String|) (|OpenMathDevice|)
(4 . |OMopenString|) (|Void|) (10 . |OMputObject|)
- (|DoubleFloat|) |DFLOAT;convert;2$;73| (15 . |OMputFloat|)
+ (|DoubleFloat|) |DFLOAT;convert;2$;76| (15 . |OMputFloat|)
(21 . |OMputEndObject|) (26 . |OMclose|)
|DFLOAT;OMwrite;$S;1| (|Boolean|) |DFLOAT;OMwrite;$BS;2|
|DFLOAT;OMwrite;Omd$V;3| |DFLOAT;OMwrite;Omd$BV;4|
@@ -941,89 +961,91 @@
(|PositiveInteger|) |DFLOAT;base;Pi;6| (|Integer|)
|DFLOAT;mantissa;$I;7| |DFLOAT;exponent;$I;8|
|DFLOAT;precision;Pi;9| (31 . |base|) (35 . =) (41 . *)
- (47 . |coerce|) |DFLOAT;log2;2$;37| (52 . *)
- |DFLOAT;wholePart;$I;71| |DFLOAT;bits;Pi;10|
+ (47 . |coerce|) |DFLOAT;log2;2$;40| (52 . *)
+ |DFLOAT;wholePart;$I;74| |DFLOAT;bits;Pi;10|
|DFLOAT;max;$;11| |DFLOAT;min;$;12| (58 . +) (64 . |One|)
(68 . -) |DFLOAT;order;$I;13|
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |DFLOAT;One;$;15|) $))
- |DFLOAT;/;3$;62| |DFLOAT;exp1;$;16| |DFLOAT;pi;$;17|
+ |DFLOAT;/;3$;65| |DFLOAT;exp1;$;16| |DFLOAT;pi;$;17|
(|OutputForm|) (74 . |outputForm|) |DFLOAT;coerce;$Of;18|
(|InputForm|) (79 . |convert|) |DFLOAT;convert;$If;19|
- |DFLOAT;<;2$B;20| |DFLOAT;-;2$;21| |DFLOAT;+;3$;22|
- |DFLOAT;-;3$;23| |DFLOAT;*;3$;24| |DFLOAT;*;I2$;25|
- |DFLOAT;max;3$;26| |DFLOAT;min;3$;27| |DFLOAT;=;2$B;28|
- |DFLOAT;/;$I$;29| |DFLOAT;sqrt;2$;30| |DFLOAT;log10;2$;31|
- |DFLOAT;**;$I$;32| |DFLOAT;**;3$;33| |DFLOAT;coerce;I$;34|
- |DFLOAT;exp;2$;35| |DFLOAT;log;2$;36| |DFLOAT;sin;2$;38|
- |DFLOAT;cos;2$;39| |DFLOAT;tan;2$;40| |DFLOAT;cot;2$;41|
- |DFLOAT;sec;2$;42| |DFLOAT;csc;2$;43| |DFLOAT;asin;2$;44|
- |DFLOAT;acos;2$;45| |DFLOAT;atan;2$;46|
- |DFLOAT;acsc;2$;47| |DFLOAT;acot;2$;48|
- |DFLOAT;asec;2$;49| |DFLOAT;sinh;2$;50|
- |DFLOAT;cosh;2$;51| |DFLOAT;tanh;2$;52|
- |DFLOAT;csch;2$;53| |DFLOAT;coth;2$;54|
- |DFLOAT;sech;2$;55| |DFLOAT;asinh;2$;56|
- |DFLOAT;acosh;2$;57| |DFLOAT;atanh;2$;58|
- |DFLOAT;acsch;2$;59| |DFLOAT;acoth;2$;60|
- |DFLOAT;asech;2$;61| |DFLOAT;negative?;$B;63|
- |DFLOAT;zero?;$B;64| |DFLOAT;one?;$B;65| (|SingleInteger|)
- |DFLOAT;hash;$Si;66| (|Union| $ '"failed")
- |DFLOAT;recip;$U;67| |DFLOAT;differentiate;2$;68|
- (|DoubleFloatSpecialFunctions|) (84 . |Gamma|)
- |DFLOAT;Gamma;2$;69| (89 . |Beta|) |DFLOAT;Beta;3$;70|
- |DFLOAT;float;2IPi$;72| (|Float|) (95 . |convert|)
- |DFLOAT;convert;$F;74| (|Fraction| 26)
+ |DFLOAT;<;2$B;20| |DFLOAT;>;2$B;21| (84 . |not|)
+ |DFLOAT;<=;2$B;22| |DFLOAT;>=;2$B;23| |DFLOAT;-;2$;24|
+ |DFLOAT;+;3$;25| |DFLOAT;-;3$;26| |DFLOAT;*;3$;27|
+ |DFLOAT;*;I2$;28| |DFLOAT;max;3$;29| |DFLOAT;min;3$;30|
+ |DFLOAT;=;2$B;31| |DFLOAT;/;$I$;32| |DFLOAT;sqrt;2$;33|
+ |DFLOAT;log10;2$;34| |DFLOAT;**;$I$;35| |DFLOAT;**;3$;36|
+ |DFLOAT;coerce;I$;37| |DFLOAT;exp;2$;38|
+ |DFLOAT;log;2$;39| |DFLOAT;sin;2$;41| |DFLOAT;cos;2$;42|
+ |DFLOAT;tan;2$;43| |DFLOAT;cot;2$;44| |DFLOAT;sec;2$;45|
+ |DFLOAT;csc;2$;46| |DFLOAT;asin;2$;47| |DFLOAT;acos;2$;48|
+ |DFLOAT;atan;2$;49| |DFLOAT;acsc;2$;50|
+ |DFLOAT;acot;2$;51| |DFLOAT;asec;2$;52|
+ |DFLOAT;sinh;2$;53| |DFLOAT;cosh;2$;54|
+ |DFLOAT;tanh;2$;55| |DFLOAT;csch;2$;56|
+ |DFLOAT;coth;2$;57| |DFLOAT;sech;2$;58|
+ |DFLOAT;asinh;2$;59| |DFLOAT;acosh;2$;60|
+ |DFLOAT;atanh;2$;61| |DFLOAT;acsch;2$;62|
+ |DFLOAT;acoth;2$;63| |DFLOAT;asech;2$;64|
+ |DFLOAT;negative?;$B;66| |DFLOAT;zero?;$B;67|
+ |DFLOAT;one?;$B;68| (|SingleInteger|) |DFLOAT;hash;$Si;69|
+ (|Union| $ '"failed") |DFLOAT;recip;$U;70|
+ |DFLOAT;differentiate;2$;71|
+ (|DoubleFloatSpecialFunctions|) (89 . |Gamma|)
+ |DFLOAT;Gamma;2$;72| (94 . |Beta|) |DFLOAT;Beta;3$;73|
+ |DFLOAT;float;2IPi$;75| (|Float|) (100 . |convert|)
+ |DFLOAT;convert;$F;77| (|Fraction| 26)
(|NonNegativeInteger|)
- |DFLOAT;rationalApproximation;$2NniF;84|
- |DFLOAT;rationalApproximation;$NniF;75| (100 . |Zero|)
- |DFLOAT;abs;2$;82| |DFLOAT;atan;3$;76| (104 . |One|)
- |DFLOAT;retract;$F;77| (|Union| 112 '"failed")
- |DFLOAT;retractIfCan;$U;78| |DFLOAT;retract;$I;79|
- (|Union| 26 '"failed") |DFLOAT;retractIfCan;$U;80|
- |DFLOAT;sign;$I;81| (108 . *) (114 . **) (120 . |Zero|)
- (124 . |Zero|) (128 . <) (134 . -) (139 . **) (145 . <)
- (151 . **)
+ |DFLOAT;rationalApproximation;$2NniF;87|
+ |DFLOAT;rationalApproximation;$NniF;78| (105 . |Zero|)
+ |DFLOAT;abs;2$;85| |DFLOAT;atan;3$;79| (109 . |One|)
+ |DFLOAT;retract;$F;80| (|Union| 116 '"failed")
+ |DFLOAT;retractIfCan;$U;81| |DFLOAT;retract;$I;82|
+ (|Union| 26 '"failed") |DFLOAT;retractIfCan;$U;83|
+ |DFLOAT;sign;$I;84| (113 . *) (119 . **) (125 . |Zero|)
+ (129 . |Zero|) (133 . <) (139 . -) (144 . **) (150 . <)
+ (156 . **)
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- (157 . |divide|) (163 . =) (169 . /) (175 . |abs|)
- (180 . *) (186 . |coerce|) (191 . |zero?|)
- (196 . |negative?|) (201 . |one?|) (206 . |numer|)
- (211 . |denom|) (216 . |odd?|) |DFLOAT;**;$F$;85|
- (|PatternMatchResult| 109 $) (|Pattern| 109)
- (|Factored| $) (|List| $) (|Union| 153 '"failed")
+ (162 . |divide|) (168 . =) (174 . /) (180 . |abs|)
+ (185 . *) (191 . |coerce|) (196 . |zero?|)
+ (201 . |negative?|) (206 . |one?|) (211 . |numer|)
+ (216 . |denom|) (221 . |odd?|) |DFLOAT;**;$F$;88|
+ (|PatternMatchResult| 113 $) (|Pattern| 113)
+ (|Factored| $) (|List| $) (|Union| 157 '"failed")
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
(|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 156 '"failed")
- (|Record| (|:| |coef| 153) (|:| |generator| $))
+ (|Union| 160 '"failed")
+ (|Record| (|:| |coef| 157) (|:| |generator| $))
(|SparseUnivariatePolynomial| $)
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $)))
- '#(~= 221 |zero?| 227 |wholePart| 232 |unitNormal| 237
- |unitCanonical| 242 |unit?| 247 |truncate| 252 |tanh| 257
- |tan| 262 |subtractIfCan| 267 |squareFreePart| 273
- |squareFree| 278 |sqrt| 283 |sizeLess?| 288 |sinh| 294
- |sin| 299 |sign| 304 |sech| 309 |sec| 314 |sample| 319
- |round| 323 |retractIfCan| 328 |retract| 338 |rem| 348
- |recip| 354 |rationalApproximation| 359 |quo| 372
- |principalIdeal| 378 |prime?| 383 |precision| 388
- |positive?| 392 |pi| 397 |patternMatch| 401 |order| 408
- |one?| 413 |nthRoot| 418 |norm| 424 |negative?| 429
- |multiEuclidean| 434 |min| 440 |max| 450 |mantissa| 460
- |log2| 465 |log10| 470 |log| 475 |lcm| 480 |latex| 491
- |inv| 496 |hash| 501 |gcdPolynomial| 506 |gcd| 512
- |fractionPart| 523 |floor| 528 |float| 533 |factor| 546
- |extendedEuclidean| 551 |exquo| 564 |expressIdealMember|
- 570 |exponent| 576 |exp1| 581 |exp| 585 |euclideanSize|
- 590 |divide| 595 |digits| 601 |differentiate| 605 |csch|
- 616 |csc| 621 |coth| 626 |cot| 631 |cosh| 636 |cos| 641
- |convert| 646 |coerce| 666 |characteristic| 696 |ceiling|
- 700 |bits| 705 |before?| 709 |base| 715 |atanh| 719 |atan|
- 724 |associates?| 735 |asinh| 741 |asin| 746 |asech| 751
- |asec| 756 |acsch| 761 |acsc| 766 |acoth| 771 |acot| 776
- |acosh| 781 |acos| 786 |abs| 791 |Zero| 796 |One| 800
- |OMwrite| 804 |Gamma| 828 D 833 |Beta| 844 >= 850 > 856 =
- 862 <= 868 < 874 / 880 - 892 + 903 ** 909 * 939)
+ '#(~= 226 |zero?| 232 |wholePart| 237 |unitNormal| 242
+ |unitCanonical| 247 |unit?| 252 |truncate| 257 |tanh| 262
+ |tan| 267 |subtractIfCan| 272 |squareFreePart| 278
+ |squareFree| 283 |sqrt| 288 |sizeLess?| 293 |sinh| 299
+ |sin| 304 |sign| 309 |sech| 314 |sec| 319 |sample| 324
+ |round| 328 |retractIfCan| 333 |retract| 343 |rem| 353
+ |recip| 359 |rationalApproximation| 364 |quo| 377
+ |principalIdeal| 383 |prime?| 388 |precision| 393
+ |positive?| 397 |pi| 402 |patternMatch| 406 |order| 413
+ |one?| 418 |nthRoot| 423 |norm| 429 |negative?| 434
+ |multiEuclidean| 439 |min| 445 |max| 455 |mantissa| 465
+ |log2| 470 |log10| 475 |log| 480 |lcm| 485 |latex| 496
+ |inv| 501 |hash| 506 |gcdPolynomial| 511 |gcd| 517
+ |fractionPart| 528 |floor| 533 |float| 538 |factor| 551
+ |extendedEuclidean| 556 |exquo| 569 |expressIdealMember|
+ 575 |exponent| 581 |exp1| 586 |exp| 590 |euclideanSize|
+ 595 |divide| 600 |digits| 606 |differentiate| 610 |csch|
+ 621 |csc| 626 |coth| 631 |cot| 636 |cosh| 641 |cos| 646
+ |convert| 651 |coerce| 671 |characteristic| 701 |ceiling|
+ 705 |bits| 710 |before?| 714 |base| 720 |atanh| 724 |atan|
+ 729 |associates?| 740 |asinh| 746 |asin| 751 |asech| 756
+ |asec| 761 |acsch| 766 |acsc| 771 |acoth| 776 |acot| 781
+ |acosh| 786 |acos| 791 |abs| 796 |Zero| 801 |One| 805
+ |OMwrite| 809 |Gamma| 833 D 838 |Beta| 849 >= 855 > 861 =
+ 867 <= 873 < 879 / 885 - 897 + 908 ** 914 * 944)
'((|approximate| . 0) (|canonicalsClosed| . 0)
(|canonicalUnitNormal| . 0) (|noZeroDivisors| . 0)
((|commutative| "*") . 0) (|rightUnitary| . 0)
@@ -1058,14 +1080,14 @@
(|PrincipalIdealDomain|)
(|UniqueFactorizationDomain|)
(|GcdDomain|) (|DivisionRing|)
- (|IntegralDomain|) (|Algebra| 112)
+ (|IntegralDomain|) (|Algebra| 116)
(|Algebra| $$) (|DifferentialRing|)
(|CharacteristicZero|) (|OrderedRing|)
- (|Module| 112) (|EntireRing|)
+ (|Module| 116) (|EntireRing|)
(|CommutativeRing|) (|Module| $$)
- (|BiModule| 112 112) (|BiModule| $$ $$)
+ (|BiModule| 116 116) (|BiModule| $$ $$)
(|Ring|) (|OrderedAbelianGroup|)
- (|RightModule| 112) (|LeftModule| 112)
+ (|RightModule| 116) (|LeftModule| 116)
(|LeftModule| $$) (|Rng|)
(|RightModule| $$)
(|OrderedCancellationAbelianMonoid|)
@@ -1073,17 +1095,17 @@
(|OrderedAbelianMonoid|)
(|CancellationAbelianMonoid|)
(|OrderedAbelianSemiGroup|)
- (|LinearSet| 112) (|LinearSet| $$)
+ (|LinearSet| 116) (|LinearSet| $$)
(|AbelianMonoid|) (|Monoid|)
- (|PatternMatchable| 109) (|OrderedSet|)
- (|LeftLinearSet| 112)
- (|RightLinearSet| 112)
+ (|PatternMatchable| 113) (|OrderedSet|)
+ (|LeftLinearSet| 116)
+ (|RightLinearSet| 116)
(|LeftLinearSet| $$)
(|RightLinearSet| $$)
(|AbelianSemiGroup|) (|SemiGroup|)
(|LeftLinearSet| 26)
(|TranscendentalFunctionCategory|)
- (|RetractableTo| 112)
+ (|RetractableTo| 116)
(|RetractableTo| 26) (|RealConstant|)
(|SetCategory|) (|ConvertibleTo| 51)
(|ElementaryFunctionCategory|)
@@ -1091,79 +1113,79 @@
(|HyperbolicFunctionCategory|)
(|ArcTrigonometricFunctionCategory|)
(|TrigonometricFunctionCategory|)
- (|OpenMath|) (|ConvertibleTo| 151)
+ (|OpenMath|) (|ConvertibleTo| 155)
(|RadicalCategory|)
- (|ConvertibleTo| 109)
+ (|ConvertibleTo| 113)
(|ConvertibleTo| 13)
- (|CoercibleFrom| 112)
+ (|CoercibleFrom| 116)
(|CoercibleFrom| $$)
(|CoercibleFrom| 26) (|BasicType|)
(|CoercibleTo| 48))
- (|makeByteWordVec2| 160
+ (|makeByteWordVec2| 164
'(0 6 0 7 2 9 0 8 6 10 1 9 11 0 12 2 9
11 0 13 15 1 9 11 0 16 1 9 11 0 17 0
26 0 30 2 24 19 0 0 31 2 24 0 24 0 32
1 0 0 26 33 2 0 0 24 0 35 2 26 0 0 0
40 0 26 0 41 2 26 0 0 0 42 1 48 0 13
- 49 1 51 0 13 52 1 103 13 13 104 2 103
- 13 13 13 106 1 109 0 13 110 0 26 0
- 116 0 24 0 119 2 26 0 26 0 127 2 26 0
- 0 113 128 0 112 0 129 0 113 0 130 2
- 26 19 0 0 131 1 26 0 0 132 2 24 0 0
- 113 133 2 113 19 0 0 134 2 113 0 0
- 113 135 2 26 136 0 0 137 2 26 19 0 0
- 138 2 112 0 26 26 139 1 26 0 0 140 2
- 26 0 113 0 141 1 112 0 26 142 1 112
- 19 0 143 1 112 19 0 144 1 112 19 0
- 145 1 112 26 0 146 1 112 26 0 147 1
- 26 19 0 148 2 0 19 0 0 1 1 0 19 0 96
- 1 0 26 0 36 1 0 160 0 1 1 0 0 0 1 1 0
- 19 0 1 1 0 0 0 1 1 0 0 0 85 1 0 0 0
- 73 2 0 100 0 0 1 1 0 0 0 1 1 0 152 0
- 1 1 0 0 0 64 2 0 19 0 0 1 1 0 0 0 83
- 1 0 0 0 71 1 0 26 0 126 1 0 0 0 88 1
- 0 0 0 75 0 0 0 1 1 0 0 0 1 1 0 121 0
- 122 1 0 124 0 125 1 0 112 0 120 1 0
- 26 0 123 2 0 0 0 0 1 1 0 100 0 101 2
- 0 112 0 113 115 3 0 112 0 113 113 114
- 2 0 0 0 0 1 1 0 158 153 1 1 0 19 0 1
- 0 0 24 29 1 0 19 0 1 0 0 0 47 3 0 150
- 0 151 150 1 1 0 26 0 43 1 0 19 0 97 2
- 0 0 0 26 1 1 0 0 0 1 1 0 19 0 95 2 0
- 154 153 0 1 0 0 0 39 2 0 0 0 0 61 0 0
- 0 38 2 0 0 0 0 60 1 0 26 0 27 1 0 0 0
- 34 1 0 0 0 65 1 0 0 0 70 1 0 0 153 1
- 2 0 0 0 0 1 1 0 8 0 1 1 0 0 0 1 1 0
- 98 0 99 2 0 159 159 159 1 1 0 0 153 1
- 2 0 0 0 0 1 1 0 0 0 1 1 0 0 0 1 3 0 0
- 26 26 24 108 2 0 0 26 26 1 1 0 152 0
- 1 2 0 155 0 0 1 3 0 157 0 0 0 1 2 0
- 100 0 0 1 2 0 154 153 0 1 1 0 26 0 28
- 0 0 0 46 1 0 0 0 69 1 0 113 0 1 2 0
- 136 0 0 1 0 0 24 1 1 0 0 0 102 2 0 0
- 0 113 1 1 0 0 0 86 1 0 0 0 76 1 0 0 0
- 87 1 0 0 0 74 1 0 0 0 84 1 0 0 0 72 1
- 0 51 0 53 1 0 151 0 1 1 0 109 0 111 1
- 0 13 0 14 1 0 0 112 1 1 0 0 26 68 1 0
- 0 112 1 1 0 0 0 1 1 0 0 26 68 1 0 48
- 0 50 0 0 113 1 1 0 0 0 1 0 0 24 37 2
- 0 19 0 0 1 0 0 24 25 1 0 0 0 91 2 0 0
- 0 0 118 1 0 0 0 79 2 0 19 0 0 1 1 0 0
- 0 89 1 0 0 0 77 1 0 0 0 94 1 0 0 0 82
- 1 0 0 0 92 1 0 0 0 80 1 0 0 0 93 1 0
- 0 0 81 1 0 0 0 90 1 0 0 0 78 1 0 0 0
- 117 0 0 0 23 0 0 0 44 2 0 11 9 0 21 3
- 0 11 9 0 19 22 1 0 8 0 18 2 0 8 0 19
- 20 1 0 0 0 105 1 0 0 0 1 2 0 0 0 113
- 1 2 0 0 0 0 107 2 0 19 0 0 1 2 0 19 0
- 0 1 2 0 19 0 0 62 2 0 19 0 0 1 2 0 19
- 0 0 54 2 0 0 0 26 63 2 0 0 0 0 45 2 0
- 0 0 0 57 1 0 0 0 55 2 0 0 0 0 56 2 0
- 0 0 0 67 2 0 0 0 112 149 2 0 0 0 26
- 66 2 0 0 0 113 1 2 0 0 0 24 1 2 0 0
- 112 0 1 2 0 0 0 112 1 2 0 0 0 0 58 2
- 0 0 26 0 59 2 0 0 113 0 1 2 0 0 24 0
- 35)))))
+ 49 1 51 0 13 52 1 19 0 0 56 1 107 13
+ 13 108 2 107 13 13 13 110 1 113 0 13
+ 114 0 26 0 120 0 24 0 123 2 26 0 26 0
+ 131 2 26 0 0 117 132 0 116 0 133 0
+ 117 0 134 2 26 19 0 0 135 1 26 0 0
+ 136 2 24 0 0 117 137 2 117 19 0 0 138
+ 2 117 0 0 117 139 2 26 140 0 0 141 2
+ 26 19 0 0 142 2 116 0 26 26 143 1 26
+ 0 0 144 2 26 0 117 0 145 1 116 0 26
+ 146 1 116 19 0 147 1 116 19 0 148 1
+ 116 19 0 149 1 116 26 0 150 1 116 26
+ 0 151 1 26 19 0 152 2 0 19 0 0 1 1 0
+ 19 0 100 1 0 26 0 36 1 0 164 0 1 1 0
+ 0 0 1 1 0 19 0 1 1 0 0 0 1 1 0 0 0 89
+ 1 0 0 0 77 2 0 104 0 0 1 1 0 0 0 1 1
+ 0 156 0 1 1 0 0 0 68 2 0 19 0 0 1 1 0
+ 0 0 87 1 0 0 0 75 1 0 26 0 130 1 0 0
+ 0 92 1 0 0 0 79 0 0 0 1 1 0 0 0 1 1 0
+ 125 0 126 1 0 128 0 129 1 0 116 0 124
+ 1 0 26 0 127 2 0 0 0 0 1 1 0 104 0
+ 105 2 0 116 0 117 119 3 0 116 0 117
+ 117 118 2 0 0 0 0 1 1 0 162 157 1 1 0
+ 19 0 1 0 0 24 29 1 0 19 0 1 0 0 0 47
+ 3 0 154 0 155 154 1 1 0 26 0 43 1 0
+ 19 0 101 2 0 0 0 26 1 1 0 0 0 1 1 0
+ 19 0 99 2 0 158 157 0 1 0 0 0 39 2 0
+ 0 0 0 65 0 0 0 38 2 0 0 0 0 64 1 0 26
+ 0 27 1 0 0 0 34 1 0 0 0 69 1 0 0 0 74
+ 1 0 0 157 1 2 0 0 0 0 1 1 0 8 0 1 1 0
+ 0 0 1 1 0 102 0 103 2 0 163 163 163 1
+ 1 0 0 157 1 2 0 0 0 0 1 1 0 0 0 1 1 0
+ 0 0 1 3 0 0 26 26 24 112 2 0 0 26 26
+ 1 1 0 156 0 1 2 0 159 0 0 1 3 0 161 0
+ 0 0 1 2 0 104 0 0 1 2 0 158 157 0 1 1
+ 0 26 0 28 0 0 0 46 1 0 0 0 73 1 0 117
+ 0 1 2 0 140 0 0 1 0 0 24 1 1 0 0 0
+ 106 2 0 0 0 117 1 1 0 0 0 90 1 0 0 0
+ 80 1 0 0 0 91 1 0 0 0 78 1 0 0 0 88 1
+ 0 0 0 76 1 0 51 0 53 1 0 155 0 1 1 0
+ 113 0 115 1 0 13 0 14 1 0 0 116 1 1 0
+ 0 26 72 1 0 0 116 1 1 0 0 0 1 1 0 0
+ 26 72 1 0 48 0 50 0 0 117 1 1 0 0 0 1
+ 0 0 24 37 2 0 19 0 0 1 0 0 24 25 1 0
+ 0 0 95 2 0 0 0 0 122 1 0 0 0 83 2 0
+ 19 0 0 1 1 0 0 0 93 1 0 0 0 81 1 0 0
+ 0 98 1 0 0 0 86 1 0 0 0 96 1 0 0 0 84
+ 1 0 0 0 97 1 0 0 0 85 1 0 0 0 94 1 0
+ 0 0 82 1 0 0 0 121 0 0 0 23 0 0 0 44
+ 2 0 11 9 0 21 3 0 11 9 0 19 22 1 0 8
+ 0 18 2 0 8 0 19 20 1 0 0 0 109 1 0 0
+ 0 1 2 0 0 0 117 1 2 0 0 0 0 111 2 0
+ 19 0 0 58 2 0 19 0 0 55 2 0 19 0 0 66
+ 2 0 19 0 0 57 2 0 19 0 0 54 2 0 0 0
+ 26 67 2 0 0 0 0 45 2 0 0 0 0 61 1 0 0
+ 0 59 2 0 0 0 0 60 2 0 0 0 0 71 2 0 0
+ 0 116 153 2 0 0 0 26 70 2 0 0 0 117 1
+ 2 0 0 0 24 1 2 0 0 116 0 1 2 0 0 0
+ 116 1 2 0 0 0 0 62 2 0 0 26 0 63 2 0
+ 0 117 0 1 2 0 0 24 0 35)))))
'|lookupComplete|))
(MAKEPROP '|DoubleFloat| 'NILADIC T)
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index 038285e5..6ec84ec3 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -149,87 +149,98 @@
(PUT '|INT;<;2$B;35| '|SPADreplace| '<)
+(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Boolean|)
+ |INT;>;2$B;36|))
+
+(PUT '|INT;>;2$B;36| '|SPADreplace| '>)
+
+(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Boolean|)
+ |INT;<=;2$B;37|))
+
+(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Boolean|)
+ |INT;>=;2$B;38|))
+
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|)
- |INT;-;2$;36|))
+ |INT;-;2$;39|))
-(PUT '|INT;-;2$;36| '|SPADreplace| '-)
+(PUT '|INT;-;2$;39| '|SPADreplace| '-)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
- |INT;+;3$;37|))
+ |INT;+;3$;40|))
-(PUT '|INT;+;3$;37| '|SPADreplace| '+)
+(PUT '|INT;+;3$;40| '|SPADreplace| '+)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
- |INT;-;3$;38|))
+ |INT;-;3$;41|))
-(PUT '|INT;-;3$;38| '|SPADreplace| '-)
+(PUT '|INT;-;3$;41| '|SPADreplace| '-)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
- |INT;*;3$;39|))
+ |INT;*;3$;42|))
-(PUT '|INT;*;3$;39| '|SPADreplace| '*)
+(PUT '|INT;*;3$;42| '|SPADreplace| '*)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
- |INT;*;3$;40|))
+ |INT;*;3$;43|))
-(PUT '|INT;*;3$;40| '|SPADreplace| '*)
+(PUT '|INT;*;3$;43| '|SPADreplace| '*)
(DECLAIM (FTYPE (FUNCTION (|%Integer| (|%IntegerSection| 0) |%Shell|)
|%Integer|)
- |INT;**;$Nni$;41|))
+ |INT;**;$Nni$;44|))
-(PUT '|INT;**;$Nni$;41| '|SPADreplace| 'EXPT)
+(PUT '|INT;**;$Nni$;44| '|SPADreplace| 'EXPT)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Boolean|)
- |INT;odd?;$B;42|))
+ |INT;odd?;$B;45|))
-(PUT '|INT;odd?;$B;42| '|SPADreplace| 'ODDP)
+(PUT '|INT;odd?;$B;45| '|SPADreplace| 'ODDP)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
- |INT;max;3$;43|))
+ |INT;max;3$;46|))
-(PUT '|INT;max;3$;43| '|SPADreplace| 'MAX)
+(PUT '|INT;max;3$;46| '|SPADreplace| 'MAX)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
- |INT;min;3$;44|))
+ |INT;min;3$;47|))
-(PUT '|INT;min;3$;44| '|SPADreplace| 'MIN)
+(PUT '|INT;min;3$;47| '|SPADreplace| 'MIN)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Pair|)
- |INT;divide;2$R;45|))
+ |INT;divide;2$R;48|))
-(PUT '|INT;divide;2$R;45| '|SPADreplace| 'DIVIDE2)
+(PUT '|INT;divide;2$R;48| '|SPADreplace| 'DIVIDE2)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
- |INT;quo;3$;46|))
+ |INT;quo;3$;49|))
-(PUT '|INT;quo;3$;46| '|SPADreplace| 'QUOTIENT2)
+(PUT '|INT;quo;3$;49| '|SPADreplace| 'QUOTIENT2)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
- |INT;rem;3$;47|))
+ |INT;rem;3$;50|))
-(PUT '|INT;rem;3$;47| '|SPADreplace| 'REMAINDER2)
+(PUT '|INT;rem;3$;50| '|SPADreplace| 'REMAINDER2)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
- |INT;shift;3$;48|))
+ |INT;shift;3$;51|))
-(PUT '|INT;shift;3$;48| '|SPADreplace| 'ASH)
+(PUT '|INT;shift;3$;51| '|SPADreplace| 'ASH)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Pair|)
- |INT;recip;$U;49|))
+ |INT;recip;$U;52|))
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
- |INT;gcd;3$;50|))
+ |INT;gcd;3$;53|))
-(PUT '|INT;gcd;3$;50| '|SPADreplace| 'GCD)
+(PUT '|INT;gcd;3$;53| '|SPADreplace| 'GCD)
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Shell|)
- |INT;unitNormal;$R;51|))
+ |INT;unitNormal;$R;54|))
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|)
- |INT;unitCanonical;2$;52|))
+ |INT;unitCanonical;2$;55|))
-(PUT '|INT;unitCanonical;2$;52| '|SPADreplace| 'ABS)
+(PUT '|INT;unitCanonical;2$;55| '|SPADreplace| 'ABS)
(DECLAIM (FTYPE (FUNCTION (|%List| |%Thing| |%Shell|) |%Pair|)
|INT;solveLinearPolynomialEquation|))
@@ -244,7 +255,7 @@
|INT;factorSquareFreePolynomial|))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
- |INT;gcdPolynomial;3Sup;57|))
+ |INT;gcdPolynomial;3Sup;60|))
(DEFUN |INT;writeOMInt| (|dev| |x| $)
(SEQ (COND
@@ -398,107 +409,113 @@
(DEFUN |INT;<;2$B;35| (|x| |y| $) (DECLARE (IGNORE $)) (< |x| |y|))
-(DEFUN |INT;-;2$;36| (|x| $) (DECLARE (IGNORE $)) (- |x|))
+(DEFUN |INT;>;2$B;36| (|x| |y| $) (DECLARE (IGNORE $)) (> |x| |y|))
+
+(DEFUN |INT;<=;2$B;37| (|x| |y| $) (NOT (> |x| |y|)))
+
+(DEFUN |INT;>=;2$B;38| (|x| |y| $) (NOT (< |x| |y|)))
+
+(DEFUN |INT;-;2$;39| (|x| $) (DECLARE (IGNORE $)) (- |x|))
-(DEFUN |INT;+;3$;37| (|x| |y| $) (DECLARE (IGNORE $)) (+ |x| |y|))
+(DEFUN |INT;+;3$;40| (|x| |y| $) (DECLARE (IGNORE $)) (+ |x| |y|))
-(DEFUN |INT;-;3$;38| (|x| |y| $) (DECLARE (IGNORE $)) (- |x| |y|))
+(DEFUN |INT;-;3$;41| (|x| |y| $) (DECLARE (IGNORE $)) (- |x| |y|))
-(DEFUN |INT;*;3$;39| (|x| |y| $) (DECLARE (IGNORE $)) (* |x| |y|))
+(DEFUN |INT;*;3$;42| (|x| |y| $) (DECLARE (IGNORE $)) (* |x| |y|))
-(DEFUN |INT;*;3$;40| (|m| |y| $) (DECLARE (IGNORE $)) (* |m| |y|))
+(DEFUN |INT;*;3$;43| (|m| |y| $) (DECLARE (IGNORE $)) (* |m| |y|))
-(DEFUN |INT;**;$Nni$;41| (|x| |n| $)
+(DEFUN |INT;**;$Nni$;44| (|x| |n| $)
(DECLARE (IGNORE $))
(EXPT |x| |n|))
-(DEFUN |INT;odd?;$B;42| (|x| $) (DECLARE (IGNORE $)) (ODDP |x|))
+(DEFUN |INT;odd?;$B;45| (|x| $) (DECLARE (IGNORE $)) (ODDP |x|))
-(DEFUN |INT;max;3$;43| (|x| |y| $) (DECLARE (IGNORE $)) (MAX |x| |y|))
+(DEFUN |INT;max;3$;46| (|x| |y| $) (DECLARE (IGNORE $)) (MAX |x| |y|))
-(DEFUN |INT;min;3$;44| (|x| |y| $) (DECLARE (IGNORE $)) (MIN |x| |y|))
+(DEFUN |INT;min;3$;47| (|x| |y| $) (DECLARE (IGNORE $)) (MIN |x| |y|))
-(DEFUN |INT;divide;2$R;45| (|x| |y| $)
+(DEFUN |INT;divide;2$R;48| (|x| |y| $)
(DECLARE (IGNORE $))
(DIVIDE2 |x| |y|))
-(DEFUN |INT;quo;3$;46| (|x| |y| $)
+(DEFUN |INT;quo;3$;49| (|x| |y| $)
(DECLARE (IGNORE $))
(QUOTIENT2 |x| |y|))
-(DEFUN |INT;rem;3$;47| (|x| |y| $)
+(DEFUN |INT;rem;3$;50| (|x| |y| $)
(DECLARE (IGNORE $))
(REMAINDER2 |x| |y|))
-(DEFUN |INT;shift;3$;48| (|x| |y| $)
+(DEFUN |INT;shift;3$;51| (|x| |y| $)
(DECLARE (IGNORE $))
(ASH |x| |y|))
-(DEFUN |INT;recip;$U;49| (|x| $)
+(DEFUN |INT;recip;$U;52| (|x| $)
(COND
((OR (EQL |x| 1) (EQL |x| -1)) (CONS 0 |x|))
('T (CONS 1 "failed"))))
-(DEFUN |INT;gcd;3$;50| (|x| |y| $) (DECLARE (IGNORE $)) (GCD |x| |y|))
+(DEFUN |INT;gcd;3$;53| (|x| |y| $) (DECLARE (IGNORE $)) (GCD |x| |y|))
-(DEFUN |INT;unitNormal;$R;51| (|x| $)
+(DEFUN |INT;unitNormal;$R;54| (|x| $)
(COND ((< |x| 0) (VECTOR -1 (- |x|) -1)) ('T (VECTOR 1 |x| 1))))
-(DEFUN |INT;unitCanonical;2$;52| (|x| $)
+(DEFUN |INT;unitCanonical;2$;55| (|x| $)
(DECLARE (IGNORE $))
(ABS |x|))
(DEFUN |INT;solveLinearPolynomialEquation| (|lp| |p| $)
- (SPADCALL |lp| |p| (|getShellEntry| $ 99)))
+ (SPADCALL |lp| |p| (|getShellEntry| $ 103)))
(DEFUN |INT;squareFreePolynomial| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 103)))
+ (SPADCALL |p| (|getShellEntry| $ 107)))
(DEFUN |INT;factorPolynomial| (|p| $)
- (PROG (|pp| #0=#:G1498)
+ (PROG (|pp| #0=#:G1501)
(RETURN
- (SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 104))
+ (SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 108))
|INT;factorPolynomial|)
(EXIT (COND
- ((EQL (SPADCALL |pp| (|getShellEntry| $ 105))
- (SPADCALL |p| (|getShellEntry| $ 105)))
- (SPADCALL |p| (|getShellEntry| $ 107)))
+ ((EQL (SPADCALL |pp| (|getShellEntry| $ 109))
+ (SPADCALL |p| (|getShellEntry| $ 109)))
+ (SPADCALL |p| (|getShellEntry| $ 111)))
('T
- (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 107))
+ (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 111))
(SPADCALL (CONS #'|INT;factorPolynomial!0| $)
(SPADCALL
(PROG2 (LETT #0#
(SPADCALL
(SPADCALL |p|
- (|getShellEntry| $ 105))
+ (|getShellEntry| $ 109))
(SPADCALL |pp|
- (|getShellEntry| $ 105))
- (|getShellEntry| $ 109))
+ (|getShellEntry| $ 109))
+ (|getShellEntry| $ 113))
|INT;factorPolynomial|)
(QCDR #0#)
(|check-union| (QEQCAR #0# 0) $ #0#))
- (|getShellEntry| $ 111))
- (|getShellEntry| $ 115))
- (|getShellEntry| $ 117)))))))))
+ (|getShellEntry| $ 115))
+ (|getShellEntry| $ 119))
+ (|getShellEntry| $ 121)))))))))
(DEFUN |INT;factorPolynomial!0| (|#1| $)
- (SPADCALL |#1| (|getShellEntry| $ 108)))
+ (SPADCALL |#1| (|getShellEntry| $ 112)))
(DEFUN |INT;factorSquareFreePolynomial| (|p| $)
- (SPADCALL |p| (|getShellEntry| $ 118)))
+ (SPADCALL |p| (|getShellEntry| $ 122)))
-(DEFUN |INT;gcdPolynomial;3Sup;57| (|p| |q| $)
+(DEFUN |INT;gcdPolynomial;3Sup;60| (|p| |q| $)
(COND
- ((SPADCALL |p| (|getShellEntry| $ 119))
- (SPADCALL |q| (|getShellEntry| $ 120)))
- ((SPADCALL |q| (|getShellEntry| $ 119))
- (SPADCALL |p| (|getShellEntry| $ 120)))
- ('T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 123)))))
+ ((SPADCALL |p| (|getShellEntry| $ 123))
+ (SPADCALL |q| (|getShellEntry| $ 124)))
+ ((SPADCALL |q| (|getShellEntry| $ 123))
+ (SPADCALL |p| (|getShellEntry| $ 124)))
+ ('T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 127)))))
(DEFUN |Integer| ()
(PROG ()
(RETURN
- (PROG (#0=#:G1523)
+ (PROG (#0=#:G1526)
(RETURN
(COND
((LETT #0# (HGET |$ConstructorCache| '|Integer|) |Integer|)
@@ -517,15 +534,15 @@
(RETURN
(PROGN
(LETT |dv$| '(|Integer|) . #0=(|Integer|))
- (LETT $ (|newShell| 138) . #0#)
+ (LETT $ (|newShell| 142) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
(|haddProp| |$ConstructorCache| '|Integer| NIL (CONS 1 $))
(|stuffDomainSlots| $)
- (|setShellEntry| $ 80
+ (|setShellEntry| $ 84
(|setShellEntry| $ 52
- (CONS (|dispatchFunction| |INT;*;3$;40|) $)))
+ (CONS (|dispatchFunction| |INT;*;3$;43|) $)))
$))))
(MAKEPROP '|Integer| '|infovec|
@@ -535,7 +552,7 @@
(|NonNegativeInteger|) (0 . |Zero|) (|Boolean|)
|INT;<;2$B;35| (|Void|) (|OpenMathDevice|)
(4 . |OMputApp|) (|String|) (9 . |OMputSymbol|)
- |INT;-;2$;36| (|Integer|) (16 . |OMputInteger|)
+ |INT;-;2$;39| (|Integer|) (16 . |OMputInteger|)
(22 . |OMputEndApp|) (|OpenMathEncoding|)
(27 . |OMencodingXML|) (31 . |OMopenString|)
(37 . |OMputObject|) (42 . |OMputEndObject|)
@@ -545,12 +562,12 @@
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |INT;One;$;9|) $))
(52 . |One|) |INT;=;2$B;34| |INT;one?;$B;7|
- |INT;base;$;10| |INT;copy;2$;11| |INT;+;3$;37|
- |INT;inc;2$;12| |INT;-;3$;38| |INT;dec;2$;13|
+ |INT;base;$;10| |INT;copy;2$;11| |INT;+;3$;40|
+ |INT;inc;2$;12| |INT;-;3$;41| |INT;dec;2$;13|
(|SingleInteger|) |INT;hash;$Si;14| |INT;negative?;$B;15|
(|OutputForm|) (56 . |outputForm|) |INT;coerce;$Of;16|
|INT;coerce;2$;17| |INT;convert;2$;18| |INT;length;2$;19|
- |INT;addmod;4$;20| |INT;submod;4$;21| NIL |INT;rem;3$;47|
+ |INT;addmod;4$;20| |INT;submod;4$;21| NIL |INT;rem;3$;50|
|INT;mulmod;4$;22| (|Float|) (61 . |coerce|)
|INT;convert;$F;23| (|DoubleFloat|) (66 . |coerce|)
|INT;convert;$Df;24| (|InputForm|) (71 . |convert|)
@@ -560,61 +577,63 @@
|INT;reducedSystem;2M;29| (|Vector| 17)
(|Record| (|:| |mat| 70) (|:| |vec| 73)) (|Vector| $)
|INT;reducedSystem;MVR;30| |INT;abs;2$;31|
- |INT;random;$;32| |INT;random;2$;33| NIL |INT;**;$Nni$;41|
- |INT;odd?;$B;42| |INT;max;3$;43| |INT;min;3$;44|
+ |INT;random;$;32| |INT;random;2$;33| |INT;>;2$B;36|
+ (93 . |not|) |INT;<=;2$B;37| |INT;>=;2$B;38| NIL
+ |INT;**;$Nni$;44| |INT;odd?;$B;45| |INT;max;3$;46|
+ |INT;min;3$;47|
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- |INT;divide;2$R;45| |INT;quo;3$;46| |INT;shift;3$;48|
- (|Union| $ '"failed") |INT;recip;$U;49| |INT;gcd;3$;50|
+ |INT;divide;2$R;48| |INT;quo;3$;49| |INT;shift;3$;51|
+ (|Union| $ '"failed") |INT;recip;$U;52| |INT;gcd;3$;53|
(|Record| (|:| |unit| $) (|:| |canonical| $)
- (|:| |associate| $))
- |INT;unitNormal;$R;51| |INT;unitCanonical;2$;52|
- (|SparseUnivariatePolynomial| 17) (|List| 95)
- (|Union| 96 '"failed")
+ (|:| |associate| $))
+ |INT;unitNormal;$R;54| |INT;unitCanonical;2$;55|
+ (|SparseUnivariatePolynomial| 17) (|List| 99)
+ (|Union| 100 '"failed")
(|IntegerSolveLinearPolynomialEquation|)
- (93 . |solveLinearPolynomialEquation|)
- (|SparseUnivariatePolynomial| $$) (|Factored| 100)
- (|UnivariatePolynomialSquareFree| $$ 100)
- (99 . |squareFree|) (104 . |primitivePart|)
- (109 . |leadingCoefficient|) (|GaloisGroupFactorizer| 100)
- (114 . |factor|) (119 . |coerce|) (124 . |exquo|)
- (|Factored| $) (130 . |factor|) (|Mapping| 100 $$)
- (|Factored| $$) (|FactoredFunctions2| $$ 100)
- (135 . |map|) (|FactoredFunctionUtilities| 100)
- (141 . |mergeFactors|) (147 . |factorSquareFree|)
- (152 . |zero?|) (157 . |unitCanonical|) (|List| 100)
- (|HeuGcd| 100) (162 . |gcd|)
+ (98 . |solveLinearPolynomialEquation|)
+ (|SparseUnivariatePolynomial| $$) (|Factored| 104)
+ (|UnivariatePolynomialSquareFree| $$ 104)
+ (104 . |squareFree|) (109 . |primitivePart|)
+ (114 . |leadingCoefficient|) (|GaloisGroupFactorizer| 104)
+ (119 . |factor|) (124 . |coerce|) (129 . |exquo|)
+ (|Factored| $) (135 . |factor|) (|Mapping| 104 $$)
+ (|Factored| $$) (|FactoredFunctions2| $$ 104)
+ (140 . |map|) (|FactoredFunctionUtilities| 104)
+ (146 . |mergeFactors|) (152 . |factorSquareFree|)
+ (157 . |zero?|) (162 . |unitCanonical|) (|List| 104)
+ (|HeuGcd| 104) (167 . |gcd|)
(|SparseUnivariatePolynomial| $)
- |INT;gcdPolynomial;3Sup;57| (|Fraction| 17)
- (|Union| 126 '"failed") (|PatternMatchResult| 17 $)
+ |INT;gcdPolynomial;3Sup;60| (|Fraction| 17)
+ (|Union| 130 '"failed") (|PatternMatchResult| 17 $)
(|Pattern| 17) (|Union| 17 '"failed") (|List| $)
- (|Union| 131 '"failed")
- (|Record| (|:| |coef| 131) (|:| |generator| $))
+ (|Union| 135 '"failed")
+ (|Record| (|:| |coef| 135) (|:| |generator| $))
(|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 134 '"failed")
+ (|Union| 138 '"failed")
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
(|PositiveInteger|))
- '#(~= 167 |zero?| 173 |unitNormal| 178 |unitCanonical| 183
- |unit?| 188 |symmetricRemainder| 193 |subtractIfCan| 199
- |submod| 205 |squareFreePart| 212 |squareFree| 217
- |sizeLess?| 222 |sign| 228 |shift| 233 |sample| 239
- |retractIfCan| 243 |retract| 248 |rem| 253 |reducedSystem|
- 259 |recip| 270 |rationalIfCan| 275 |rational?| 280
- |rational| 285 |random| 290 |quo| 299 |principalIdeal| 305
- |prime?| 310 |powmod| 315 |positiveRemainder| 322
- |positive?| 328 |permutation| 333 |patternMatch| 339
- |one?| 346 |odd?| 351 |nextItem| 356 |negative?| 361
- |multiEuclidean| 366 |mulmod| 372 |min| 379 |max| 385
- |mask| 391 |length| 396 |lcm| 401 |latex| 412 |invmod| 417
- |init| 423 |inc| 427 |hash| 432 |gcdPolynomial| 437 |gcd|
- 443 |factorial| 454 |factor| 459 |extendedEuclidean| 464
- |exquo| 477 |expressIdealMember| 483 |even?| 489
- |euclideanSize| 494 |divide| 499 |differentiate| 505 |dec|
- 516 |copy| 521 |convert| 526 |coerce| 556 |characteristic|
- 576 |bit?| 580 |binomial| 586 |before?| 592 |base| 598
- |associates?| 602 |addmod| 608 |abs| 615 |Zero| 620 |One|
- 624 |OMwrite| 628 D 652 >= 663 > 669 = 675 <= 681 < 687 -
- 693 + 704 ** 710 * 722)
+ '#(~= 172 |zero?| 178 |unitNormal| 183 |unitCanonical| 188
+ |unit?| 193 |symmetricRemainder| 198 |subtractIfCan| 204
+ |submod| 210 |squareFreePart| 217 |squareFree| 222
+ |sizeLess?| 227 |sign| 233 |shift| 238 |sample| 244
+ |retractIfCan| 248 |retract| 253 |rem| 258 |reducedSystem|
+ 264 |recip| 275 |rationalIfCan| 280 |rational?| 285
+ |rational| 290 |random| 295 |quo| 304 |principalIdeal| 310
+ |prime?| 315 |powmod| 320 |positiveRemainder| 327
+ |positive?| 333 |permutation| 338 |patternMatch| 344
+ |one?| 351 |odd?| 356 |nextItem| 361 |negative?| 366
+ |multiEuclidean| 371 |mulmod| 377 |min| 384 |max| 390
+ |mask| 396 |length| 401 |lcm| 406 |latex| 417 |invmod| 422
+ |init| 428 |inc| 432 |hash| 437 |gcdPolynomial| 442 |gcd|
+ 448 |factorial| 459 |factor| 464 |extendedEuclidean| 469
+ |exquo| 482 |expressIdealMember| 488 |even?| 494
+ |euclideanSize| 499 |divide| 504 |differentiate| 510 |dec|
+ 521 |copy| 526 |convert| 531 |coerce| 561 |characteristic|
+ 581 |bit?| 585 |binomial| 591 |before?| 597 |base| 603
+ |associates?| 607 |addmod| 613 |abs| 620 |Zero| 625 |One|
+ 629 |OMwrite| 633 D 657 >= 668 > 674 = 680 <= 686 < 692 -
+ 698 + 709 ** 715 * 727)
'((|infinite| . 0) (|noetherian| . 0)
(|canonicalsClosed| . 0) (|canonical| . 0)
(|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0)
@@ -667,61 +686,61 @@
(|ConvertibleTo| 55)
(|ConvertibleTo| 58)
(|CombinatorialFunctionCategory|)
- (|ConvertibleTo| 129)
+ (|ConvertibleTo| 133)
(|ConvertibleTo| 61)
(|ConvertibleTo| 17)
(|CoercibleFrom| $$)
(|CoercibleFrom| 17) (|BasicType|)
(|CoercibleTo| 44))
- (|makeByteWordVec2| 137
+ (|makeByteWordVec2| 141
'(0 7 0 8 1 12 11 0 13 3 12 11 0 14 14
15 2 12 11 0 17 18 1 12 11 0 19 0 20
0 21 2 12 0 14 20 22 1 12 11 0 23 1
12 11 0 24 1 12 11 0 25 0 7 0 32 1 44
0 17 45 1 55 0 17 56 1 58 0 17 59 1
61 0 17 62 1 14 0 17 64 2 17 9 0 0 66
- 2 14 0 0 0 67 2 98 97 96 95 99 1 102
- 101 100 103 1 100 0 0 104 1 100 2 0
- 105 1 106 101 100 107 1 100 0 2 108 2
- 0 89 0 0 109 1 0 110 0 111 2 114 101
- 112 113 115 2 116 101 101 101 117 1
- 106 101 100 118 1 100 9 0 119 1 100 0
- 0 120 1 122 100 121 123 2 0 9 0 0 1 1
- 0 9 0 30 1 0 92 0 93 1 0 0 0 94 1 0 9
- 0 1 2 0 0 0 0 1 2 0 89 0 0 1 3 0 0 0
- 0 0 51 1 0 0 0 1 1 0 110 0 1 2 0 9 0
- 0 1 1 0 17 0 1 2 0 0 0 0 88 0 0 0 1 1
- 0 130 0 1 1 0 17 0 1 2 0 0 0 0 53 2 0
- 74 71 75 76 1 0 70 71 72 1 0 89 0 90
- 1 0 127 0 1 1 0 9 0 1 1 0 126 0 1 0 0
- 0 78 1 0 0 0 79 2 0 0 0 0 87 1 0 133
- 131 1 1 0 9 0 1 3 0 0 0 0 0 1 2 0 0 0
- 0 69 1 0 9 0 1 2 0 0 0 0 1 3 0 128 0
- 129 128 1 1 0 9 0 34 1 0 9 0 82 1 0
- 89 0 1 1 0 9 0 43 2 0 132 131 0 1 3 0
- 0 0 0 0 54 2 0 0 0 0 84 2 0 0 0 0 83
- 1 0 0 0 1 1 0 0 0 49 1 0 0 131 1 2 0
- 0 0 0 1 1 0 14 0 68 2 0 0 0 0 1 0 0 0
- 1 1 0 0 0 38 1 0 41 0 42 2 0 124 124
- 124 125 1 0 0 131 1 2 0 0 0 0 91 1 0
- 0 0 1 1 0 110 0 111 3 0 135 0 0 0 1 2
- 0 136 0 0 1 2 0 89 0 0 109 2 0 132
- 131 0 1 1 0 9 0 1 1 0 7 0 1 2 0 85 0
- 0 86 1 0 0 0 1 2 0 0 0 7 1 1 0 0 0 40
- 1 0 0 0 36 1 0 14 0 65 1 0 58 0 60 1
- 0 55 0 57 1 0 61 0 63 1 0 129 0 1 1 0
- 17 0 48 1 0 0 17 47 1 0 0 0 1 1 0 0
- 17 47 1 0 44 0 46 0 0 7 1 2 0 9 0 0 1
- 2 0 0 0 0 1 2 0 9 0 0 1 0 0 0 35 2 0
- 9 0 0 1 3 0 0 0 0 0 50 1 0 0 0 77 0 0
- 0 6 0 0 0 31 3 0 11 12 0 9 29 2 0 14
- 0 9 27 2 0 11 12 0 28 1 0 14 0 26 1 0
- 0 0 1 2 0 0 0 7 1 2 0 9 0 0 1 2 0 9 0
- 0 1 2 0 9 0 0 33 2 0 9 0 0 1 2 0 9 0
- 0 10 1 0 0 0 16 2 0 0 0 0 39 2 0 0 0
- 0 37 2 0 0 0 7 81 2 0 0 0 137 1 2 0 0
- 0 0 52 2 0 0 17 0 80 2 0 0 7 0 1 2 0
- 0 137 0 1)))))
+ 2 14 0 0 0 67 1 9 0 0 81 2 102 101
+ 100 99 103 1 106 105 104 107 1 104 0
+ 0 108 1 104 2 0 109 1 110 105 104 111
+ 1 104 0 2 112 2 0 93 0 0 113 1 0 114
+ 0 115 2 118 105 116 117 119 2 120 105
+ 105 105 121 1 110 105 104 122 1 104 9
+ 0 123 1 104 0 0 124 1 126 104 125 127
+ 2 0 9 0 0 1 1 0 9 0 30 1 0 96 0 97 1
+ 0 0 0 98 1 0 9 0 1 2 0 0 0 0 1 2 0 93
+ 0 0 1 3 0 0 0 0 0 51 1 0 0 0 1 1 0
+ 114 0 1 2 0 9 0 0 1 1 0 17 0 1 2 0 0
+ 0 0 92 0 0 0 1 1 0 134 0 1 1 0 17 0 1
+ 2 0 0 0 0 53 2 0 74 71 75 76 1 0 70
+ 71 72 1 0 93 0 94 1 0 131 0 1 1 0 9 0
+ 1 1 0 130 0 1 0 0 0 78 1 0 0 0 79 2 0
+ 0 0 0 91 1 0 137 135 1 1 0 9 0 1 3 0
+ 0 0 0 0 1 2 0 0 0 0 69 1 0 9 0 1 2 0
+ 0 0 0 1 3 0 132 0 133 132 1 1 0 9 0
+ 34 1 0 9 0 86 1 0 93 0 1 1 0 9 0 43 2
+ 0 136 135 0 1 3 0 0 0 0 0 54 2 0 0 0
+ 0 88 2 0 0 0 0 87 1 0 0 0 1 1 0 0 0
+ 49 1 0 0 135 1 2 0 0 0 0 1 1 0 14 0
+ 68 2 0 0 0 0 1 0 0 0 1 1 0 0 0 38 1 0
+ 41 0 42 2 0 128 128 128 129 1 0 0 135
+ 1 2 0 0 0 0 95 1 0 0 0 1 1 0 114 0
+ 115 3 0 139 0 0 0 1 2 0 140 0 0 1 2 0
+ 93 0 0 113 2 0 136 135 0 1 1 0 9 0 1
+ 1 0 7 0 1 2 0 89 0 0 90 1 0 0 0 1 2 0
+ 0 0 7 1 1 0 0 0 40 1 0 0 0 36 1 0 14
+ 0 65 1 0 58 0 60 1 0 55 0 57 1 0 61 0
+ 63 1 0 133 0 1 1 0 17 0 48 1 0 0 17
+ 47 1 0 0 0 1 1 0 0 17 47 1 0 44 0 46
+ 0 0 7 1 2 0 9 0 0 1 2 0 0 0 0 1 2 0 9
+ 0 0 1 0 0 0 35 2 0 9 0 0 1 3 0 0 0 0
+ 0 50 1 0 0 0 77 0 0 0 6 0 0 0 31 3 0
+ 11 12 0 9 29 2 0 14 0 9 27 2 0 11 12
+ 0 28 1 0 14 0 26 1 0 0 0 1 2 0 0 0 7
+ 1 2 0 9 0 0 83 2 0 9 0 0 80 2 0 9 0 0
+ 33 2 0 9 0 0 82 2 0 9 0 0 10 1 0 0 0
+ 16 2 0 0 0 0 39 2 0 0 0 0 37 2 0 0 0
+ 7 85 2 0 0 0 141 1 2 0 0 0 0 52 2 0 0
+ 17 0 84 2 0 0 7 0 1 2 0 0 141 0 1)))))
'|lookupComplete|))
(MAKEPROP '|Integer| 'NILADIC T)
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index cf309a77..591a5604 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -104,154 +104,165 @@
(PUT '|SINT;<;2$B;24| '|SPADreplace| 'QSLESSP)
+(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|)
+ |SINT;>;2$B;25|))
+
+(PUT '|SINT;>;2$B;25| '|SPADreplace| 'QSGREATERP)
+
+(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|)
+ |SINT;<=;2$B;26|))
+
+(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|)
+ |SINT;>=;2$B;27|))
+
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
- |SINT;inc;2$;25|))
+ |SINT;inc;2$;28|))
-(PUT '|SINT;inc;2$;25| '|SPADreplace| 'QSADD1)
+(PUT '|SINT;inc;2$;28| '|SPADreplace| 'QSADD1)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
- |SINT;dec;2$;26|))
+ |SINT;dec;2$;29|))
-(PUT '|SINT;dec;2$;26| '|SPADreplace| 'QSSUB1)
+(PUT '|SINT;dec;2$;29| '|SPADreplace| 'QSSUB1)
-(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;-;2$;27|))
+(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;-;2$;30|))
-(PUT '|SINT;-;2$;27| '|SPADreplace| 'QSMINUS)
+(PUT '|SINT;-;2$;30| '|SPADreplace| 'QSMINUS)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
- |SINT;+;3$;28|))
+ |SINT;+;3$;31|))
-(PUT '|SINT;+;3$;28| '|SPADreplace| 'QSPLUS)
+(PUT '|SINT;+;3$;31| '|SPADreplace| 'QSPLUS)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
- |SINT;-;3$;29|))
+ |SINT;-;3$;32|))
-(PUT '|SINT;-;3$;29| '|SPADreplace| 'QSDIFFERENCE)
+(PUT '|SINT;-;3$;32| '|SPADreplace| 'QSDIFFERENCE)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
- |SINT;*;3$;30|))
+ |SINT;*;3$;33|))
-(PUT '|SINT;*;3$;30| '|SPADreplace| 'QSTIMES)
+(PUT '|SINT;*;3$;33| '|SPADreplace| 'QSTIMES)
(DECLAIM (FTYPE (FUNCTION (|%Short| (|%IntegerSection| 0) |%Shell|)
|%Short|)
- |SINT;**;$Nni$;31|))
+ |SINT;**;$Nni$;34|))
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
- |SINT;quo;3$;32|))
+ |SINT;quo;3$;35|))
-(PUT '|SINT;quo;3$;32| '|SPADreplace| 'QSQUOTIENT)
+(PUT '|SINT;quo;3$;35| '|SPADreplace| 'QSQUOTIENT)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
- |SINT;rem;3$;33|))
+ |SINT;rem;3$;36|))
-(PUT '|SINT;rem;3$;33| '|SPADreplace| 'QSREMAINDER)
+(PUT '|SINT;rem;3$;36| '|SPADreplace| 'QSREMAINDER)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Pair|)
- |SINT;divide;2$R;34|))
+ |SINT;divide;2$R;37|))
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
- |SINT;gcd;3$;35|))
+ |SINT;gcd;3$;38|))
-(PUT '|SINT;gcd;3$;35| '|SPADreplace| 'GCD)
+(PUT '|SINT;gcd;3$;38| '|SPADreplace| 'GCD)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
- |SINT;abs;2$;36|))
+ |SINT;abs;2$;39|))
-(PUT '|SINT;abs;2$;36| '|SPADreplace| 'QSABSVAL)
+(PUT '|SINT;abs;2$;39| '|SPADreplace| 'QSABSVAL)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
- |SINT;odd?;$B;37|))
+ |SINT;odd?;$B;40|))
-(PUT '|SINT;odd?;$B;37| '|SPADreplace| 'QSODDP)
+(PUT '|SINT;odd?;$B;40| '|SPADreplace| 'QSODDP)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
- |SINT;zero?;$B;38|))
+ |SINT;zero?;$B;41|))
-(PUT '|SINT;zero?;$B;38| '|SPADreplace| 'QSZEROP)
+(PUT '|SINT;zero?;$B;41| '|SPADreplace| 'QSZEROP)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
- |SINT;one?;$B;39|))
+ |SINT;one?;$B;42|))
-(PUT '|SINT;one?;$B;39| '|SPADreplace| '(XLAM (|x|) (EQL |x| 1)))
+(PUT '|SINT;one?;$B;42| '|SPADreplace| '(XLAM (|x|) (EQL |x| 1)))
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
- |SINT;max;3$;40|))
+ |SINT;max;3$;43|))
-(PUT '|SINT;max;3$;40| '|SPADreplace| 'QSMAX)
+(PUT '|SINT;max;3$;43| '|SPADreplace| 'QSMAX)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
- |SINT;min;3$;41|))
+ |SINT;min;3$;44|))
-(PUT '|SINT;min;3$;41| '|SPADreplace| 'QSMIN)
+(PUT '|SINT;min;3$;44| '|SPADreplace| 'QSMIN)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
- |SINT;hash;2$;42|))
+ |SINT;hash;2$;45|))
-(PUT '|SINT;hash;2$;42| '|SPADreplace| 'HASHEQ)
+(PUT '|SINT;hash;2$;45| '|SPADreplace| 'HASHEQ)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
- |SINT;length;2$;43|))
+ |SINT;length;2$;46|))
-(PUT '|SINT;length;2$;43| '|SPADreplace| 'INTEGER-LENGTH)
+(PUT '|SINT;length;2$;46| '|SPADreplace| 'INTEGER-LENGTH)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
- |SINT;shift;3$;44|))
+ |SINT;shift;3$;47|))
-(PUT '|SINT;shift;3$;44| '|SPADreplace| 'QSLEFTSHIFT)
+(PUT '|SINT;shift;3$;47| '|SPADreplace| 'QSLEFTSHIFT)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Short| |%Shell|)
|%Short|)
- |SINT;mulmod;4$;45|))
+ |SINT;mulmod;4$;48|))
-(PUT '|SINT;mulmod;4$;45| '|SPADreplace| 'QSMULTMOD)
+(PUT '|SINT;mulmod;4$;48| '|SPADreplace| 'QSMULTMOD)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Short| |%Shell|)
|%Short|)
- |SINT;addmod;4$;46|))
+ |SINT;addmod;4$;49|))
-(PUT '|SINT;addmod;4$;46| '|SPADreplace| 'QSADDMOD)
+(PUT '|SINT;addmod;4$;49| '|SPADreplace| 'QSADDMOD)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Short| |%Shell|)
|%Short|)
- |SINT;submod;4$;47|))
+ |SINT;submod;4$;50|))
-(PUT '|SINT;submod;4$;47| '|SPADreplace| 'QSDIFMOD)
+(PUT '|SINT;submod;4$;50| '|SPADreplace| 'QSDIFMOD)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
- |SINT;negative?;$B;48|))
+ |SINT;negative?;$B;51|))
-(PUT '|SINT;negative?;$B;48| '|SPADreplace| 'QSMINUSP)
+(PUT '|SINT;negative?;$B;51| '|SPADreplace| 'QSMINUSP)
(DECLAIM (FTYPE (FUNCTION (|%Shell|) (|%IntegerSection| 0))
- |SINT;size;Nni;49|))
+ |SINT;size;Nni;52|))
(DECLAIM (FTYPE (FUNCTION ((|%IntegerSection| 1) |%Shell|) |%Short|)
- |SINT;index;Pi$;50|))
+ |SINT;index;Pi$;53|))
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) (|%IntegerSection| 1))
- |SINT;lookup;$Pi;51|))
+ |SINT;lookup;$Pi;54|))
(DECLAIM (FTYPE (FUNCTION (|%Thing| (|%Vector| *) |%Shell|) |%Pair|)
- |SINT;reducedSystem;MVR;52|))
+ |SINT;reducedSystem;MVR;55|))
-(PUT '|SINT;reducedSystem;MVR;52| '|SPADreplace| 'CONS)
+(PUT '|SINT;reducedSystem;MVR;55| '|SPADreplace| 'CONS)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
- |SINT;positiveRemainder;3$;53|))
+ |SINT;positiveRemainder;3$;56|))
(DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Short|)
- |SINT;coerce;I$;54|))
+ |SINT;coerce;I$;57|))
-(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Short|) |SINT;random;$;55|))
+(DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Short|) |SINT;random;$;58|))
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
- |SINT;random;2$;56|))
+ |SINT;random;2$;59|))
-(PUT '|SINT;random;2$;56| '|SPADreplace| 'RANDOM)
+(PUT '|SINT;random;2$;59| '|SPADreplace| 'RANDOM)
(DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Shell|)
- |SINT;unitNormal;$R;57|))
+ |SINT;unitNormal;$R;60|))
(DEFUN |SINT;writeOMSingleInt| (|dev| |x| $)
(SEQ (COND
@@ -358,105 +369,113 @@
(DECLARE (IGNORE $))
(QSLESSP |x| |y|))
-(DEFUN |SINT;inc;2$;25| (|x| $) (DECLARE (IGNORE $)) (QSADD1 |x|))
+(DEFUN |SINT;>;2$B;25| (|x| |y| $)
+ (DECLARE (IGNORE $))
+ (QSGREATERP |x| |y|))
+
+(DEFUN |SINT;<=;2$B;26| (|x| |y| $) (NOT (> |x| |y|)))
+
+(DEFUN |SINT;>=;2$B;27| (|x| |y| $) (NOT (< |x| |y|)))
-(DEFUN |SINT;dec;2$;26| (|x| $) (DECLARE (IGNORE $)) (QSSUB1 |x|))
+(DEFUN |SINT;inc;2$;28| (|x| $) (DECLARE (IGNORE $)) (QSADD1 |x|))
-(DEFUN |SINT;-;2$;27| (|x| $) (DECLARE (IGNORE $)) (QSMINUS |x|))
+(DEFUN |SINT;dec;2$;29| (|x| $) (DECLARE (IGNORE $)) (QSSUB1 |x|))
-(DEFUN |SINT;+;3$;28| (|x| |y| $)
+(DEFUN |SINT;-;2$;30| (|x| $) (DECLARE (IGNORE $)) (QSMINUS |x|))
+
+(DEFUN |SINT;+;3$;31| (|x| |y| $)
(DECLARE (IGNORE $))
(QSPLUS |x| |y|))
-(DEFUN |SINT;-;3$;29| (|x| |y| $)
+(DEFUN |SINT;-;3$;32| (|x| |y| $)
(DECLARE (IGNORE $))
(QSDIFFERENCE |x| |y|))
-(DEFUN |SINT;*;3$;30| (|x| |y| $)
+(DEFUN |SINT;*;3$;33| (|x| |y| $)
(DECLARE (IGNORE $))
(QSTIMES |x| |y|))
-(DEFUN |SINT;**;$Nni$;31| (|x| |n| $)
+(DEFUN |SINT;**;$Nni$;34| (|x| |n| $)
(SPADCALL (EXPT |x| |n|) (|getShellEntry| $ 36)))
-(DEFUN |SINT;quo;3$;32| (|x| |y| $)
+(DEFUN |SINT;quo;3$;35| (|x| |y| $)
(DECLARE (IGNORE $))
(QSQUOTIENT |x| |y|))
-(DEFUN |SINT;rem;3$;33| (|x| |y| $)
+(DEFUN |SINT;rem;3$;36| (|x| |y| $)
(DECLARE (IGNORE $))
(QSREMAINDER |x| |y|))
-(DEFUN |SINT;divide;2$R;34| (|x| |y| $)
+(DEFUN |SINT;divide;2$R;37| (|x| |y| $)
(CONS (QSQUOTIENT |x| |y|) (QSREMAINDER |x| |y|)))
-(DEFUN |SINT;gcd;3$;35| (|x| |y| $)
+(DEFUN |SINT;gcd;3$;38| (|x| |y| $)
(DECLARE (IGNORE $))
(GCD |x| |y|))
-(DEFUN |SINT;abs;2$;36| (|x| $) (DECLARE (IGNORE $)) (QSABSVAL |x|))
+(DEFUN |SINT;abs;2$;39| (|x| $) (DECLARE (IGNORE $)) (QSABSVAL |x|))
-(DEFUN |SINT;odd?;$B;37| (|x| $) (DECLARE (IGNORE $)) (QSODDP |x|))
+(DEFUN |SINT;odd?;$B;40| (|x| $) (DECLARE (IGNORE $)) (QSODDP |x|))
-(DEFUN |SINT;zero?;$B;38| (|x| $) (DECLARE (IGNORE $)) (QSZEROP |x|))
+(DEFUN |SINT;zero?;$B;41| (|x| $) (DECLARE (IGNORE $)) (QSZEROP |x|))
-(DEFUN |SINT;one?;$B;39| (|x| $) (DECLARE (IGNORE $)) (EQL |x| 1))
+(DEFUN |SINT;one?;$B;42| (|x| $) (DECLARE (IGNORE $)) (EQL |x| 1))
-(DEFUN |SINT;max;3$;40| (|x| |y| $)
+(DEFUN |SINT;max;3$;43| (|x| |y| $)
(DECLARE (IGNORE $))
(QSMAX |x| |y|))
-(DEFUN |SINT;min;3$;41| (|x| |y| $)
+(DEFUN |SINT;min;3$;44| (|x| |y| $)
(DECLARE (IGNORE $))
(QSMIN |x| |y|))
-(DEFUN |SINT;hash;2$;42| (|x| $) (DECLARE (IGNORE $)) (HASHEQ |x|))
+(DEFUN |SINT;hash;2$;45| (|x| $) (DECLARE (IGNORE $)) (HASHEQ |x|))
-(DEFUN |SINT;length;2$;43| (|x| $)
+(DEFUN |SINT;length;2$;46| (|x| $)
(DECLARE (IGNORE $))
(INTEGER-LENGTH |x|))
-(DEFUN |SINT;shift;3$;44| (|x| |n| $)
+(DEFUN |SINT;shift;3$;47| (|x| |n| $)
(DECLARE (IGNORE $))
(QSLEFTSHIFT |x| |n|))
-(DEFUN |SINT;mulmod;4$;45| (|a| |b| |p| $)
+(DEFUN |SINT;mulmod;4$;48| (|a| |b| |p| $)
(DECLARE (IGNORE $))
(QSMULTMOD |a| |b| |p|))
-(DEFUN |SINT;addmod;4$;46| (|a| |b| |p| $)
+(DEFUN |SINT;addmod;4$;49| (|a| |b| |p| $)
(DECLARE (IGNORE $))
(QSADDMOD |a| |b| |p|))
-(DEFUN |SINT;submod;4$;47| (|a| |b| |p| $)
+(DEFUN |SINT;submod;4$;50| (|a| |b| |p| $)
(DECLARE (IGNORE $))
(QSDIFMOD |a| |b| |p|))
-(DEFUN |SINT;negative?;$B;48| (|x| $)
+(DEFUN |SINT;negative?;$B;51| (|x| $)
(DECLARE (IGNORE $))
(QSMINUSP |x|))
-(DEFUN |SINT;size;Nni;49| ($)
+(DEFUN |SINT;size;Nni;52| ($)
(+ (- |$ShortMaximum| |$ShortMinimum|) 1))
-(DEFUN |SINT;index;Pi$;50| (|i| $)
- (PROG (#0=#:G1456)
+(DEFUN |SINT;index;Pi$;53| (|i| $)
+ (PROG (#0=#:G1459)
(RETURN
(PROG1 (LETT #0# (- (+ |i| |$ShortMinimum|) 1)
- |SINT;index;Pi$;50|)
+ |SINT;index;Pi$;53|)
(|check-subtype| (SMINTP #0#) '(|SingleInteger|) #0#)))))
-(DEFUN |SINT;lookup;$Pi;51| (|x| $) (+ (- |x| |$ShortMinimum|) 1))
+(DEFUN |SINT;lookup;$Pi;54| (|x| $) (+ (- |x| |$ShortMinimum|) 1))
-(DEFUN |SINT;reducedSystem;MVR;52| (|m| |v| $)
+(DEFUN |SINT;reducedSystem;MVR;55| (|m| |v| $)
(DECLARE (IGNORE $))
(CONS |m| |v|))
-(DEFUN |SINT;positiveRemainder;3$;53| (|x| |n| $)
+(DEFUN |SINT;positiveRemainder;3$;56| (|x| |n| $)
(PROG (|r|)
(RETURN
(SEQ (LETT |r| (QSREMAINDER |x| |n|)
- |SINT;positiveRemainder;3$;53|)
+ |SINT;positiveRemainder;3$;56|)
(EXIT (COND
((QSMINUSP |r|)
(COND
@@ -464,18 +483,18 @@
('T (QSPLUS |r| |n|))))
('T |r|)))))))
-(DEFUN |SINT;coerce;I$;54| (|x| $)
+(DEFUN |SINT;coerce;I$;57| (|x| $)
(PROG1 |x| (|check-subtype| (SMINTP |x|) '(|SingleInteger|) |x|)))
-(DEFUN |SINT;random;$;55| ($)
+(DEFUN |SINT;random;$;58| ($)
(SEQ (|setShellEntry| $ 6
(REMAINDER (TIMES 314159269 (|getShellEntry| $ 6))
2147483647))
(EXIT (REMAINDER (|getShellEntry| $ 6) 67108864))))
-(DEFUN |SINT;random;2$;56| (|n| $) (DECLARE (IGNORE $)) (RANDOM |n|))
+(DEFUN |SINT;random;2$;59| (|n| $) (DECLARE (IGNORE $)) (RANDOM |n|))
-(DEFUN |SINT;unitNormal;$R;57| (|x| $)
+(DEFUN |SINT;unitNormal;$R;60| (|x| $)
(COND
((QSLESSP |x| 0) (VECTOR -1 (QSMINUS |x|) -1))
('T (VECTOR 1 |x| 1))))
@@ -483,7 +502,7 @@
(DEFUN |SingleInteger| ()
(PROG ()
(RETURN
- (PROG (#0=#:G1491)
+ (PROG (#0=#:G1494)
(RETURN
(COND
((LETT #0# (HGET |$ConstructorCache| '|SingleInteger|)
@@ -505,7 +524,7 @@
(RETURN
(PROGN
(LETT |dv$| '(|SingleInteger|) . #0=(|SingleInteger|))
- (LETT $ (|newShell| 111) . #0#)
+ (LETT $ (|newShell| 115) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -521,7 +540,7 @@
(FUNCALL (|dispatchFunction| |SINT;Zero;$;10|) $))
(0 . |Zero|) (|Boolean|) |SINT;<;2$B;24| (|Void|)
(|OpenMathDevice|) (4 . |OMputApp|) (|String|)
- (9 . |OMputSymbol|) |SINT;-;2$;27| |SINT;convert;$I;8|
+ (9 . |OMputSymbol|) |SINT;-;2$;30| |SINT;convert;$I;8|
(16 . |OMputInteger|) (22 . |OMputEndApp|)
(|OpenMathEncoding|) (27 . |OMencodingXML|)
(31 . |OMopenString|) (37 . |OMputObject|)
@@ -530,7 +549,7 @@
|SINT;OMwrite;Omd$V;4| |SINT;OMwrite;Omd$BV;5|
(|Matrix| 5) (|Matrix| $) |SINT;reducedSystem;MM;6|
(|OutputForm|) (52 . |coerce|) |SINT;coerce;$Of;7|
- (57 . |coerce|) |SINT;*;3$;30| |SINT;*;I2$;9|
+ (57 . |coerce|) |SINT;*;3$;33| |SINT;*;I2$;9|
(CONS IDENTITY
(FUNCALL (|dispatchFunction| |SINT;One;$;11|) $))
|SINT;base;$;12|
@@ -541,57 +560,58 @@
|SINT;=;2$B;15| |SINT;~;2$;16| |SINT;not;2$;17|
|SINT;/\\;3$;18| |SINT;\\/;3$;19| |SINT;Not;2$;20|
|SINT;And;3$;21| |SINT;Or;3$;22| |SINT;xor;3$;23|
- |SINT;inc;2$;25| |SINT;dec;2$;26| |SINT;+;3$;28|
- |SINT;-;3$;29| (|NonNegativeInteger|) |SINT;**;$Nni$;31|
- |SINT;quo;3$;32| |SINT;rem;3$;33|
+ |SINT;>;2$B;25| (62 . |not|) |SINT;<=;2$B;26|
+ |SINT;>=;2$B;27| |SINT;inc;2$;28| |SINT;dec;2$;29|
+ |SINT;+;3$;31| |SINT;-;3$;32| (|NonNegativeInteger|)
+ |SINT;**;$Nni$;34| |SINT;quo;3$;35| |SINT;rem;3$;36|
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- |SINT;divide;2$R;34| |SINT;gcd;3$;35| |SINT;abs;2$;36|
- |SINT;odd?;$B;37| |SINT;zero?;$B;38| (62 . |One|)
- |SINT;one?;$B;39| |SINT;max;3$;40| |SINT;min;3$;41|
- (|SingleInteger|) |SINT;hash;2$;42| |SINT;length;2$;43|
- |SINT;shift;3$;44| |SINT;mulmod;4$;45| |SINT;addmod;4$;46|
- |SINT;submod;4$;47| |SINT;negative?;$B;48|
- |SINT;size;Nni;49| (|PositiveInteger|) (66 . +) (72 . -)
- |SINT;index;Pi$;50| |SINT;lookup;$Pi;51| (|Vector| 5)
- (|Record| (|:| |mat| 30) (|:| |vec| 84)) (|Vector| $)
- |SINT;reducedSystem;MVR;52| |SINT;positiveRemainder;3$;53|
- |SINT;coerce;I$;54| |SINT;random;$;55| |SINT;random;2$;56|
+ |SINT;divide;2$R;37| |SINT;gcd;3$;38| |SINT;abs;2$;39|
+ |SINT;odd?;$B;40| |SINT;zero?;$B;41| (67 . |One|)
+ |SINT;one?;$B;42| |SINT;max;3$;43| |SINT;min;3$;44|
+ (|SingleInteger|) |SINT;hash;2$;45| |SINT;length;2$;46|
+ |SINT;shift;3$;47| |SINT;mulmod;4$;48| |SINT;addmod;4$;49|
+ |SINT;submod;4$;50| |SINT;negative?;$B;51|
+ |SINT;size;Nni;52| (|PositiveInteger|) (71 . +) (77 . -)
+ |SINT;index;Pi$;53| |SINT;lookup;$Pi;54| (|Vector| 5)
+ (|Record| (|:| |mat| 30) (|:| |vec| 88)) (|Vector| $)
+ |SINT;reducedSystem;MVR;55| |SINT;positiveRemainder;3$;56|
+ |SINT;coerce;I$;57| |SINT;random;$;58| |SINT;random;2$;59|
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
- |SINT;unitNormal;$R;57| (|Fraction| 5)
- (|Union| 94 '"failed") (|DoubleFloat|)
+ |SINT;unitNormal;$R;60| (|Fraction| 5)
+ (|Union| 98 '"failed") (|DoubleFloat|)
(|Union| $ '"failed") (|Float|) (|PatternMatchResult| 5 $)
(|Pattern| 5) (|InputForm|) (|Union| 5 '"failed")
- (|List| $) (|Union| 103 '"failed")
- (|Record| (|:| |coef| 103) (|:| |generator| $))
+ (|List| $) (|Union| 107 '"failed")
+ (|Record| (|:| |coef| 107) (|:| |generator| $))
(|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 106 '"failed")
+ (|Union| 110 '"failed")
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
(|Factored| $) (|SparseUnivariatePolynomial| $))
- '#(~= 78 ~ 84 |zero?| 89 |xor| 94 |unitNormal| 100
- |unitCanonical| 105 |unit?| 110 |symmetricRemainder| 115
- |subtractIfCan| 121 |submod| 127 |squareFreePart| 134
- |squareFree| 139 |sizeLess?| 144 |size| 150 |sign| 154
- |shift| 159 |sample| 165 |retractIfCan| 169 |retract| 174
- |rem| 179 |reducedSystem| 185 |recip| 196 |rationalIfCan|
- 201 |rational?| 206 |rational| 211 |random| 216 |quo| 225
- |principalIdeal| 231 |prime?| 236 |powmod| 241
- |positiveRemainder| 248 |positive?| 254 |permutation| 259
- |patternMatch| 265 |one?| 272 |odd?| 277 |not| 282
- |nextItem| 287 |negative?| 292 |multiEuclidean| 297
- |mulmod| 303 |min| 310 |max| 320 |mask| 330 |lookup| 335
- |length| 340 |lcm| 345 |latex| 356 |invmod| 361 |init| 367
- |index| 371 |inc| 376 |hash| 381 |gcdPolynomial| 386 |gcd|
- 392 |factorial| 403 |factor| 408 |extendedEuclidean| 413
- |exquo| 426 |expressIdealMember| 432 |even?| 438
- |euclideanSize| 443 |divide| 448 |differentiate| 454 |dec|
- 465 |copy| 470 |convert| 475 |coerce| 500 |characteristic|
- 520 |bit?| 524 |binomial| 530 |before?| 536 |base| 542
- |associates?| 546 |addmod| 552 |abs| 559 |\\/| 564 |Zero|
- 570 |Or| 574 |One| 580 |OMwrite| 584 |Not| 608 D 613 |And|
- 624 >= 630 > 636 = 642 <= 648 < 654 |/\\| 660 - 666 + 677
- ** 683 * 695)
+ '#(~= 83 ~ 89 |zero?| 94 |xor| 99 |unitNormal| 105
+ |unitCanonical| 110 |unit?| 115 |symmetricRemainder| 120
+ |subtractIfCan| 126 |submod| 132 |squareFreePart| 139
+ |squareFree| 144 |sizeLess?| 149 |size| 155 |sign| 159
+ |shift| 164 |sample| 170 |retractIfCan| 174 |retract| 179
+ |rem| 184 |reducedSystem| 190 |recip| 201 |rationalIfCan|
+ 206 |rational?| 211 |rational| 216 |random| 221 |quo| 230
+ |principalIdeal| 236 |prime?| 241 |powmod| 246
+ |positiveRemainder| 253 |positive?| 259 |permutation| 264
+ |patternMatch| 270 |one?| 277 |odd?| 282 |not| 287
+ |nextItem| 292 |negative?| 297 |multiEuclidean| 302
+ |mulmod| 308 |min| 315 |max| 325 |mask| 335 |lookup| 340
+ |length| 345 |lcm| 350 |latex| 361 |invmod| 366 |init| 372
+ |index| 376 |inc| 381 |hash| 386 |gcdPolynomial| 391 |gcd|
+ 397 |factorial| 408 |factor| 413 |extendedEuclidean| 418
+ |exquo| 431 |expressIdealMember| 437 |even?| 443
+ |euclideanSize| 448 |divide| 453 |differentiate| 459 |dec|
+ 470 |copy| 475 |convert| 480 |coerce| 505 |characteristic|
+ 525 |bit?| 529 |binomial| 535 |before?| 541 |base| 547
+ |associates?| 551 |addmod| 557 |abs| 564 |\\/| 569 |Zero|
+ 575 |Or| 579 |One| 585 |OMwrite| 589 |Not| 613 D 618 |And|
+ 629 >= 635 > 641 = 647 <= 653 < 659 |/\\| 665 - 671 + 682
+ ** 688 * 700)
'((|noetherian| . 0) (|canonicalsClosed| . 0)
(|canonical| . 0) (|canonicalUnitNormal| . 0)
(|multiplicativeValuation| . 0) (|noZeroDivisors| . 0)
@@ -641,59 +661,59 @@
(|LeftLinearSet| 5) (|Logic|)
(|RealConstant|) (|RetractableTo| 5)
(|SetCategory|) (|OpenMath|)
- (|ConvertibleTo| 98)
- (|ConvertibleTo| 96)
- (|CombinatorialFunctionCategory|)
+ (|ConvertibleTo| 102)
(|ConvertibleTo| 100)
- (|ConvertibleTo| 101)
+ (|CombinatorialFunctionCategory|)
+ (|ConvertibleTo| 104)
+ (|ConvertibleTo| 105)
(|ConvertibleTo| 5) (|CoercibleFrom| $$)
(|CoercibleFrom| 5) (|BasicType|)
(|CoercibleTo| 33))
- (|makeByteWordVec2| 110
+ (|makeByteWordVec2| 114
'(0 5 0 8 1 12 11 0 13 3 12 11 0 14 14
15 2 12 11 0 5 18 1 12 11 0 19 0 20 0
21 2 12 0 14 20 22 1 12 11 0 23 1 12
11 0 24 1 12 11 0 25 1 5 33 0 34 1 0
- 0 5 36 0 5 0 66 2 79 0 0 0 80 2 5 0 0
- 0 81 2 0 9 0 0 1 1 0 0 0 44 1 0 9 0
- 65 2 0 0 0 0 51 1 0 92 0 93 1 0 0 0 1
- 1 0 9 0 1 2 0 0 0 0 1 2 0 97 0 0 1 3
- 0 0 0 0 0 76 1 0 0 0 1 1 0 109 0 1 2
- 0 9 0 0 1 0 0 56 78 1 0 5 0 1 2 0 0 0
- 0 73 0 0 0 1 1 0 102 0 1 1 0 5 0 1 2
- 0 0 0 0 59 2 0 85 31 86 87 1 0 30 31
- 32 1 0 97 0 1 1 0 95 0 1 1 0 9 0 1 1
- 0 94 0 1 1 0 0 0 91 0 0 0 90 2 0 0 0
- 0 58 1 0 105 103 1 1 0 9 0 1 3 0 0 0
- 0 0 1 2 0 0 0 0 88 1 0 9 0 1 2 0 0 0
- 0 1 3 0 99 0 100 99 1 1 0 9 0 67 1 0
- 9 0 64 1 0 0 0 45 1 0 97 0 1 1 0 9 0
- 77 2 0 104 103 0 1 3 0 0 0 0 0 74 0 0
- 0 42 2 0 0 0 0 69 0 0 0 41 2 0 0 0 0
- 68 1 0 0 0 1 1 0 79 0 83 1 0 0 0 72 2
- 0 0 0 0 1 1 0 0 103 1 1 0 14 0 1 2 0
- 0 0 0 1 0 0 0 1 1 0 0 79 82 1 0 0 0
- 52 1 0 70 0 71 2 0 110 110 110 1 2 0
- 0 0 0 62 1 0 0 103 1 1 0 0 0 1 1 0
- 109 0 1 3 0 107 0 0 0 1 2 0 108 0 0 1
- 2 0 97 0 0 1 2 0 104 103 0 1 1 0 9 0
- 1 1 0 56 0 1 2 0 60 0 0 61 1 0 0 0 1
- 2 0 0 0 56 1 1 0 0 0 53 1 0 0 0 1 1 0
- 96 0 1 1 0 98 0 1 1 0 101 0 1 1 0 100
- 0 1 1 0 5 0 17 1 0 0 5 89 1 0 0 0 1 1
- 0 0 5 89 1 0 33 0 35 0 0 56 1 2 0 9 0
- 0 1 2 0 0 0 0 1 2 0 9 0 0 1 0 0 0 40
- 2 0 9 0 0 1 3 0 0 0 0 0 75 1 0 0 0 63
- 2 0 0 0 0 47 0 0 0 7 2 0 0 0 0 50 0 0
- 0 39 2 0 11 12 0 28 3 0 11 12 0 9 29
- 2 0 14 0 9 27 1 0 14 0 26 1 0 0 0 48
- 1 0 0 0 1 2 0 0 0 56 1 2 0 0 0 0 49 2
- 0 9 0 0 1 2 0 9 0 0 1 2 0 9 0 0 43 2
- 0 9 0 0 1 2 0 9 0 0 10 2 0 0 0 0 46 2
- 0 0 0 0 55 1 0 0 0 16 2 0 0 0 0 54 2
- 0 0 0 56 57 2 0 0 0 79 1 2 0 0 0 0 37
- 2 0 0 5 0 38 2 0 0 56 0 1 2 0 0 79 0
- 1)))))
+ 0 5 36 1 9 0 0 53 0 5 0 70 2 83 0 0 0
+ 84 2 5 0 0 0 85 2 0 9 0 0 1 1 0 0 0
+ 44 1 0 9 0 69 2 0 0 0 0 51 1 0 96 0
+ 97 1 0 0 0 1 1 0 9 0 1 2 0 0 0 0 1 2
+ 0 101 0 0 1 3 0 0 0 0 0 80 1 0 0 0 1
+ 1 0 113 0 1 2 0 9 0 0 1 0 0 60 82 1 0
+ 5 0 1 2 0 0 0 0 77 0 0 0 1 1 0 106 0
+ 1 1 0 5 0 1 2 0 0 0 0 63 2 0 89 31 90
+ 91 1 0 30 31 32 1 0 101 0 1 1 0 99 0
+ 1 1 0 9 0 1 1 0 98 0 1 1 0 0 0 95 0 0
+ 0 94 2 0 0 0 0 62 1 0 109 107 1 1 0 9
+ 0 1 3 0 0 0 0 0 1 2 0 0 0 0 92 1 0 9
+ 0 1 2 0 0 0 0 1 3 0 103 0 104 103 1 1
+ 0 9 0 71 1 0 9 0 68 1 0 0 0 45 1 0
+ 101 0 1 1 0 9 0 81 2 0 108 107 0 1 3
+ 0 0 0 0 0 78 0 0 0 42 2 0 0 0 0 73 0
+ 0 0 41 2 0 0 0 0 72 1 0 0 0 1 1 0 83
+ 0 87 1 0 0 0 76 2 0 0 0 0 1 1 0 0 107
+ 1 1 0 14 0 1 2 0 0 0 0 1 0 0 0 1 1 0
+ 0 83 86 1 0 0 0 56 1 0 74 0 75 2 0
+ 114 114 114 1 2 0 0 0 0 66 1 0 0 107
+ 1 1 0 0 0 1 1 0 113 0 1 3 0 111 0 0 0
+ 1 2 0 112 0 0 1 2 0 101 0 0 1 2 0 108
+ 107 0 1 1 0 9 0 1 1 0 60 0 1 2 0 64 0
+ 0 65 1 0 0 0 1 2 0 0 0 60 1 1 0 0 0
+ 57 1 0 0 0 1 1 0 100 0 1 1 0 102 0 1
+ 1 0 105 0 1 1 0 104 0 1 1 0 5 0 17 1
+ 0 0 5 93 1 0 0 0 1 1 0 0 5 93 1 0 33
+ 0 35 0 0 60 1 2 0 9 0 0 1 2 0 0 0 0 1
+ 2 0 9 0 0 1 0 0 0 40 2 0 9 0 0 1 3 0
+ 0 0 0 0 79 1 0 0 0 67 2 0 0 0 0 47 0
+ 0 0 7 2 0 0 0 0 50 0 0 0 39 2 0 11 12
+ 0 28 3 0 11 12 0 9 29 2 0 14 0 9 27 1
+ 0 14 0 26 1 0 0 0 48 1 0 0 0 1 2 0 0
+ 0 60 1 2 0 0 0 0 49 2 0 9 0 0 55 2 0
+ 9 0 0 52 2 0 9 0 0 43 2 0 9 0 0 54 2
+ 0 9 0 0 10 2 0 0 0 0 46 2 0 0 0 0 59
+ 1 0 0 0 16 2 0 0 0 0 58 2 0 0 0 60 61
+ 2 0 0 0 83 1 2 0 0 0 0 37 2 0 0 5 0
+ 38 2 0 0 60 0 1 2 0 0 83 0 1)))))
'|lookupComplete|))
(MAKEPROP '|SingleInteger| 'NILADIC T)
diff --git a/src/algebra/string.spad.pamphlet b/src/algebra/string.spad.pamphlet
index 48a09e30..1e08bf30 100644
--- a/src/algebra/string.spad.pamphlet
+++ b/src/algebra/string.spad.pamphlet
@@ -82,6 +82,9 @@ Character: OrderedFinite() with
a = b == CHAR_=(a,b)$Lisp
a < b == CHAR_<(a,b)$Lisp
+ a > b == CHAR_>(a,b)$Lisp
+ a <= b == CHAR_<_=(a,b)$Lisp
+ a >= b == CHAR_>_=(a,b)$Lisp
size() == 256
index n == char((n - 1)::NNI)
lookup c == (1 + ord c)::PositiveInteger