From e8df02fd0970cad96e174ffb5b7707081266f371 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 31 Aug 2008 13:56:20 +0000 Subject: * algebra/boolean.spad.pamphlet (Boolean): Remove definition of operator ^. * algebra/aggcat.spad.pamphlet (BitAggregate): Likewise. * algebra/color.spad.pamphlet: Replace use of '^' as logical negation by 'not'. * algebra/ddfact.spad.pamphlet: Likewise. * algebra/fortran.spad.pamphlet: Likewise. * algebra/gaussfac.spad.pamphlet: Likewise. * algebra/gbeuclid.spad.pamphlet: Likewise. * algebra/gbintern.spad.pamphlet: Likewise. * algebra/ghensel.spad.pamphlet: Likewise. * algebra/groebsol.spad.pamphlet: Likewise. * algebra/ideal.spad.pamphlet: Likewise. * algebra/idecomp.spad.pamphlet: Likewise. * algebra/indexedp.spad.pamphlet: Likewise. * algebra/listgcd.spad.pamphlet: Likewise. * algebra/mfinfact.spad.pamphlet: Likewise. * algebra/modgcd.spad.pamphlet: Likewise. * algebra/multfact.spad.pamphlet: Likewise. * algebra/multsqfr.spad.pamphlet: Likewise. * algebra/newpoint.spad.pamphlet: Likewise. * algebra/npcoef.spad.pamphlet: Likewise. * algebra/permgrps.spad.pamphlet: Likewise. * algebra/pgcd.spad.pamphlet: Likewise. * algebra/pleqn.spad.pamphlet: Likewise. * algebra/qalgset.spad.pamphlet: Likewise. * algebra/radeigen.spad.pamphlet: Likewise. * algebra/rep2.spad.pamphlet: Likewise. * algebra/solverad.spad.pamphlet: Likewise. * algebra/space.spad.pamphlet: Likewise. * algebra/view2D.spad.pamphlet: Likewise. * algebra/strap/: Update cached Lisp translateion * share/algebra/: Update databases. --- src/algebra/strap/BOOLEAN.lsp | 156 +++++++++++++++---------------- src/algebra/strap/DFLOAT.lsp | 207 +++++++++++++++++++++-------------------- src/algebra/strap/FFIELDC-.lsp | 85 ++++++++--------- 3 files changed, 222 insertions(+), 226 deletions(-) (limited to 'src/algebra/strap') diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index 7a141b8b..f275dcd5 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -17,69 +17,67 @@ (DEFUN |BOOLEAN;not;2$;5| (|b| $) (COND (|b| 'NIL) ('T 'T))) -(DEFUN |BOOLEAN;^;2$;6| (|b| $) (COND (|b| 'NIL) ('T 'T))) +(DEFUN |BOOLEAN;~;2$;6| (|b| $) (COND (|b| 'NIL) ('T 'T))) -(DEFUN |BOOLEAN;~;2$;7| (|b| $) (COND (|b| 'NIL) ('T 'T))) +(DEFUN |BOOLEAN;and;3$;7| (|a| |b| $) (COND (|a| |b|) ('T 'NIL))) -(DEFUN |BOOLEAN;and;3$;8| (|a| |b| $) (COND (|a| |b|) ('T 'NIL))) +(DEFUN |BOOLEAN;/\\;3$;8| (|a| |b| $) (COND (|a| |b|) ('T 'NIL))) -(DEFUN |BOOLEAN;/\\;3$;9| (|a| |b| $) (COND (|a| |b|) ('T 'NIL))) +(DEFUN |BOOLEAN;or;3$;9| (|a| |b| $) (COND (|a| 'T) ('T |b|))) -(DEFUN |BOOLEAN;or;3$;10| (|a| |b| $) (COND (|a| 'T) ('T |b|))) +(DEFUN |BOOLEAN;\\/;3$;10| (|a| |b| $) (COND (|a| 'T) ('T |b|))) -(DEFUN |BOOLEAN;\\/;3$;11| (|a| |b| $) (COND (|a| 'T) ('T |b|))) - -(DEFUN |BOOLEAN;xor;3$;12| (|a| |b| $) +(DEFUN |BOOLEAN;xor;3$;11| (|a| |b| $) (COND (|a| (|BOOLEAN;nt| |b| $)) ('T |b|))) -(DEFUN |BOOLEAN;nor;3$;13| (|a| |b| $) +(DEFUN |BOOLEAN;nor;3$;12| (|a| |b| $) (COND (|a| 'NIL) ('T (|BOOLEAN;nt| |b| $)))) -(DEFUN |BOOLEAN;nand;3$;14| (|a| |b| $) +(DEFUN |BOOLEAN;nand;3$;13| (|a| |b| $) (COND (|a| (|BOOLEAN;nt| |b| $)) ('T 'T))) -(PUT '|BOOLEAN;=;3$;15| '|SPADreplace| 'EQ) +(PUT '|BOOLEAN;=;3$;14| '|SPADreplace| 'EQ) -(DEFUN |BOOLEAN;=;3$;15| (|a| |b| $) (EQ |a| |b|)) +(DEFUN |BOOLEAN;=;3$;14| (|a| |b| $) (EQ |a| |b|)) -(DEFUN |BOOLEAN;implies;3$;16| (|a| |b| $) (COND (|a| |b|) ('T 'T))) +(DEFUN |BOOLEAN;implies;3$;15| (|a| |b| $) (COND (|a| |b|) ('T 'T))) -(PUT '|BOOLEAN;equiv;3$;17| '|SPADreplace| 'EQ) +(PUT '|BOOLEAN;equiv;3$;16| '|SPADreplace| 'EQ) -(DEFUN |BOOLEAN;equiv;3$;17| (|a| |b| $) (EQ |a| |b|)) +(DEFUN |BOOLEAN;equiv;3$;16| (|a| |b| $) (EQ |a| |b|)) -(DEFUN |BOOLEAN;<;3$;18| (|a| |b| $) +(DEFUN |BOOLEAN;<;3$;17| (|a| |b| $) (COND (|b| (|BOOLEAN;nt| |a| $)) ('T 'NIL))) -(PUT '|BOOLEAN;size;Nni;19| '|SPADreplace| '(XLAM NIL 2)) +(PUT '|BOOLEAN;size;Nni;18| '|SPADreplace| '(XLAM NIL 2)) -(DEFUN |BOOLEAN;size;Nni;19| ($) 2) +(DEFUN |BOOLEAN;size;Nni;18| ($) 2) -(DEFUN |BOOLEAN;index;Pi$;20| (|i| $) - (COND ((SPADCALL |i| (|getShellEntry| $ 27)) 'NIL) ('T 'T))) +(DEFUN |BOOLEAN;index;Pi$;19| (|i| $) + (COND ((SPADCALL |i| (|getShellEntry| $ 26)) 'NIL) ('T 'T))) -(DEFUN |BOOLEAN;lookup;$Pi;21| (|a| $) (COND (|a| 1) ('T 2))) +(DEFUN |BOOLEAN;lookup;$Pi;20| (|a| $) (COND (|a| 1) ('T 2))) -(DEFUN |BOOLEAN;random;$;22| ($) - (COND ((SPADCALL (|random|) (|getShellEntry| $ 27)) 'NIL) ('T 'T))) +(DEFUN |BOOLEAN;random;$;21| ($) + (COND ((SPADCALL (|random|) (|getShellEntry| $ 26)) 'NIL) ('T 'T))) -(DEFUN |BOOLEAN;convert;$If;23| (|x| $) +(DEFUN |BOOLEAN;convert;$If;22| (|x| $) (COND - (|x| (SPADCALL (SPADCALL "true" (|getShellEntry| $ 34)) - (|getShellEntry| $ 36))) + (|x| (SPADCALL (SPADCALL "true" (|getShellEntry| $ 33)) + (|getShellEntry| $ 35))) ('T - (SPADCALL (SPADCALL "false" (|getShellEntry| $ 34)) - (|getShellEntry| $ 36))))) + (SPADCALL (SPADCALL "false" (|getShellEntry| $ 33)) + (|getShellEntry| $ 35))))) -(DEFUN |BOOLEAN;coerce;$Of;24| (|x| $) +(DEFUN |BOOLEAN;coerce;$Of;23| (|x| $) (COND - (|x| (SPADCALL "true" (|getShellEntry| $ 39))) - ('T (SPADCALL "false" (|getShellEntry| $ 39))))) + (|x| (SPADCALL "true" (|getShellEntry| $ 38))) + ('T (SPADCALL "false" (|getShellEntry| $ 38))))) (DEFUN |Boolean| () (PROG () (RETURN - (PROG (#0=#:G1423) + (PROG (#0=#:G1422) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Boolean|) |Boolean|) @@ -98,7 +96,7 @@ (RETURN (PROGN (LETT |dv$| '(|Boolean|) . #0=(|Boolean|)) - (LETT $ (|newShell| 42) . #0#) + (LETT $ (|newShell| 41) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -112,77 +110,75 @@ (FUNCALL (|dispatchFunction| |BOOLEAN;true;$;3|) $)) (CONS IDENTITY (FUNCALL (|dispatchFunction| |BOOLEAN;false;$;4|) $)) - |BOOLEAN;not;2$;5| |BOOLEAN;^;2$;6| |BOOLEAN;~;2$;7| - |BOOLEAN;and;3$;8| |BOOLEAN;/\\;3$;9| |BOOLEAN;or;3$;10| - |BOOLEAN;\\/;3$;11| |BOOLEAN;xor;3$;12| - |BOOLEAN;nor;3$;13| |BOOLEAN;nand;3$;14| (|Boolean|) - |BOOLEAN;=;3$;15| |BOOLEAN;implies;3$;16| - |BOOLEAN;equiv;3$;17| |BOOLEAN;<;3$;18| - (|NonNegativeInteger|) |BOOLEAN;size;Nni;19| (|Integer|) - (0 . |even?|) (|PositiveInteger|) |BOOLEAN;index;Pi$;20| - |BOOLEAN;lookup;$Pi;21| |BOOLEAN;random;$;22| (|String|) + |BOOLEAN;not;2$;5| |BOOLEAN;~;2$;6| |BOOLEAN;and;3$;7| + |BOOLEAN;/\\;3$;8| |BOOLEAN;or;3$;9| |BOOLEAN;\\/;3$;10| + |BOOLEAN;xor;3$;11| |BOOLEAN;nor;3$;12| + |BOOLEAN;nand;3$;13| (|Boolean|) |BOOLEAN;=;3$;14| + |BOOLEAN;implies;3$;15| |BOOLEAN;equiv;3$;16| + |BOOLEAN;<;3$;17| (|NonNegativeInteger|) + |BOOLEAN;size;Nni;18| (|Integer|) (0 . |even?|) + (|PositiveInteger|) |BOOLEAN;index;Pi$;19| + |BOOLEAN;lookup;$Pi;20| |BOOLEAN;random;$;21| (|String|) (|Symbol|) (5 . |coerce|) (|InputForm|) (10 . |convert|) - |BOOLEAN;convert;$If;23| (|OutputForm|) (15 . |message|) - |BOOLEAN;coerce;$Of;24| (|SingleInteger|)) + |BOOLEAN;convert;$If;22| (|OutputForm|) (15 . |message|) + |BOOLEAN;coerce;$Of;23| (|SingleInteger|)) '#(~= 20 ~ 26 |xor| 31 |true| 37 |test| 41 |size| 46 |random| 50 |or| 54 |not| 60 |nor| 65 |nand| 71 |min| 77 |max| 83 |lookup| 89 |latex| 94 |index| 99 |implies| 104 |hash| 110 |false| 115 |equiv| 119 |convert| 125 |coerce| 130 |and| - 135 ^ 141 |\\/| 146 >= 152 > 158 = 164 <= 170 < 176 |/\\| - 182) + 135 |\\/| 141 >= 147 > 153 = 159 <= 165 < 171 |/\\| 177) 'NIL (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0)) (CONS '#(|OrderedSet&| NIL |Logic&| |SetCategory&| NIL NIL |BasicType&| NIL) (CONS '#((|OrderedSet|) (|Finite|) (|Logic|) - (|SetCategory|) (|ConvertibleTo| 35) + (|SetCategory|) (|ConvertibleTo| 34) (|PropositionalLogic|) (|BasicType|) - (|CoercibleTo| 38)) - (|makeByteWordVec2| 41 - '(1 26 19 0 27 1 33 0 32 34 1 35 0 33 - 36 1 38 0 32 39 2 0 19 0 0 1 1 0 0 0 - 11 2 0 0 0 0 16 0 0 0 7 1 0 0 0 6 0 0 - 24 25 0 0 0 31 2 0 0 0 0 14 1 0 0 0 9 - 2 0 0 0 0 17 2 0 0 0 0 18 2 0 0 0 0 1 - 2 0 0 0 0 1 1 0 28 0 30 1 0 32 0 1 1 - 0 0 28 29 2 0 0 0 0 21 1 0 41 0 1 0 0 - 0 8 2 0 0 0 0 22 1 0 35 0 37 1 0 38 0 - 40 2 0 0 0 0 12 1 0 0 0 10 2 0 0 0 0 - 15 2 0 19 0 0 1 2 0 19 0 0 1 2 0 19 0 - 0 20 2 0 19 0 0 1 2 0 19 0 0 23 2 0 0 - 0 0 13))))) + (|CoercibleTo| 37)) + (|makeByteWordVec2| 40 + '(1 25 18 0 26 1 32 0 31 33 1 34 0 32 + 35 1 37 0 31 38 2 0 18 0 0 1 1 0 0 0 + 10 2 0 0 0 0 15 0 0 0 7 1 0 0 0 6 0 0 + 23 24 0 0 0 30 2 0 0 0 0 13 1 0 0 0 9 + 2 0 0 0 0 16 2 0 0 0 0 17 2 0 0 0 0 1 + 2 0 0 0 0 1 1 0 27 0 29 1 0 31 0 1 1 + 0 0 27 28 2 0 0 0 0 20 1 0 40 0 1 0 0 + 0 8 2 0 0 0 0 21 1 0 34 0 36 1 0 37 0 + 39 2 0 0 0 0 11 2 0 0 0 0 14 2 0 18 0 + 0 1 2 0 18 0 0 1 2 0 18 0 0 19 2 0 18 + 0 0 1 2 0 18 0 0 22 2 0 0 0 0 12))))) '|lookupComplete|)) (SETQ |$CategoryFrame| (|put| '|Boolean| '|isFunctor| '(((|test| ($ $)) T (ELT $ 6)) - ((|nor| ($ $ $)) T (ELT $ 17)) - ((|nand| ($ $ $)) T (ELT $ 18)) - ((|xor| ($ $ $)) T (ELT $ 16)) ((^ ($ $)) T (ELT $ 10)) + ((|nor| ($ $ $)) T (ELT $ 16)) + ((|nand| ($ $ $)) T (ELT $ 17)) + ((|xor| ($ $ $)) T (ELT $ 15)) ((|false| ($)) T (CONST $ 8)) ((|true| ($)) T (CONST $ 7)) - ((|convert| ((|InputForm|) $)) T (ELT $ 37)) - ((|equiv| ($ $ $)) T (ELT $ 22)) - ((|implies| ($ $ $)) T (ELT $ 21)) - ((|or| ($ $ $)) T (ELT $ 14)) - ((|and| ($ $ $)) T (ELT $ 12)) - ((|not| ($ $)) T (ELT $ 9)) ((~ ($ $)) T (ELT $ 11)) - ((|/\\| ($ $ $)) T (ELT $ 13)) - ((|\\/| ($ $ $)) T (ELT $ 15)) - ((|size| ((|NonNegativeInteger|))) T (ELT $ 25)) - ((|index| ($ (|PositiveInteger|))) T (ELT $ 29)) - ((|lookup| ((|PositiveInteger|) $)) T (ELT $ 30)) - ((|random| ($)) T (ELT $ 31)) + ((|convert| ((|InputForm|) $)) T (ELT $ 36)) + ((|equiv| ($ $ $)) T (ELT $ 21)) + ((|implies| ($ $ $)) T (ELT $ 20)) + ((|or| ($ $ $)) T (ELT $ 13)) + ((|and| ($ $ $)) T (ELT $ 11)) + ((|not| ($ $)) T (ELT $ 9)) ((~ ($ $)) T (ELT $ 10)) + ((|/\\| ($ $ $)) T (ELT $ 12)) + ((|\\/| ($ $ $)) T (ELT $ 14)) + ((|size| ((|NonNegativeInteger|))) T (ELT $ 24)) + ((|index| ($ (|PositiveInteger|))) T (ELT $ 28)) + ((|lookup| ((|PositiveInteger|) $)) T (ELT $ 29)) + ((|random| ($)) T (ELT $ 30)) ((|min| ($ $ $)) T (ELT $ NIL)) ((|max| ($ $ $)) T (ELT $ NIL)) ((<= ((|Boolean|) $ $)) T (ELT $ NIL)) ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) ((> ((|Boolean|) $ $)) T (ELT $ NIL)) - ((< ((|Boolean|) $ $)) T (ELT $ 23)) + ((< ((|Boolean|) $ $)) T (ELT $ 22)) ((|latex| ((|String|) $)) T (ELT $ NIL)) ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) - ((|coerce| ((|OutputForm|) $)) T (ELT $ 40)) - ((= ((|Boolean|) $ $)) T (ELT $ 20)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ 39)) + ((= ((|Boolean|) $ $)) T (ELT $ 19)) ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) (|addModemap| '|Boolean| '(|Boolean|) '((|Join| (|OrderedSet|) (|Finite|) (|Logic|) @@ -191,7 +187,6 @@ (CATEGORY |domain| (SIGNATURE |true| ($) |constant|) (SIGNATURE |false| ($) |constant|) - (SIGNATURE ^ ($ $)) (SIGNATURE |xor| ($ $ $)) (SIGNATURE |nand| ($ $ $)) (SIGNATURE |nor| ($ $ $)) @@ -206,7 +201,6 @@ (SIGNATURE |true| ($) |constant|) (SIGNATURE |false| ($) |constant|) - (SIGNATURE ^ ($ $)) (SIGNATURE |xor| ($ $ $)) (SIGNATURE |nand| ($ $ $)) (SIGNATURE |nor| ($ $ $)) diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index f7fd7c17..878da4c3 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -420,8 +420,9 @@ (GO #0#)))) (LETT |me| (MANEXP |x|) |DFLOAT;manexp|) (LETT |two53| - (EXPT (FLOAT-RADIX 0.0) - (FLOAT-DIGITS 0.0)) + (SPADCALL (FLOAT-RADIX 0.0) + (FLOAT-DIGITS 0.0) + (|getShellEntry| $ 118)) |DFLOAT;manexp|) (EXIT (CONS (* |s| (FIX (* |two53| (QCAR |me|)))) @@ -429,9 +430,9 @@ #0# (EXIT #0#))))) (DEFUN |DFLOAT;rationalApproximation;$2NniF;84| (|f| |d| |b| $) - (PROG (|#G103| |nu| |ex| BASE #0=#:G1525 |de| |tol| |#G104| |q| |r| - |p2| |q2| #1=#:G1543 |#G105| |#G106| |p0| |p1| |#G107| - |#G108| |q0| |q1| |#G109| |#G110| |s| |t| #2=#:G1541) + (PROG (|#G103| |nu| |ex| BASE #0=#:G1524 |de| |tol| |#G104| |q| |r| + |p2| |q2| #1=#:G1540 |#G105| |#G106| |p0| |p1| |#G107| + |#G108| |q0| |q1| |#G109| |#G110| |s| |t| #2=#:G1538) (RETURN (SEQ (EXIT (SEQ (PROGN (LETT |#G103| (|DFLOAT;manexp| |f| $) @@ -499,14 +500,14 @@ (- (* |nu| |q2|) (* |de| |p2|))) (|getShellEntry| $ - 120)) + 121)) (* |de| (ABS |p2|)))) (EXIT (PROGN (LETT #1# (SPADCALL |p2| |q2| (|getShellEntry| $ - 119)) + 120)) |DFLOAT;rationalApproximation;$2NniF;84|) (GO #1#))))) (PROGN @@ -548,36 +549,36 @@ |DFLOAT;rationalApproximation;$2NniF;84|) (|check-subtype| (>= #2# 0) '(|NonNegativeInteger|) #2#)))) - (|getShellEntry| $ 121))))))) + (|getShellEntry| $ 122))))))) #1# (EXIT #1#))))) (DEFUN |DFLOAT;**;$F$;85| (|x| |r| $) - (PROG (|n| |d| #0=#:G1552) + (PROG (|n| |d| #0=#:G1549) (RETURN (SEQ (EXIT (COND ((ZEROP |x|) (COND - ((SPADCALL |r| (|getShellEntry| $ 122)) - (|error| "0**0 is undefined")) ((SPADCALL |r| (|getShellEntry| $ 123)) + (|error| "0**0 is undefined")) + ((SPADCALL |r| (|getShellEntry| $ 124)) (|error| "division by 0")) ('T 0.0))) - ((OR (SPADCALL |r| (|getShellEntry| $ 122)) + ((OR (SPADCALL |r| (|getShellEntry| $ 123)) (= |x| 1.0)) 1.0) ('T (COND - ((SPADCALL |r| (|spadConstant| $ 124) - (|getShellEntry| $ 125)) + ((SPADCALL |r| (|spadConstant| $ 125) + (|getShellEntry| $ 126)) |x|) ('T (SEQ (LETT |n| (SPADCALL |r| - (|getShellEntry| $ 126)) + (|getShellEntry| $ 127)) |DFLOAT;**;$F$;85|) (LETT |d| (SPADCALL |r| - (|getShellEntry| $ 127)) + (|getShellEntry| $ 128)) |DFLOAT;**;$F$;85|) (EXIT (COND ((MINUSP |x|) @@ -589,14 +590,14 @@ (LETT #0# (- (SPADCALL (- |x|) |r| - (|getShellEntry| $ 128))) + (|getShellEntry| $ 129))) |DFLOAT;**;$F$;85|) (GO #0#))) ('T (PROGN (LETT #0# (SPADCALL (- |x|) |r| - (|getShellEntry| $ 128)) + (|getShellEntry| $ 129)) |DFLOAT;**;$F$;85|) (GO #0#))))) ('T (|error| "negative root")))) @@ -618,7 +619,7 @@ (DEFUN |DoubleFloat| () (PROG () (RETURN - (PROG (#0=#:G1565) + (PROG (#0=#:G1562) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|DoubleFloat|) @@ -639,7 +640,7 @@ (RETURN (PROGN (LETT |dv$| '(|DoubleFloat|) . #0=(|DoubleFloat|)) - (LETT $ (|newShell| 142) . #0#) + (LETT $ (|newShell| 143) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -701,48 +702,48 @@ (|Union| 105 '"failed") |DFLOAT;retractIfCan;$U;78| |DFLOAT;retract;$I;79| (|Union| 26 '"failed") |DFLOAT;retractIfCan;$U;80| |DFLOAT;sign;$I;81| - |DFLOAT;abs;2$;82| (63 . |Zero|) (67 . /) (73 . *) - (79 . |coerce|) (84 . |zero?|) (89 . |negative?|) - (94 . |One|) (98 . =) (104 . |numer|) (109 . |denom|) + |DFLOAT;abs;2$;82| (63 . **) (69 . |Zero|) (73 . /) + (79 . *) (85 . |coerce|) (90 . |zero?|) (95 . |negative?|) + (100 . |One|) (104 . =) (110 . |numer|) (115 . |denom|) |DFLOAT;**;$F$;85| (|PatternMatchResult| 102 $) (|Pattern| 102) (|Factored| $) (|List| $) - (|Union| 132 '"failed") + (|Union| 133 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 135 '"failed") + (|Union| 136 '"failed") (|Record| (|:| |quotient| $) (|:| |remainder| $)) - (|Record| (|:| |coef| 132) (|:| |generator| $)) + (|Record| (|:| |coef| 133) (|:| |generator| $)) (|SparseUnivariatePolynomial| $) (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) (|SingleInteger|)) - '#(~= 114 |zero?| 120 |wholePart| 125 |unitNormal| 130 - |unitCanonical| 135 |unit?| 140 |truncate| 145 |tanh| 150 - |tan| 155 |subtractIfCan| 160 |squareFreePart| 166 - |squareFree| 171 |sqrt| 176 |sizeLess?| 181 |sinh| 187 - |sin| 192 |sign| 197 |sech| 202 |sec| 207 |sample| 212 - |round| 216 |retractIfCan| 221 |retract| 231 |rem| 241 - |recip| 247 |rationalApproximation| 252 |quo| 265 - |principalIdeal| 271 |prime?| 276 |precision| 281 - |positive?| 285 |pi| 290 |patternMatch| 294 |order| 301 - |one?| 306 |nthRoot| 311 |norm| 317 |negative?| 322 - |multiEuclidean| 327 |min| 333 |max| 343 |mantissa| 353 - |log2| 358 |log10| 363 |log| 368 |lcm| 373 |latex| 384 - |inv| 389 |hash| 394 |gcdPolynomial| 404 |gcd| 410 - |fractionPart| 421 |floor| 426 |float| 431 |factor| 444 - |extendedEuclidean| 449 |exquo| 462 |expressIdealMember| - 468 |exponent| 474 |exp1| 479 |exp| 483 |euclideanSize| - 488 |doubleFloatFormat| 493 |divide| 498 |digits| 504 - |differentiate| 508 |csch| 519 |csc| 524 |coth| 529 |cot| - 534 |cosh| 539 |cos| 544 |convert| 549 |coerce| 569 - |characteristic| 599 |ceiling| 603 |bits| 608 |base| 612 - |atanh| 616 |atan| 621 |associates?| 632 |asinh| 638 - |asin| 643 |asech| 648 |asec| 653 |acsch| 658 |acsc| 663 - |acoth| 668 |acot| 673 |acosh| 678 |acos| 683 |abs| 688 ^ - 693 |Zero| 711 |One| 715 |OMwrite| 719 |Gamma| 743 D 748 - |Beta| 759 >= 765 > 771 = 777 <= 783 < 789 / 795 - 807 + - 818 ** 824 * 854) + '#(~= 120 |zero?| 126 |wholePart| 131 |unitNormal| 136 + |unitCanonical| 141 |unit?| 146 |truncate| 151 |tanh| 156 + |tan| 161 |subtractIfCan| 166 |squareFreePart| 172 + |squareFree| 177 |sqrt| 182 |sizeLess?| 187 |sinh| 193 + |sin| 198 |sign| 203 |sech| 208 |sec| 213 |sample| 218 + |round| 222 |retractIfCan| 227 |retract| 237 |rem| 247 + |recip| 253 |rationalApproximation| 258 |quo| 271 + |principalIdeal| 277 |prime?| 282 |precision| 287 + |positive?| 291 |pi| 296 |patternMatch| 300 |order| 307 + |one?| 312 |nthRoot| 317 |norm| 323 |negative?| 328 + |multiEuclidean| 333 |min| 339 |max| 349 |mantissa| 359 + |log2| 364 |log10| 369 |log| 374 |lcm| 379 |latex| 390 + |inv| 395 |hash| 400 |gcdPolynomial| 410 |gcd| 416 + |fractionPart| 427 |floor| 432 |float| 437 |factor| 450 + |extendedEuclidean| 455 |exquo| 468 |expressIdealMember| + 474 |exponent| 480 |exp1| 485 |exp| 489 |euclideanSize| + 494 |doubleFloatFormat| 499 |divide| 504 |digits| 510 + |differentiate| 514 |csch| 525 |csc| 530 |coth| 535 |cot| + 540 |cosh| 545 |cos| 550 |convert| 555 |coerce| 575 + |characteristic| 605 |ceiling| 609 |bits| 614 |base| 618 + |atanh| 622 |atan| 627 |associates?| 638 |asinh| 644 + |asin| 649 |asech| 654 |asec| 659 |acsch| 664 |acsc| 669 + |acoth| 674 |acot| 679 |acosh| 684 |acos| 689 |abs| 694 ^ + 699 |Zero| 717 |One| 721 |OMwrite| 725 |Gamma| 749 D 754 + |Beta| 765 >= 771 > 777 = 783 <= 789 < 795 / 801 - 813 + + 824 ** 830 * 860) '((|approximate| . 0) (|canonicalsClosed| . 0) (|canonicalUnitNormal| . 0) (|noZeroDivisors| . 0) ((|commutative| "*") . 0) (|rightUnitary| . 0) @@ -801,68 +802,68 @@ (|HyperbolicFunctionCategory|) (|ArcTrigonometricFunctionCategory|) (|TrigonometricFunctionCategory|) - (|OpenMath|) (|ConvertibleTo| 130) + (|OpenMath|) (|ConvertibleTo| 131) (|RadicalCategory|) (|RetractableTo| 105) (|RetractableTo| 26) (|ConvertibleTo| 102) (|ConvertibleTo| 15) (|BasicType|) (|CoercibleTo| 40)) - (|makeByteWordVec2| 141 + (|makeByteWordVec2| 142 '(0 9 0 10 2 11 0 7 9 12 1 11 13 0 14 2 11 13 0 15 16 1 11 13 0 17 1 11 13 0 18 2 0 0 24 0 31 1 40 0 15 41 1 43 0 15 44 1 94 15 15 95 2 94 15 15 15 97 - 1 102 0 15 103 0 105 0 118 2 105 0 26 - 26 119 2 26 0 106 0 120 1 105 0 26 - 121 1 105 20 0 122 1 105 20 0 123 0 - 105 0 124 2 105 20 0 0 125 1 105 26 0 - 126 1 105 26 0 127 2 0 20 0 0 1 1 0 - 20 0 89 1 0 26 0 99 1 0 140 0 1 1 0 0 - 0 1 1 0 20 0 1 1 0 0 0 1 1 0 0 0 77 1 - 0 0 0 65 2 0 91 0 0 1 1 0 0 0 1 1 0 - 131 0 1 1 0 0 0 56 2 0 20 0 0 1 1 0 0 - 0 75 1 0 0 0 63 1 0 26 0 116 1 0 0 0 - 80 1 0 0 0 67 0 0 0 1 1 0 0 0 1 1 0 - 111 0 112 1 0 114 0 115 1 0 105 0 110 - 1 0 26 0 113 2 0 0 0 0 1 1 0 91 0 92 - 2 0 105 0 106 108 3 0 105 0 106 106 - 107 2 0 0 0 0 1 1 0 138 132 1 1 0 20 - 0 1 0 0 24 29 1 0 20 0 1 0 0 0 39 3 0 - 129 0 130 129 1 1 0 26 0 35 1 0 20 0 - 1 2 0 0 0 26 1 1 0 0 0 1 1 0 20 0 88 - 2 0 133 132 0 1 0 0 0 34 2 0 0 0 0 53 - 0 0 0 33 2 0 0 0 0 52 1 0 26 0 27 1 0 - 0 0 30 1 0 0 0 57 1 0 0 0 62 1 0 0 - 132 1 2 0 0 0 0 1 1 0 7 0 1 1 0 0 0 1 - 1 0 26 0 90 1 0 141 0 1 2 0 139 139 - 139 1 1 0 0 132 1 2 0 0 0 0 1 1 0 0 0 - 1 1 0 0 0 1 3 0 0 26 26 24 100 2 0 0 - 26 26 1 1 0 131 0 1 2 0 134 0 0 1 3 0 - 136 0 0 0 1 2 0 91 0 0 1 2 0 133 132 - 0 1 1 0 26 0 28 0 0 0 38 1 0 0 0 61 1 - 0 106 0 1 1 0 7 7 8 2 0 137 0 0 1 0 0 - 24 1 1 0 0 0 93 2 0 0 0 106 1 1 0 0 0 - 78 1 0 0 0 68 1 0 0 0 79 1 0 0 0 66 1 - 0 0 0 76 1 0 0 0 64 1 0 43 0 45 1 0 - 130 0 1 1 0 102 0 104 1 0 15 0 101 1 - 0 0 105 1 1 0 0 26 60 1 0 0 105 1 1 0 - 0 26 60 1 0 0 0 1 1 0 40 0 42 0 0 106 - 1 1 0 0 0 1 0 0 24 32 0 0 24 25 1 0 0 - 0 83 2 0 0 0 0 109 1 0 0 0 71 2 0 20 - 0 0 1 1 0 0 0 81 1 0 0 0 69 1 0 0 0 - 86 1 0 0 0 74 1 0 0 0 84 1 0 0 0 72 1 - 0 0 0 85 1 0 0 0 73 1 0 0 0 82 1 0 0 - 0 70 1 0 0 0 117 2 0 0 0 26 1 2 0 0 0 - 106 1 2 0 0 0 24 1 0 0 0 36 0 0 0 37 - 3 0 13 11 0 20 23 2 0 7 0 20 21 2 0 - 13 11 0 22 1 0 7 0 19 1 0 0 0 96 1 0 - 0 0 1 2 0 0 0 106 1 2 0 0 0 0 98 2 0 - 20 0 0 1 2 0 20 0 0 1 2 0 20 0 0 54 2 - 0 20 0 0 1 2 0 20 0 0 46 2 0 0 0 26 + 1 102 0 15 103 2 26 0 0 24 118 0 105 + 0 119 2 105 0 26 26 120 2 26 0 106 0 + 121 1 105 0 26 122 1 105 20 0 123 1 + 105 20 0 124 0 105 0 125 2 105 20 0 0 + 126 1 105 26 0 127 1 105 26 0 128 2 0 + 20 0 0 1 1 0 20 0 89 1 0 26 0 99 1 0 + 141 0 1 1 0 0 0 1 1 0 20 0 1 1 0 0 0 + 1 1 0 0 0 77 1 0 0 0 65 2 0 91 0 0 1 + 1 0 0 0 1 1 0 132 0 1 1 0 0 0 56 2 0 + 20 0 0 1 1 0 0 0 75 1 0 0 0 63 1 0 26 + 0 116 1 0 0 0 80 1 0 0 0 67 0 0 0 1 1 + 0 0 0 1 1 0 111 0 112 1 0 114 0 115 1 + 0 105 0 110 1 0 26 0 113 2 0 0 0 0 1 + 1 0 91 0 92 2 0 105 0 106 108 3 0 105 + 0 106 106 107 2 0 0 0 0 1 1 0 139 133 + 1 1 0 20 0 1 0 0 24 29 1 0 20 0 1 0 0 + 0 39 3 0 130 0 131 130 1 1 0 26 0 35 + 1 0 20 0 1 2 0 0 0 26 1 1 0 0 0 1 1 0 + 20 0 88 2 0 134 133 0 1 0 0 0 34 2 0 + 0 0 0 53 0 0 0 33 2 0 0 0 0 52 1 0 26 + 0 27 1 0 0 0 30 1 0 0 0 57 1 0 0 0 62 + 1 0 0 133 1 2 0 0 0 0 1 1 0 7 0 1 1 0 + 0 0 1 1 0 26 0 90 1 0 142 0 1 2 0 140 + 140 140 1 1 0 0 133 1 2 0 0 0 0 1 1 0 + 0 0 1 1 0 0 0 1 3 0 0 26 26 24 100 2 + 0 0 26 26 1 1 0 132 0 1 2 0 135 0 0 1 + 3 0 137 0 0 0 1 2 0 91 0 0 1 2 0 134 + 133 0 1 1 0 26 0 28 0 0 0 38 1 0 0 0 + 61 1 0 106 0 1 1 0 7 7 8 2 0 138 0 0 + 1 0 0 24 1 1 0 0 0 93 2 0 0 0 106 1 1 + 0 0 0 78 1 0 0 0 68 1 0 0 0 79 1 0 0 + 0 66 1 0 0 0 76 1 0 0 0 64 1 0 43 0 + 45 1 0 131 0 1 1 0 102 0 104 1 0 15 0 + 101 1 0 0 105 1 1 0 0 26 60 1 0 0 105 + 1 1 0 0 26 60 1 0 0 0 1 1 0 40 0 42 0 + 0 106 1 1 0 0 0 1 0 0 24 32 0 0 24 25 + 1 0 0 0 83 2 0 0 0 0 109 1 0 0 0 71 2 + 0 20 0 0 1 1 0 0 0 81 1 0 0 0 69 1 0 + 0 0 86 1 0 0 0 74 1 0 0 0 84 1 0 0 0 + 72 1 0 0 0 85 1 0 0 0 73 1 0 0 0 82 1 + 0 0 0 70 1 0 0 0 117 2 0 0 0 26 1 2 0 + 0 0 106 1 2 0 0 0 24 1 0 0 0 36 0 0 0 + 37 3 0 13 11 0 20 23 2 0 7 0 20 21 2 + 0 13 11 0 22 1 0 7 0 19 1 0 0 0 96 1 + 0 0 0 1 2 0 0 0 106 1 2 0 0 0 0 98 2 + 0 20 0 0 1 2 0 20 0 0 1 2 0 20 0 0 54 + 2 0 20 0 0 1 2 0 20 0 0 46 2 0 0 0 26 55 2 0 0 0 0 87 2 0 0 0 0 49 1 0 0 0 47 2 0 0 0 0 48 2 0 0 0 0 59 2 0 0 0 - 105 128 2 0 0 0 26 58 2 0 0 0 106 1 2 + 105 129 2 0 0 0 26 58 2 0 0 0 106 1 2 0 0 0 24 1 2 0 0 0 105 1 2 0 0 105 0 1 2 0 0 0 0 50 2 0 0 26 0 51 2 0 0 106 0 1 2 0 0 24 0 31))))) @@ -968,7 +969,7 @@ (|PatternMatchResult| (|Float|) $))) T (ELT $ NIL)) ((|convert| ((|Pattern| (|Float|)) $)) T (ELT $ NIL)) - ((** ($ $ (|Fraction| (|Integer|)))) T (ELT $ 128)) + ((** ($ $ (|Fraction| (|Integer|)))) T (ELT $ 129)) ((|nthRoot| ($ $ (|Integer|))) T (ELT $ NIL)) ((|sqrt| ($ $)) T (ELT $ 56)) ((|retract| ((|Fraction| (|Integer|)) $)) T (ELT $ 110)) diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp index 56e49451..0e6a1eae 100644 --- a/src/algebra/strap/FFIELDC-.lsp +++ b/src/algebra/strap/FFIELDC-.lsp @@ -436,8 +436,9 @@ ('T (SEQ (LETT |rho| - (* (QCDR |rhoHelp|) - |mult|) + (SPADCALL + (QCDR |rhoHelp|) |mult| + (|getShellEntry| $ 72)) |FFIELDC-;discreteLog;2SU;12|) (LETT |disclog| (+ |disclog| |rho|) @@ -464,25 +465,25 @@ #2# (EXIT #2#))))) (DEFUN |FFIELDC-;squareFreePolynomial| (|f| $) - (SPADCALL |f| (|getShellEntry| $ 76))) + (SPADCALL |f| (|getShellEntry| $ 77))) (DEFUN |FFIELDC-;factorPolynomial| (|f| $) - (SPADCALL |f| (|getShellEntry| $ 78))) + (SPADCALL |f| (|getShellEntry| $ 79))) (DEFUN |FFIELDC-;factorSquareFreePolynomial| (|f| $) (PROG (|flist| |u| #0=#:G1517 #1=#:G1514 #2=#:G1512 #3=#:G1513) (RETURN (SEQ (COND - ((SPADCALL |f| (|spadConstant| $ 79) - (|getShellEntry| $ 80)) - (|spadConstant| $ 81)) + ((SPADCALL |f| (|spadConstant| $ 80) + (|getShellEntry| $ 81)) + (|spadConstant| $ 82)) ('T (SEQ (LETT |flist| - (SPADCALL |f| 'T (|getShellEntry| $ 85)) + (SPADCALL |f| 'T (|getShellEntry| $ 86)) |FFIELDC-;factorSquareFreePolynomial|) (EXIT (SPADCALL (SPADCALL (QCAR |flist|) - (|getShellEntry| $ 86)) + (|getShellEntry| $ 87)) (PROGN (LETT #3# NIL |FFIELDC-;factorSquareFreePolynomial|) @@ -504,13 +505,13 @@ (LETT #1# (SPADCALL (QCAR |u|) (QCDR |u|) - (|getShellEntry| $ 87)) + (|getShellEntry| $ 88)) |FFIELDC-;factorSquareFreePolynomial|) (COND (#3# (LETT #2# (SPADCALL #2# #1# - (|getShellEntry| $ 88)) + (|getShellEntry| $ 89)) |FFIELDC-;factorSquareFreePolynomial|)) ('T (PROGN @@ -523,11 +524,11 @@ (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) - ('T (|spadConstant| $ 89)))) - (|getShellEntry| $ 90)))))))))) + ('T (|spadConstant| $ 90)))) + (|getShellEntry| $ 91)))))))))) (DEFUN |FFIELDC-;gcdPolynomial;3Sup;16| (|f| |g| $) - (SPADCALL |f| |g| (|getShellEntry| $ 92))) + (SPADCALL |f| |g| (|getShellEntry| $ 93))) (DEFUN |FiniteFieldCategory&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -535,7 +536,7 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|FiniteFieldCategory&|)) (LETT |dv$| (LIST '|FiniteFieldCategory&| |dv$1|) . #0#) - (LETT $ (|newShell| 95) . #0#) + (LETT $ (|newShell| 96) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -572,27 +573,27 @@ (|String|) (|OutputForm|) (126 . |messagePrint|) (|Factored| $) (131 . |factor|) (|Factored| 18) (136 . |factors|) (|DiscreteLogarithmPackage| 6) - (141 . |shanksDiscLogAlgorithm|) + (141 . |shanksDiscLogAlgorithm|) (148 . *) |FFIELDC-;discreteLog;2SU;12| - (|SparseUnivariatePolynomial| 6) (|Factored| 73) - (|UnivariatePolynomialSquareFree| 6 73) - (148 . |squareFree|) (|DistinctDegreeFactorize| 6 73) - (153 . |factor|) (158 . |Zero|) (162 . =) (168 . |Zero|) - (|Record| (|:| |irr| 73) (|:| |pow| 18)) (|List| 82) - (|Record| (|:| |cont| 6) (|:| |factors| 83)) - (172 . |distdfact|) (178 . |coerce|) (183 . |primeFactor|) - (189 . *) (195 . |One|) (199 . *) (|EuclideanDomain&| 73) - (205 . |gcd|) (|SparseUnivariatePolynomial| $) + (|SparseUnivariatePolynomial| 6) (|Factored| 74) + (|UnivariatePolynomialSquareFree| 6 74) + (154 . |squareFree|) (|DistinctDegreeFactorize| 6 74) + (159 . |factor|) (164 . |Zero|) (168 . =) (174 . |Zero|) + (|Record| (|:| |irr| 74) (|:| |pow| 18)) (|List| 83) + (|Record| (|:| |cont| 6) (|:| |factors| 84)) + (178 . |distdfact|) (184 . |coerce|) (189 . |primeFactor|) + (195 . *) (201 . |One|) (205 . *) (|EuclideanDomain&| 74) + (211 . |gcd|) (|SparseUnivariatePolynomial| $) |FFIELDC-;gcdPolynomial;3Sup;16|) - '#(|primitive?| 211 |order| 216 |nextItem| 226 |init| 231 - |gcdPolynomial| 235 |discreteLog| 241 |differentiate| 252 - |createPrimitiveElement| 257 |conditionP| 261 |charthRoot| - 266) + '#(|primitive?| 217 |order| 222 |nextItem| 232 |init| 237 + |gcdPolynomial| 241 |discreteLog| 247 |differentiate| 258 + |createPrimitiveElement| 263 |conditionP| 267 |charthRoot| + 272) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 94 + (|makeByteWordVec2| 95 '(0 6 0 7 1 6 10 0 11 1 6 0 10 12 1 6 13 0 14 1 6 10 0 17 1 19 0 18 20 1 24 23 0 25 2 22 13 26 0 27 1 6 0 0 28 2 @@ -602,16 +603,16 @@ 18 50 2 6 13 0 0 51 0 6 0 54 1 6 55 18 56 1 55 35 0 57 2 55 58 10 0 59 2 6 0 0 0 60 1 64 62 63 65 1 18 66 0 67 - 1 68 48 0 69 3 70 58 6 6 35 71 1 75 - 74 73 76 1 77 74 73 78 0 73 0 79 2 73 - 13 0 0 80 0 74 0 81 2 77 84 73 13 85 - 1 73 0 6 86 2 74 0 73 18 87 2 74 0 0 - 0 88 0 74 0 89 2 74 0 73 0 90 2 91 0 - 0 0 92 1 0 13 0 52 1 0 10 0 53 1 0 19 - 0 21 1 0 15 0 16 0 0 0 9 2 0 93 93 93 - 94 1 0 35 0 61 2 0 58 0 0 72 1 0 0 0 - 8 0 0 0 46 1 0 32 33 34 1 0 0 0 39 1 - 0 15 0 40))))) + 1 68 48 0 69 3 70 58 6 6 35 71 2 18 0 + 35 0 72 1 76 75 74 77 1 78 75 74 79 0 + 74 0 80 2 74 13 0 0 81 0 75 0 82 2 78 + 85 74 13 86 1 74 0 6 87 2 75 0 74 18 + 88 2 75 0 0 0 89 0 75 0 90 2 75 0 74 + 0 91 2 92 0 0 0 93 1 0 13 0 52 1 0 10 + 0 53 1 0 19 0 21 1 0 15 0 16 0 0 0 9 + 2 0 94 94 94 95 1 0 35 0 61 2 0 58 0 + 0 73 1 0 0 0 8 0 0 0 46 1 0 32 33 34 + 1 0 0 0 39 1 0 15 0 40))))) '|lookupComplete|)) (SETQ |$CategoryFrame| @@ -632,7 +633,7 @@ ((|nextItem| ((|Union| $ "failed") $)) T (ELT $ 16)) ((|discreteLog| ((|Union| (|NonNegativeInteger|) "failed") $ $)) - T (ELT $ 72)) + T (ELT $ 73)) ((|order| ((|OnePointCompletion| (|PositiveInteger|)) $)) T (ELT $ 21)) ((|charthRoot| ((|Union| $ "failed") $)) T (ELT $ 40)) @@ -640,7 +641,7 @@ ((|SparseUnivariatePolynomial| $) (|SparseUnivariatePolynomial| $) (|SparseUnivariatePolynomial| $))) - T (ELT $ 94))) + T (ELT $ 95))) (|addModemap| '|FiniteFieldCategory&| '(|FiniteFieldCategory&| |#1|) '((CATEGORY |domain| -- cgit v1.2.3