diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-09-01 16:23:42 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-09-01 16:23:42 +0000 |
| commit | 00796f7b8bc97b964a01d647487214579f91775a (patch) | |
| tree | a8ff76fd793331b7810dc0bbcdba472680c51697 /src/algebra/strap | |
| parent | 25f1c7c591229dcd84d651542e33a24fc13f837c (diff) | |
| download | open-axiom-00796f7b8bc97b964a01d647487214579f91775a.tar.gz | |
2008-09-01 Martin Rubey <martin.rubey@univie.ac.at>
Gabriel Dos Reis <gdr@cs.tamu.edu>
Fix AW/431
* algebra/ore.spad.pamphlet (SpareUnivariateSkewPolynomial):
Implement **.
2008-09-01 Gabriel Dos Reis <gdr@cs.tamu.edu>
Make ^ an alias for **.
* interp/postpar.boot (postAtom): Replace "^" with "**".
* interp/format.boot (reportOpSymbol): Announce that "^" is an
alias for "**".
* interp/nrungo.boot (compiledLookup): Be sure to look for "**"
when operation is "^".
* interp/define.boot (noteCapsuleFunctionDefinition): New.
(clearCapsuleFunctionTable): Likewise.
(noteExport): Likewise.
(clearExportsTable): Likewise.
(compDefineCapsuleFunction): Rename "^" to "**". Take a note
of the capsule function being compiled.
(compCapsule): Clear previous capsule functions table.
(doItIf): Keep track of predicate validity.
(compCategory): Clear previous exports table.
(compCategoryItem): Take notes of declared attributes and signatures.
* algebra/catdef.spad.pamphlet (DivisionRing): Remove duplicate
definition for "^".
(Group): Likewise.
(Monoid): Likewise.
(SemiGroup): Likewise.
* algebra/poly.spad.pamphlet (PolynomialRing): Remove duplicate
definitins of "^".
(SparseUnivariatePolynomial): Likewise.
* algebra/multpoly.spad.pamphlet (SparseMultivariatePolynomial):
Remove duplicate definitions for "^".
* algebra/interval.spad.pamphlet (Interval): Remove duplicate
definition for "^".
* algebra/curve.spad.pamphlet (FunctionFieldCategory): Remove
duplicate declaration for represents.
* algebra/strap/: Update cached Lisp translations.
* share/algebra: Update databases.
Diffstat (limited to 'src/algebra/strap')
| -rw-r--r-- | src/algebra/strap/DFLOAT.lsp | 87 | ||||
| -rw-r--r-- | src/algebra/strap/DIVRING-.lsp | 72 | ||||
| -rw-r--r-- | src/algebra/strap/DIVRING.lsp | 1 | ||||
| -rw-r--r-- | src/algebra/strap/INT.lsp | 64 | ||||
| -rw-r--r-- | src/algebra/strap/MONOID-.lsp | 59 | ||||
| -rw-r--r-- | src/algebra/strap/MONOID.lsp | 1 | ||||
| -rw-r--r-- | src/algebra/strap/NNI.lsp | 29 | ||||
| -rw-r--r-- | src/algebra/strap/PI.lsp | 16 | ||||
| -rw-r--r-- | src/algebra/strap/SINT.lsp | 91 |
9 files changed, 188 insertions, 232 deletions
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index 878da4c3..43c27b6f 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -706,15 +706,14 @@ (79 . *) (85 . |coerce|) (90 . |zero?|) (95 . |negative?|) (100 . |One|) (104 . =) (110 . |numer|) (115 . |denom|) |DFLOAT;**;$F$;85| (|PatternMatchResult| 102 $) - (|Pattern| 102) (|Factored| $) (|List| $) - (|Union| 133 '"failed") + (|Pattern| 102) (|Factored| $) + (|Record| (|:| |coef1| $) (|:| |coef2| $)) + (|Union| 133 '"failed") (|List| $) (|Union| 135 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) - (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 136 '"failed") (|Record| (|:| |quotient| $) (|:| |remainder| $)) - (|Record| (|:| |coef| 133) (|:| |generator| $)) (|SparseUnivariatePolynomial| $) + (|Record| (|:| |coef| 135) (|:| |generator| $)) (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) (|SingleInteger|)) @@ -740,10 +739,10 @@ |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) + |acoth| 674 |acot| 679 |acosh| 684 |acos| 689 |abs| 694 + |Zero| 699 |One| 703 |OMwrite| 707 |Gamma| 731 D 736 + |Beta| 747 >= 753 > 759 = 765 <= 771 < 777 / 783 - 795 + + 806 ** 812 * 842) '((|approximate| . 0) (|canonicalsClosed| . 0) (|canonicalUnitNormal| . 0) (|noZeroDivisors| . 0) ((|commutative| "*") . 0) (|rightUnitary| . 0) @@ -828,45 +827,44 @@ 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 + 0 106 106 107 2 0 0 0 0 1 1 0 140 135 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 + 20 0 88 2 0 136 135 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 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))))) + 2 0 0 0 0 1 1 0 0 135 1 1 0 7 0 1 1 0 + 0 0 1 1 0 26 0 90 1 0 142 0 1 2 0 139 + 139 139 1 1 0 0 135 1 2 0 0 0 0 1 1 0 + 0 0 1 1 0 0 0 1 2 0 0 26 26 1 3 0 0 + 26 26 24 100 1 0 132 0 1 3 0 134 0 0 + 0 1 2 0 137 0 0 1 2 0 91 0 0 1 2 0 + 136 135 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 15 0 101 1 0 102 + 0 104 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 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 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))))) '|lookupComplete|)) (SETQ |$CategoryFrame| @@ -997,7 +995,6 @@ ((* ($ (|Fraction| (|Integer|)) $)) T (ELT $ NIL)) ((* ($ $ (|Fraction| (|Integer|)))) T (ELT $ NIL)) ((** ($ $ (|Integer|))) T (ELT $ 58)) - ((^ ($ $ (|Integer|))) T (ELT $ NIL)) ((|inv| ($ $)) T (ELT $ NIL)) ((|prime?| ((|Boolean|) $)) T (ELT $ NIL)) ((|squareFree| ((|Factored| $) $)) T (ELT $ NIL)) @@ -1059,11 +1056,9 @@ ((|One| ($)) T (CONST $ 37)) ((|one?| ((|Boolean|) $)) T (ELT $ NIL)) ((** ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) - ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) ((|recip| ((|Union| $ "failed") $)) T (ELT $ 92)) ((* ($ $ $)) T (ELT $ 50)) ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) - ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) ((* ($ (|Integer|) $)) T (ELT $ 51)) ((- ($ $ $)) T (ELT $ 49)) ((- ($ $)) T (ELT $ 47)) ((|subtractIfCan| ((|Union| $ "failed") $ $)) T diff --git a/src/algebra/strap/DIVRING-.lsp b/src/algebra/strap/DIVRING-.lsp index 88bef6a2..21f2fc94 100644 --- a/src/algebra/strap/DIVRING-.lsp +++ b/src/algebra/strap/DIVRING-.lsp @@ -1,28 +1,25 @@ (/VERSIONCHECK 2) -(DEFUN |DIVRING-;^;SIS;1| (|x| |n| $) - (SPADCALL |x| |n| (|getShellEntry| $ 8))) - -(DEFUN |DIVRING-;**;SIS;2| (|x| |n| $) +(DEFUN |DIVRING-;**;SIS;1| (|x| |n| $) (COND - ((ZEROP |n|) (|spadConstant| $ 10)) - ((SPADCALL |x| (|getShellEntry| $ 12)) + ((ZEROP |n|) (|spadConstant| $ 7)) + ((SPADCALL |x| (|getShellEntry| $ 9)) (COND ((< |n| 0) (|error| "division by zero")) ('T |x|))) ((< |n| 0) - (SPADCALL (SPADCALL |x| (|getShellEntry| $ 14)) (- |n|) - (|getShellEntry| $ 17))) - ('T (SPADCALL |x| |n| (|getShellEntry| $ 17))))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 11)) (- |n|) + (|getShellEntry| $ 14))) + ('T (SPADCALL |x| |n| (|getShellEntry| $ 14))))) -(DEFUN |DIVRING-;*;F2S;3| (|q| |x| $) +(DEFUN |DIVRING-;*;F2S;2| (|q| |x| $) (SPADCALL - (SPADCALL (SPADCALL |q| (|getShellEntry| $ 20)) + (SPADCALL (SPADCALL |q| (|getShellEntry| $ 18)) (SPADCALL - (SPADCALL (SPADCALL |q| (|getShellEntry| $ 21)) - (|getShellEntry| $ 22)) - (|getShellEntry| $ 14)) - (|getShellEntry| $ 23)) - |x| (|getShellEntry| $ 24))) + (SPADCALL (SPADCALL |q| (|getShellEntry| $ 19)) + (|getShellEntry| $ 20)) + (|getShellEntry| $ 11)) + (|getShellEntry| $ 21)) + |x| (|getShellEntry| $ 22))) (DEFUN |DivisionRing&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -30,7 +27,7 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|DivisionRing&|)) (LETT |dv$| (LIST '|DivisionRing&| |dv$1|) . #0#) - (LETT $ (|newShell| 27) . #0#) + (LETT $ (|newShell| 25) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -39,42 +36,36 @@ $)))) (MAKEPROP '|DivisionRing&| '|infovec| - (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|Integer|) - (0 . **) |DIVRING-;^;SIS;1| (6 . |One|) (|Boolean|) - (10 . |zero?|) (15 . |Zero|) (19 . |inv|) - (|PositiveInteger|) (|RepeatedSquaring| 6) (24 . |expt|) - |DIVRING-;**;SIS;2| (|Fraction| 7) (30 . |numer|) - (35 . |denom|) (40 . |coerce|) (45 . *) (51 . *) - |DIVRING-;*;F2S;3| (|NonNegativeInteger|)) - '#(^ 57 ** 63 * 69) 'NIL + (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |One|) + (|Boolean|) (4 . |zero?|) (9 . |Zero|) (13 . |inv|) + (|PositiveInteger|) (|RepeatedSquaring| 6) (18 . |expt|) + (|Integer|) |DIVRING-;**;SIS;1| (|Fraction| 15) + (24 . |numer|) (29 . |denom|) (34 . |coerce|) (39 . *) + (45 . *) |DIVRING-;*;F2S;2| (|NonNegativeInteger|)) + '#(** 51 * 57) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 25 - '(2 6 0 0 7 8 0 6 0 10 1 6 11 0 12 0 6 - 0 13 1 6 0 0 14 2 16 6 6 15 17 1 19 7 - 0 20 1 19 7 0 21 1 6 0 7 22 2 6 0 7 0 - 23 2 6 0 0 0 24 2 0 0 0 7 9 2 0 0 0 7 - 18 2 0 0 19 0 25))))) + (|makeByteWordVec2| 23 + '(0 6 0 7 1 6 8 0 9 0 6 0 10 1 6 0 0 11 + 2 13 6 6 12 14 1 17 15 0 18 1 17 15 0 + 19 1 6 0 15 20 2 6 0 15 0 21 2 6 0 0 + 0 22 2 0 0 0 15 16 2 0 0 17 0 23))))) '|lookupComplete|)) (SETQ |$CategoryFrame| (|put| '|DivisionRing&| '|isFunctor| - '(((^ ($ $ (|Integer|))) T (ELT $ 9)) - ((** ($ $ (|Integer|))) T (ELT $ 18)) + '(((** ($ $ (|Integer|))) T (ELT $ 16)) ((* ($ $ (|Fraction| (|Integer|)))) T (ELT $ NIL)) - ((* ($ (|Fraction| (|Integer|)) $)) T (ELT $ 25)) + ((* ($ (|Fraction| (|Integer|)) $)) T (ELT $ 23)) ((** ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) - ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) ((* ($ $ $)) T (ELT $ NIL)) ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) - ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) ((* ($ (|Integer|) $)) T (ELT $ NIL)) ((* ($ (|NonNegativeInteger|) $)) T (ELT $ NIL)) ((* ($ (|PositiveInteger|) $)) T (ELT $ NIL))) (|addModemap| '|DivisionRing&| '(|DivisionRing&| |#1|) '((CATEGORY |domain| - (SIGNATURE ^ (|#1| |#1| (|Integer|))) (SIGNATURE ** (|#1| |#1| (|Integer|))) (SIGNATURE * (|#1| |#1| (|Fraction| (|Integer|)))) @@ -82,10 +73,8 @@ (|#1| (|Fraction| (|Integer|)) |#1|)) (SIGNATURE ** (|#1| |#1| (|NonNegativeInteger|))) - (SIGNATURE ^ (|#1| |#1| (|NonNegativeInteger|))) (SIGNATURE * (|#1| |#1| |#1|)) (SIGNATURE ** (|#1| |#1| (|PositiveInteger|))) - (SIGNATURE ^ (|#1| |#1| (|PositiveInteger|))) (SIGNATURE * (|#1| (|Integer|) |#1|)) (SIGNATURE * (|#1| (|NonNegativeInteger|) |#1|)) (SIGNATURE * (|#1| (|PositiveInteger|) |#1|))) @@ -94,7 +83,6 @@ (|put| '|DivisionRing&| '|mode| '(|Mapping| (CATEGORY |domain| - (SIGNATURE ^ (|#1| |#1| (|Integer|))) (SIGNATURE ** (|#1| |#1| (|Integer|))) (SIGNATURE * (|#1| |#1| @@ -104,13 +92,9 @@ |#1|)) (SIGNATURE ** (|#1| |#1| (|NonNegativeInteger|))) - (SIGNATURE ^ - (|#1| |#1| (|NonNegativeInteger|))) (SIGNATURE * (|#1| |#1| |#1|)) (SIGNATURE ** (|#1| |#1| (|PositiveInteger|))) - (SIGNATURE ^ - (|#1| |#1| (|PositiveInteger|))) (SIGNATURE * (|#1| (|Integer|) |#1|)) (SIGNATURE * (|#1| (|NonNegativeInteger|) |#1|)) diff --git a/src/algebra/strap/DIVRING.lsp b/src/algebra/strap/DIVRING.lsp index ca4bf2ab..dbe30695 100644 --- a/src/algebra/strap/DIVRING.lsp +++ b/src/algebra/strap/DIVRING.lsp @@ -19,7 +19,6 @@ (|Join| (|EntireRing|) (|Algebra| '#1#) (|mkCategory| '|domain| '(((** ($ $ (|Integer|))) T) - ((^ ($ $ (|Integer|))) T) ((|inv| ($ $)) T)) NIL '((|Integer|)) NIL))) |DivisionRing|) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index 27b4a15a..61a4dfb8 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -396,15 +396,15 @@ (121 . |unitCanonical|) (|List| 94) (|HeuGcd| 94) (126 . |gcd|) (|SparseUnivariatePolynomial| $) |INT;gcdPolynomial;3Sup;58| (|Fraction| 11) - (|Union| 119 '"failed") (|PatternMatchResult| 11 $) - (|Pattern| 11) (|Union| 11 '"failed") (|List| $) + (|Union| 119 '"failed") (|Pattern| 11) + (|PatternMatchResult| 11 $) (|Union| 11 '"failed") + (|List| $) (|Record| (|:| |coef| 124) (|:| |generator| $)) (|Union| 124 '"failed") - (|Record| (|:| |coef| 124) (|:| |generator| $)) - (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 127 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) - (|PositiveInteger|) (|SingleInteger|)) + (|Record| (|:| |coef1| $) (|:| |coef2| $)) + (|Union| 128 '"failed") (|PositiveInteger|) + (|SingleInteger|)) '#(~= 131 |zero?| 137 |unitNormal| 142 |unitCanonical| 147 |unit?| 152 |symmetricRemainder| 157 |subtractIfCan| 163 |submod| 169 |squareFreePart| 176 |squareFree| 181 @@ -423,9 +423,9 @@ |euclideanSize| 463 |divide| 468 |differentiate| 474 |dec| 485 |copy| 490 |convert| 495 |coerce| 525 |characteristic| 545 |bit?| 549 |binomial| 555 |base| 561 |associates?| 565 - |addmod| 571 |abs| 578 ^ 583 |Zero| 595 |One| 599 - |OMwrite| 603 D 627 >= 638 > 644 = 650 <= 656 < 662 - 668 - + 679 ** 685 * 697) + |addmod| 571 |abs| 578 |Zero| 583 |One| 587 |OMwrite| 591 + D 615 >= 626 > 632 = 638 <= 644 < 650 - 656 + 667 ** 673 * + 685) '((|infinite| . 0) (|noetherian| . 0) (|canonicalsClosed| . 0) (|canonical| . 0) (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0) @@ -472,7 +472,7 @@ (|ConvertibleTo| 9) (|ConvertibleTo| 44) (|ConvertibleTo| 47) (|CombinatorialFunctionCategory|) - (|ConvertibleTo| 122) + (|ConvertibleTo| 121) (|ConvertibleTo| 49) (|RetractableTo| 11) (|ConvertibleTo| 11) (|BasicType|) @@ -492,37 +492,37 @@ 0 0 1 2 0 82 0 0 1 3 0 0 0 0 0 42 1 0 0 0 1 1 0 103 0 1 2 0 21 0 0 1 1 0 11 0 1 2 0 0 0 0 81 0 0 0 1 1 0 123 0 1 - 1 0 11 0 1 2 0 0 0 0 80 2 0 59 56 60 - 61 1 0 55 56 57 1 0 82 0 84 1 0 120 0 + 1 0 11 0 1 2 0 0 0 0 80 1 0 55 56 57 + 2 0 59 56 60 61 1 0 82 0 84 1 0 120 0 1 1 0 21 0 1 1 0 119 0 1 1 0 0 0 64 0 - 0 0 63 2 0 0 0 0 79 1 0 126 124 1 1 0 + 0 0 63 2 0 0 0 0 79 1 0 125 124 1 1 0 21 0 1 3 0 0 0 0 0 1 2 0 0 0 0 54 1 0 - 21 0 1 2 0 0 0 0 1 3 0 121 0 122 121 + 21 0 1 2 0 0 0 0 1 3 0 122 0 121 122 1 1 0 21 0 26 1 0 21 0 74 1 0 82 0 1 - 1 0 21 0 34 2 0 125 124 0 1 3 0 0 0 0 + 1 0 21 0 34 2 0 126 124 0 1 3 0 0 0 0 0 43 2 0 0 0 0 76 2 0 0 0 0 75 1 0 0 - 0 1 1 0 0 0 40 1 0 0 124 1 2 0 0 0 0 + 0 1 1 0 0 0 40 2 0 0 0 0 1 1 0 0 124 1 1 0 9 0 53 2 0 0 0 0 1 0 0 0 1 1 0 0 0 31 1 0 0 0 33 1 0 131 0 1 2 0 117 117 117 118 2 0 0 0 0 85 1 0 0 124 1 - 1 0 0 0 1 1 0 103 0 104 3 0 128 0 0 0 - 1 2 0 129 0 0 1 2 0 82 0 0 83 2 0 125 + 1 0 0 0 1 1 0 103 0 104 2 0 127 0 0 1 + 3 0 129 0 0 0 1 2 0 82 0 0 83 2 0 126 124 0 1 1 0 21 0 1 1 0 72 0 1 2 0 77 0 0 78 1 0 0 0 1 2 0 0 0 72 1 1 0 0 0 - 32 1 0 0 0 30 1 0 9 0 52 1 0 47 0 48 - 1 0 44 0 46 1 0 49 0 51 1 0 122 0 1 1 - 0 11 0 39 1 0 0 11 38 1 0 0 11 38 1 0 - 0 0 1 1 0 35 0 37 0 0 72 1 2 0 21 0 0 + 32 1 0 0 0 30 1 0 9 0 52 1 0 44 0 46 + 1 0 47 0 48 1 0 121 0 1 1 0 49 0 51 1 + 0 11 0 39 1 0 0 11 38 1 0 0 0 1 1 0 0 + 11 38 1 0 35 0 37 0 0 72 1 2 0 21 0 0 1 2 0 0 0 0 1 0 0 0 29 2 0 21 0 0 1 3 - 0 0 0 0 0 41 1 0 0 0 62 2 0 0 0 72 1 - 2 0 0 0 130 1 0 0 0 27 0 0 0 28 3 0 6 - 7 0 21 24 2 0 9 0 21 22 2 0 6 7 0 23 - 1 0 9 0 20 1 0 0 0 1 2 0 0 0 72 1 2 0 - 21 0 0 1 2 0 21 0 0 1 2 0 21 0 0 65 2 - 0 21 0 0 1 2 0 21 0 0 66 2 0 0 0 0 69 - 1 0 0 0 67 2 0 0 0 0 68 2 0 0 0 72 73 - 2 0 0 0 130 1 2 0 0 0 0 70 2 0 0 11 0 - 71 2 0 0 72 0 1 2 0 0 130 0 1))))) + 0 0 0 0 0 41 1 0 0 0 62 0 0 0 27 0 0 + 0 28 3 0 6 7 0 21 24 2 0 9 0 21 22 2 + 0 6 7 0 23 1 0 9 0 20 1 0 0 0 1 2 0 0 + 0 72 1 2 0 21 0 0 1 2 0 21 0 0 1 2 0 + 21 0 0 65 2 0 21 0 0 1 2 0 21 0 0 66 + 2 0 0 0 0 69 1 0 0 0 67 2 0 0 0 0 68 + 2 0 0 0 72 73 2 0 0 0 130 1 2 0 0 0 0 + 70 2 0 0 11 0 71 2 0 0 72 0 1 2 0 0 + 130 0 1))))) '|lookupComplete|)) (SETQ |$CategoryFrame| @@ -661,11 +661,9 @@ ((|One| ($)) T (CONST $ 28)) ((|one?| ((|Boolean|) $)) T (ELT $ 26)) ((** ($ $ (|NonNegativeInteger|))) T (ELT $ 73)) - ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) ((|recip| ((|Union| $ "failed") $)) T (ELT $ 84)) ((* ($ $ $)) T (ELT $ 70)) ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) - ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) ((* ($ (|Integer|) $)) T (ELT $ 71)) ((- ($ $ $)) T (ELT $ 69)) ((- ($ $)) T (ELT $ 67)) ((|subtractIfCan| ((|Union| $ "failed") $ $)) T diff --git a/src/algebra/strap/MONOID-.lsp b/src/algebra/strap/MONOID-.lsp index cd87b5fc..399e1f43 100644 --- a/src/algebra/strap/MONOID-.lsp +++ b/src/algebra/strap/MONOID-.lsp @@ -1,24 +1,21 @@ (/VERSIONCHECK 2) -(DEFUN |MONOID-;^;SNniS;1| (|x| |n| $) - (SPADCALL |x| |n| (|getShellEntry| $ 8))) +(DEFUN |MONOID-;one?;SB;1| (|x| $) + (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9))) -(DEFUN |MONOID-;one?;SB;2| (|x| $) - (SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 12))) +(DEFUN |MONOID-;sample;S;2| ($) (|spadConstant| $ 7)) -(DEFUN |MONOID-;sample;S;3| ($) (|spadConstant| $ 10)) - -(DEFUN |MONOID-;recip;SU;4| (|x| $) +(DEFUN |MONOID-;recip;SU;3| (|x| $) (COND - ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 12)) + ((SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9)) (CONS 0 |x|)) ('T (CONS 1 "failed")))) -(DEFUN |MONOID-;**;SNniS;5| (|x| |n| $) +(DEFUN |MONOID-;**;SNniS;4| (|x| |n| $) (COND - ((ZEROP |n|) (|spadConstant| $ 10)) - ('T (SPADCALL |x| |n| (|getShellEntry| $ 19))))) + ((ZEROP |n|) (|spadConstant| $ 7)) + ('T (SPADCALL |x| |n| (|getShellEntry| $ 16))))) (DEFUN |Monoid&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -26,7 +23,7 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|Monoid&|)) (LETT |dv$| (LIST '|Monoid&| |dv$1|) . #0#) - (LETT $ (|newShell| 21) . #0#) + (LETT $ (|newShell| 19) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -35,41 +32,37 @@ $)))) (MAKEPROP '|Monoid&| '|infovec| - (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) - (|NonNegativeInteger|) (0 . **) |MONOID-;^;SNniS;1| - (6 . |One|) (|Boolean|) (10 . =) |MONOID-;one?;SB;2| - |MONOID-;sample;S;3| (|Union| $ '"failed") - |MONOID-;recip;SU;4| (|PositiveInteger|) - (|RepeatedSquaring| 6) (16 . |expt|) |MONOID-;**;SNniS;5|) - '#(|sample| 22 |recip| 26 |one?| 31 ^ 36 ** 42) 'NIL + (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |One|) + (|Boolean|) (4 . =) |MONOID-;one?;SB;1| + |MONOID-;sample;S;2| (|Union| $ '"failed") + |MONOID-;recip;SU;3| (|PositiveInteger|) + (|RepeatedSquaring| 6) (10 . |expt|) + (|NonNegativeInteger|) |MONOID-;**;SNniS;4|) + '#(|sample| 16 |recip| 20 |one?| 25 ** 30) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 20 - '(2 6 0 0 7 8 0 6 0 10 2 6 11 0 0 12 2 - 18 6 6 17 19 0 0 0 14 1 0 15 0 16 1 0 - 11 0 13 2 0 0 0 7 9 2 0 0 0 7 20))))) + (|makeByteWordVec2| 18 + '(0 6 0 7 2 6 8 0 0 9 2 15 6 6 14 16 0 + 0 0 11 1 0 12 0 13 1 0 8 0 10 2 0 0 0 + 17 18))))) '|lookupComplete|)) (SETQ |$CategoryFrame| (|put| '|Monoid&| '|isFunctor| - '(((|recip| ((|Union| $ "failed") $)) T (ELT $ 16)) - ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ 9)) - ((** ($ $ (|NonNegativeInteger|))) T (ELT $ 20)) - ((|one?| ((|Boolean|) $)) T (ELT $ 13)) - ((|sample| ($)) T (ELT $ 14)) - ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) + '(((|recip| ((|Union| $ "failed") $)) T (ELT $ 13)) + ((** ($ $ (|NonNegativeInteger|))) T (ELT $ 18)) + ((|one?| ((|Boolean|) $)) T (ELT $ 10)) + ((|sample| ($)) T (ELT $ 11)) ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL))) (|addModemap| '|Monoid&| '(|Monoid&| |#1|) '((CATEGORY |domain| (SIGNATURE |recip| ((|Union| |#1| "failed") |#1|)) - (SIGNATURE ^ (|#1| |#1| (|NonNegativeInteger|))) (SIGNATURE ** (|#1| |#1| (|NonNegativeInteger|))) (SIGNATURE |one?| ((|Boolean|) |#1|)) (SIGNATURE |sample| (|#1|)) - (SIGNATURE ^ (|#1| |#1| (|PositiveInteger|))) (SIGNATURE ** (|#1| |#1| (|PositiveInteger|)))) (|Monoid|)) T '|Monoid&| @@ -78,14 +71,10 @@ (CATEGORY |domain| (SIGNATURE |recip| ((|Union| |#1| "failed") |#1|)) - (SIGNATURE ^ - (|#1| |#1| (|NonNegativeInteger|))) (SIGNATURE ** (|#1| |#1| (|NonNegativeInteger|))) (SIGNATURE |one?| ((|Boolean|) |#1|)) (SIGNATURE |sample| (|#1|)) - (SIGNATURE ^ - (|#1| |#1| (|PositiveInteger|))) (SIGNATURE ** (|#1| |#1| (|PositiveInteger|)))) (|Monoid|)) diff --git a/src/algebra/strap/MONOID.lsp b/src/algebra/strap/MONOID.lsp index b6c5ec92..47ce4776 100644 --- a/src/algebra/strap/MONOID.lsp +++ b/src/algebra/strap/MONOID.lsp @@ -17,7 +17,6 @@ ((|sample| ($) |constant|) T) ((|one?| ((|Boolean|) $)) T) ((** ($ $ (|NonNegativeInteger|))) T) - ((^ ($ $ (|NonNegativeInteger|))) T) ((|recip| ((|Union| $ "failed") $)) T)) NIL '((|NonNegativeInteger|) (|Boolean|)) diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index 10211893..35a0c86b 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -68,13 +68,13 @@ |NNI;shift;$I$;2| (|Union| $ '"failed") |NNI;subtractIfCan;2$U;3| (|Record| (|:| |quotient| $) (|:| |remainder| $)) - (|PositiveInteger|) (|Boolean|) (|NonNegativeInteger|) - (|SingleInteger|) (|String|) (|OutputForm|)) + (|PositiveInteger|) (|NonNegativeInteger|) (|Boolean|) + (|String|) (|OutputForm|) (|SingleInteger|)) '#(~= 0 |zero?| 6 |sup| 11 |subtractIfCan| 17 |shift| 23 |sample| 29 |rem| 33 |recip| 39 |random| 44 |quo| 49 |one?| 55 |min| 60 |max| 66 |latex| 72 |hash| 77 |gcd| 82 - |exquo| 88 |divide| 94 |coerce| 100 ^ 105 |Zero| 117 |One| - 121 >= 125 > 131 = 137 <= 143 < 149 + 155 ** 161 * 173) + |exquo| 88 |divide| 94 |coerce| 100 |Zero| 105 |One| 109 + >= 113 > 119 = 125 <= 131 < 137 + 143 ** 149 * 161) '(((|commutative| "*") . 0)) (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0)) (CONS '#(NIL NIL NIL NIL NIL |Monoid&| |AbelianMonoid&| @@ -88,19 +88,18 @@ (|AbelianMonoid|) (|OrderedSet|) (|SemiGroup|) (|AbelianSemiGroup|) (|SetCategory|) (|BasicType|) - (|CoercibleTo| 16)) + (|CoercibleTo| 15)) (|makeByteWordVec2| 16 - '(2 0 12 0 0 1 1 0 12 0 1 2 0 0 0 0 6 2 + '(2 0 13 0 0 1 1 0 13 0 1 2 0 0 0 0 6 2 0 8 0 0 9 2 0 0 0 5 7 0 0 0 1 2 0 0 0 0 1 1 0 8 0 1 1 0 0 0 1 2 0 0 0 0 1 1 - 0 12 0 1 2 0 0 0 0 1 2 0 0 0 0 1 1 0 - 15 0 1 1 0 14 0 1 2 0 0 0 0 1 2 0 8 0 - 0 1 2 0 10 0 0 1 1 0 16 0 1 2 0 0 0 - 11 1 2 0 0 0 13 1 0 0 0 1 0 0 0 1 2 0 - 12 0 0 1 2 0 12 0 0 1 2 0 12 0 0 1 2 - 0 12 0 0 1 2 0 12 0 0 1 2 0 0 0 0 1 2 - 0 0 0 11 1 2 0 0 0 13 1 2 0 0 0 0 1 2 - 0 0 13 0 1 2 0 0 11 0 1))))) + 0 13 0 1 2 0 0 0 0 1 2 0 0 0 0 1 1 0 + 14 0 1 1 0 16 0 1 2 0 0 0 0 1 2 0 8 0 + 0 1 2 0 10 0 0 1 1 0 15 0 1 0 0 0 1 0 + 0 0 1 2 0 13 0 0 1 2 0 13 0 0 1 2 0 + 13 0 0 1 2 0 13 0 0 1 2 0 13 0 0 1 2 + 0 0 0 0 1 2 0 0 0 11 1 2 0 0 0 12 1 2 + 0 0 0 0 1 2 0 0 12 0 1 2 0 0 11 0 1))))) '|lookupComplete|)) (SETQ |$CategoryFrame| @@ -117,11 +116,9 @@ ((|quo| ($ $ $)) T (ELT $ NIL)) ((* ($ $ $)) T (ELT $ NIL)) ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) - ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) ((|One| ($)) T (CONST $ NIL)) ((|one?| ((|Boolean|) $)) T (ELT $ NIL)) ((** ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) - ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) ((|recip| ((|Union| $ "failed") $)) T (ELT $ NIL)) ((|sup| ($ $ $)) T (ELT $ 6)) ((|subtractIfCan| ((|Union| $ "failed") $ $)) T diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp index 063678d6..719811d5 100644 --- a/src/algebra/strap/PI.lsp +++ b/src/algebra/strap/PI.lsp @@ -51,8 +51,8 @@ (|PositiveInteger|) (|Boolean|) (|Union| $ '"failed") (|SingleInteger|) (|String|) (|OutputForm|)) '#(~= 0 |sample| 6 |recip| 10 |one?| 15 |min| 20 |max| 26 - |latex| 32 |hash| 37 |gcd| 42 |coerce| 48 ^ 53 |One| 65 >= - 69 > 75 = 81 <= 87 < 93 + 99 ** 105 * 117) + |latex| 32 |hash| 37 |gcd| 42 |coerce| 48 |One| 53 >= 57 > + 63 = 69 <= 75 < 81 + 87 ** 93 * 105) '(((|commutative| "*") . 0)) (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0)) (CONS '#(NIL |Monoid&| |OrderedSet&| |SemiGroup&| @@ -65,11 +65,11 @@ (|makeByteWordVec2| 11 '(2 0 7 0 0 1 0 0 0 1 1 0 8 0 1 1 0 7 0 1 2 0 0 0 0 1 2 0 0 0 0 1 1 0 10 0 1 - 1 0 9 0 1 2 0 0 0 0 1 1 0 11 0 1 2 0 - 0 0 6 1 2 0 0 0 5 1 0 0 0 1 2 0 7 0 0 - 1 2 0 7 0 0 1 2 0 7 0 0 1 2 0 7 0 0 1 - 2 0 7 0 0 1 2 0 0 0 0 1 2 0 0 0 6 1 2 - 0 0 0 5 1 2 0 0 0 0 1 2 0 0 6 0 1))))) + 1 0 9 0 1 2 0 0 0 0 1 1 0 11 0 1 0 0 + 0 1 2 0 7 0 0 1 2 0 7 0 0 1 2 0 7 0 0 + 1 2 0 7 0 0 1 2 0 7 0 0 1 2 0 0 0 0 1 + 2 0 0 0 6 1 2 0 0 0 5 1 2 0 0 0 0 1 2 + 0 0 6 0 1))))) '|lookupComplete|)) (SETQ |$CategoryFrame| @@ -77,12 +77,10 @@ '(((|gcd| ($ $ $)) T (ELT $ NIL)) ((* ($ $ $)) T (ELT $ NIL)) ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) - ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) ((|One| ($)) T (CONST $ NIL)) ((|sample| ($)) T (CONST $ NIL)) ((|one?| ((|Boolean|) $)) T (ELT $ NIL)) ((** ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) - ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) ((|recip| ((|Union| $ "failed") $)) T (ELT $ NIL)) ((+ ($ $ $)) T (ELT $ NIL)) ((* ($ (|PositiveInteger|) $)) T (ELT $ NIL)) diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index f1b5503b..3dc9ea4f 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -332,17 +332,17 @@ (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) |SINT;unitNormal;$R;54| (|Fraction| 12) - (|Union| 86 '"failed") (|Union| $ '"failed") (|Float|) - (|DoubleFloat|) (|Pattern| 12) (|PatternMatchResult| 12 $) - (|InputForm|) (|Union| 12 '"failed") (|List| $) + (|Union| 86 '"failed") (|DoubleFloat|) + (|Union| $ '"failed") (|Float|) + (|PatternMatchResult| 12 $) (|Pattern| 12) (|InputForm|) + (|Union| 12 '"failed") (|List| $) (|Union| 95 '"failed") (|Record| (|:| |coef| 95) (|:| |generator| $)) - (|Union| 95 '"failed") + (|Record| (|:| |coef1| $) (|:| |coef2| $)) + (|Union| 98 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) - (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 99 '"failed") (|Factored| $) - (|SparseUnivariatePolynomial| $) (|PositiveInteger|) - (|SingleInteger|)) + (|Factored| $) (|SparseUnivariatePolynomial| $) + (|PositiveInteger|) (|SingleInteger|)) '#(~= 58 ~ 64 |zero?| 69 |xor| 74 |unitNormal| 80 |unitCanonical| 85 |unit?| 90 |symmetricRemainder| 95 |subtractIfCan| 101 |submod| 107 |squareFreePart| 114 @@ -362,9 +362,9 @@ |divide| 419 |differentiate| 425 |dec| 436 |copy| 441 |convert| 446 |coerce| 471 |characteristic| 491 |bit?| 495 |binomial| 501 |base| 507 |associates?| 511 |addmod| 517 - |abs| 524 ^ 529 |\\/| 541 |Zero| 547 |Or| 551 |One| 557 - |OMwrite| 561 |Not| 585 D 590 |And| 601 >= 607 > 613 = 619 - <= 625 < 631 |/\\| 637 - 643 + 654 ** 660 * 672) + |abs| 524 |\\/| 529 |Zero| 535 |Or| 539 |One| 545 + |OMwrite| 549 |Not| 573 D 578 |And| 589 >= 595 > 601 = 607 + <= 613 < 619 |/\\| 625 - 631 + 642 ** 648 * 660) '((|noetherian| . 0) (|canonicalsClosed| . 0) (|canonical| . 0) (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0) (|noZeroDivisors| . 0) @@ -407,10 +407,10 @@ (|OrderedSet|) (|AbelianSemiGroup|) (|SemiGroup|) (|Logic|) (|RealConstant|) (|SetCategory|) (|OpenMath|) - (|ConvertibleTo| 89) (|ConvertibleTo| 90) + (|ConvertibleTo| 88) (|CombinatorialFunctionCategory|) - (|ConvertibleTo| 91) + (|ConvertibleTo| 92) (|ConvertibleTo| 93) (|RetractableTo| 12) (|ConvertibleTo| 12) (|BasicType|) @@ -422,42 +422,41 @@ 12 29 0 30 1 0 0 12 33 2 0 22 0 0 1 1 0 0 0 41 1 0 22 0 65 2 0 0 0 0 48 1 0 84 0 85 1 0 0 0 1 1 0 22 0 1 2 0 0 0 - 0 1 2 0 88 0 0 1 3 0 0 0 0 0 74 1 0 0 + 0 1 2 0 89 0 0 1 3 0 0 0 0 0 74 1 0 0 0 1 1 0 101 0 1 2 0 22 0 0 1 1 0 12 0 1 2 0 0 0 0 71 0 0 0 1 1 0 94 0 1 1 0 - 12 0 1 2 0 0 0 0 59 1 0 26 27 28 2 0 - 77 27 78 79 1 0 88 0 1 1 0 87 0 1 1 0 - 22 0 1 1 0 86 0 1 1 0 0 0 83 0 0 0 82 - 2 0 0 0 0 58 1 0 96 95 1 1 0 22 0 1 3 + 12 0 1 2 0 0 0 0 59 2 0 77 27 78 79 1 + 0 26 27 28 1 0 89 0 1 1 0 87 0 1 1 0 + 22 0 1 1 0 86 0 1 0 0 0 82 1 0 0 0 83 + 2 0 0 0 0 58 1 0 97 95 1 1 0 22 0 1 3 0 0 0 0 0 1 2 0 0 0 0 80 1 0 22 0 1 2 - 0 0 0 0 1 3 0 92 0 91 92 1 1 0 22 0 - 66 1 0 22 0 64 1 0 0 0 42 1 0 88 0 1 - 1 0 22 0 75 2 0 97 95 0 1 3 0 0 0 0 0 + 0 0 0 0 1 3 0 91 0 92 91 1 1 0 22 0 + 66 1 0 22 0 64 1 0 0 0 42 1 0 89 0 1 + 1 0 22 0 75 2 0 96 95 0 1 3 0 0 0 0 0 72 0 0 0 39 2 0 0 0 0 68 0 0 0 38 2 0 - 0 0 0 67 1 0 0 0 1 1 0 0 0 70 1 0 0 - 95 1 2 0 0 0 0 1 1 0 10 0 1 2 0 0 0 0 - 1 0 0 0 1 1 0 0 0 50 1 0 0 0 69 1 0 - 104 0 1 2 0 102 102 102 1 1 0 0 95 1 - 2 0 0 0 0 62 1 0 0 0 1 1 0 101 0 1 2 - 0 98 0 0 1 3 0 100 0 0 0 1 2 0 88 0 0 - 1 2 0 97 95 0 1 1 0 22 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 51 1 0 0 0 1 1 0 89 0 1 1 0 - 90 0 1 1 0 91 0 1 1 0 93 0 1 1 0 12 0 - 32 1 0 0 12 81 1 0 0 0 1 1 0 0 12 81 - 1 0 29 0 31 0 0 56 1 2 0 22 0 0 1 2 0 - 0 0 0 1 0 0 0 37 2 0 22 0 0 1 3 0 0 0 - 0 0 73 1 0 0 0 63 2 0 0 0 56 1 2 0 0 - 0 103 1 2 0 0 0 0 44 0 0 0 35 2 0 0 0 - 0 47 0 0 0 36 3 0 7 8 0 22 25 2 0 10 - 0 22 23 2 0 7 8 0 24 1 0 10 0 21 1 0 - 0 0 45 1 0 0 0 1 2 0 0 0 56 1 2 0 0 0 - 0 46 2 0 22 0 0 1 2 0 22 0 0 1 2 0 22 - 0 0 40 2 0 22 0 0 1 2 0 22 0 0 49 2 0 - 0 0 0 43 1 0 0 0 52 2 0 0 0 0 54 2 0 - 0 0 0 53 2 0 0 0 56 57 2 0 0 0 103 1 - 2 0 0 0 0 55 2 0 0 12 0 34 2 0 0 56 0 - 1 2 0 0 103 0 1))))) + 0 0 0 67 1 0 0 0 1 1 0 0 0 70 2 0 0 0 + 0 1 1 0 0 95 1 1 0 10 0 1 2 0 0 0 0 1 + 0 0 0 1 1 0 0 0 50 1 0 0 0 69 1 0 104 + 0 1 2 0 102 102 102 1 2 0 0 0 0 62 1 + 0 0 95 1 1 0 0 0 1 1 0 101 0 1 3 0 99 + 0 0 0 1 2 0 100 0 0 1 2 0 89 0 0 1 2 + 0 96 95 0 1 1 0 22 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 51 1 0 0 0 1 1 0 88 0 1 1 0 90 0 + 1 1 0 93 0 1 1 0 92 0 1 1 0 12 0 32 1 + 0 0 12 81 1 0 0 12 81 1 0 0 0 1 1 0 + 29 0 31 0 0 56 1 2 0 22 0 0 1 2 0 0 0 + 0 1 0 0 0 37 2 0 22 0 0 1 3 0 0 0 0 0 + 73 1 0 0 0 63 2 0 0 0 0 44 0 0 0 35 2 + 0 0 0 0 47 0 0 0 36 3 0 7 8 0 22 25 2 + 0 10 0 22 23 2 0 7 8 0 24 1 0 10 0 21 + 1 0 0 0 45 1 0 0 0 1 2 0 0 0 56 1 2 0 + 0 0 0 46 2 0 22 0 0 1 2 0 22 0 0 1 2 + 0 22 0 0 40 2 0 22 0 0 1 2 0 22 0 0 + 49 2 0 0 0 0 43 1 0 0 0 52 2 0 0 0 0 + 54 2 0 0 0 0 53 2 0 0 0 56 57 2 0 0 0 + 103 1 2 0 0 0 0 55 2 0 0 12 0 34 2 0 + 0 56 0 1 2 0 0 103 0 1))))) '|lookupComplete|)) (SETQ |$CategoryFrame| @@ -603,11 +602,9 @@ ((|One| ($)) T (CONST $ 36)) ((|one?| ((|Boolean|) $)) T (ELT $ 66)) ((** ($ $ (|NonNegativeInteger|))) T (ELT $ 57)) - ((^ ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) ((|recip| ((|Union| $ "failed") $)) T (ELT $ NIL)) ((* ($ $ $)) T (ELT $ 55)) ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) - ((^ ($ $ (|PositiveInteger|))) T (ELT $ NIL)) ((* ($ (|Integer|) $)) T (ELT $ 34)) ((- ($ $ $)) T (ELT $ 54)) ((- ($ $)) T (ELT $ 52)) ((|subtractIfCan| ((|Union| $ "failed") $ $)) T |