diff options
author | dos-reis <gdr@axiomatics.org> | 2008-09-21 04:35:01 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2008-09-21 04:35:01 +0000 |
commit | efd27489ffb3778032742b14697166bc9bdef365 (patch) | |
tree | dd55176a6d286a694e3fea84ea0722f26f35cb6f /src/algebra | |
parent | fd8c12056474ecab97015eff9cdadd4bd77b5fd5 (diff) | |
download | open-axiom-efd27489ffb3778032742b14697166bc9bdef365.tar.gz |
Update algebra databases and algebra bootstrap Lisp files.
Diffstat (limited to 'src/algebra')
-rw-r--r-- | src/algebra/strap/BOOLEAN.lsp | 10 | ||||
-rw-r--r-- | src/algebra/strap/DFLOAT.lsp | 248 | ||||
-rw-r--r-- | src/algebra/strap/FFIELDC-.lsp | 235 | ||||
-rw-r--r-- | src/algebra/strap/INS.lsp | 1 | ||||
-rw-r--r-- | src/algebra/strap/INT.lsp | 305 | ||||
-rw-r--r-- | src/algebra/strap/SINT.lsp | 148 |
6 files changed, 464 insertions, 483 deletions
diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index f275dcd5..ebdb87c8 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -158,12 +158,12 @@ ((|false| ($)) T (CONST $ 8)) ((|true| ($)) T (CONST $ 7)) ((|convert| ((|InputForm|) $)) T (ELT $ 36)) - ((|equiv| ($ $ $)) T (ELT $ 21)) - ((|implies| ($ $ $)) T (ELT $ 20)) - ((|or| ($ $ $)) T (ELT $ 13)) + ((|not| ($ $)) T (ELT $ 9)) ((|and| ($ $ $)) T (ELT $ 11)) - ((|not| ($ $)) T (ELT $ 9)) ((~ ($ $)) T (ELT $ 10)) - ((|/\\| ($ $ $)) T (ELT $ 12)) + ((|or| ($ $ $)) T (ELT $ 13)) + ((|implies| ($ $ $)) T (ELT $ 20)) + ((|equiv| ($ $ $)) T (ELT $ 21)) + ((~ ($ $)) T (ELT $ 10)) ((|/\\| ($ $ $)) T (ELT $ 12)) ((|\\/| ($ $ $)) T (ELT $ 14)) ((|size| ((|NonNegativeInteger|))) T (ELT $ 24)) ((|index| ($ (|PositiveInteger|))) T (ELT $ 28)) diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index 88f168b4..ec08fcad 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -81,7 +81,7 @@ (FIX (SPADCALL (FLOAT-DIGITS 0.0) (SPADCALL (FLOAT (FLOAT-RADIX 0.0) - MOST-POSITIVE-LONG-FLOAT) + |$DoubleFloatMaximum|) (|getShellEntry| $ 30)) (|getShellEntry| $ 31))) |DFLOAT;bits;Pi;11|) @@ -293,9 +293,9 @@ (DEFUN |DFLOAT;zero?;$B;65| (|x| $) (ZEROP |x|)) -(PUT '|DFLOAT;hash;$I;66| '|SPADreplace| 'HASHEQ) +(PUT '|DFLOAT;hash;$Si;66| '|SPADreplace| 'HASHEQ) -(DEFUN |DFLOAT;hash;$I;66| (|x| $) (HASHEQ |x|)) +(DEFUN |DFLOAT;hash;$Si;66| (|x| $) (HASHEQ |x|)) (DEFUN |DFLOAT;recip;$U;67| (|x| $) (COND ((ZEROP |x|) (CONS 1 "failed")) ('T (CONS 0 (/ 1.0 |x|))))) @@ -305,10 +305,10 @@ (DEFUN |DFLOAT;differentiate;2$;68| (|x| $) 0.0) (DEFUN |DFLOAT;Gamma;2$;69| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 95))) + (SPADCALL |x| (|getShellEntry| $ 96))) (DEFUN |DFLOAT;Beta;3$;70| (|x| |y| $) - (SPADCALL |x| |y| (|getShellEntry| $ 97))) + (SPADCALL |x| |y| (|getShellEntry| $ 98))) (PUT '|DFLOAT;wholePart;$I;71| '|SPADreplace| 'FIX) @@ -322,10 +322,10 @@ (DEFUN |DFLOAT;convert;2$;73| (|x| $) |x|) (DEFUN |DFLOAT;convert;$F;74| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 103))) + (SPADCALL |x| (|getShellEntry| $ 104))) (DEFUN |DFLOAT;rationalApproximation;$NniF;75| (|x| |d| $) - (SPADCALL |x| |d| 10 (|getShellEntry| $ 107))) + (SPADCALL |x| |d| 10 (|getShellEntry| $ 108))) (DEFUN |DFLOAT;atan;3$;76| (|x| |y| $) (PROG (|theta|) @@ -354,7 +354,7 @@ (PROG1 (LETT #0# (- (FLOAT-DIGITS 0.0) 1) |DFLOAT;retract;$F;77|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (FLOAT-RADIX 0.0) (|getShellEntry| $ 107))))) + (FLOAT-RADIX 0.0) (|getShellEntry| $ 108))))) (DEFUN |DFLOAT;retractIfCan;$U;78| (|x| $) (PROG (#0=#:G1501) @@ -365,7 +365,7 @@ |DFLOAT;retractIfCan;$U;78|) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (FLOAT-RADIX 0.0) (|getShellEntry| $ 107)))))) + (FLOAT-RADIX 0.0) (|getShellEntry| $ 108)))))) (DEFUN |DFLOAT;retract;$I;79| (|x| $) (PROG (|n|) @@ -385,7 +385,7 @@ ('T (CONS 1 "failed")))))))) (DEFUN |DFLOAT;sign;$I;81| (|x| $) - (SPADCALL (FLOAT-SIGN |x| 1.0) (|getShellEntry| $ 113))) + (SPADCALL (FLOAT-SIGN |x| 1.0) (|getShellEntry| $ 114))) (PUT '|DFLOAT;abs;2$;82| '|SPADreplace| '(XLAM (|x|) (FLOAT-SIGN 1.0 |x|))) @@ -399,7 +399,7 @@ ((ZEROP |x|) (CONS 0 0)) ('T (SEQ (LETT |s| - (SPADCALL |x| (|getShellEntry| $ 116)) + (SPADCALL |x| (|getShellEntry| $ 117)) |DFLOAT;manexp|) (LETT |x| (FLOAT-SIGN 1.0 |x|) |DFLOAT;manexp|) @@ -421,7 +421,7 @@ (LETT |two53| (SPADCALL (FLOAT-RADIX 0.0) (FLOAT-DIGITS 0.0) - (|getShellEntry| $ 118)) + (|getShellEntry| $ 119)) |DFLOAT;manexp|) (EXIT (CONS (* |s| (FIX (* |two53| (QCAR |me|)))) @@ -499,14 +499,14 @@ (- (* |nu| |q2|) (* |de| |p2|))) (|getShellEntry| $ - 121)) + 122)) (* |de| (ABS |p2|)))) (EXIT (PROGN (LETT #1# (SPADCALL |p2| |q2| (|getShellEntry| $ - 120)) + 121)) |DFLOAT;rationalApproximation;$2NniF;84|) (GO #1#))))) (PROGN @@ -548,7 +548,7 @@ |DFLOAT;rationalApproximation;$2NniF;84|) (|check-subtype| (>= #2# 0) '(|NonNegativeInteger|) #2#)))) - (|getShellEntry| $ 122))))))) + (|getShellEntry| $ 123))))))) #1# (EXIT #1#))))) (DEFUN |DFLOAT;**;$F$;85| (|x| |r| $) @@ -557,27 +557,27 @@ (SEQ (EXIT (COND ((ZEROP |x|) (COND - ((SPADCALL |r| (|getShellEntry| $ 123)) - (|error| "0**0 is undefined")) ((SPADCALL |r| (|getShellEntry| $ 124)) + (|error| "0**0 is undefined")) + ((SPADCALL |r| (|getShellEntry| $ 125)) (|error| "division by 0")) ('T 0.0))) - ((OR (SPADCALL |r| (|getShellEntry| $ 123)) + ((OR (SPADCALL |r| (|getShellEntry| $ 124)) (= |x| 1.0)) 1.0) ('T (COND - ((SPADCALL |r| (|spadConstant| $ 125) - (|getShellEntry| $ 126)) + ((SPADCALL |r| (|spadConstant| $ 126) + (|getShellEntry| $ 127)) |x|) ('T (SEQ (LETT |n| (SPADCALL |r| - (|getShellEntry| $ 127)) + (|getShellEntry| $ 128)) |DFLOAT;**;$F$;85|) (LETT |d| (SPADCALL |r| - (|getShellEntry| $ 128)) + (|getShellEntry| $ 129)) |DFLOAT;**;$F$;85|) (EXIT (COND ((MINUSP |x|) @@ -589,14 +589,14 @@ (LETT #0# (- (SPADCALL (- |x|) |r| - (|getShellEntry| $ 129))) + (|getShellEntry| $ 130))) |DFLOAT;**;$F$;85|) (GO #0#))) ('T (PROGN (LETT #0# (SPADCALL (- |x|) |r| - (|getShellEntry| $ 129)) + (|getShellEntry| $ 130)) |DFLOAT;**;$F$;85|) (GO #0#))))) ('T (|error| "negative root")))) @@ -687,8 +687,9 @@ |DFLOAT;acsch;2$;60| |DFLOAT;acoth;2$;61| |DFLOAT;asech;2$;62| |DFLOAT;/;3$;63| |DFLOAT;negative?;$B;64| |DFLOAT;zero?;$B;65| - |DFLOAT;hash;$I;66| (|Union| $ '"failed") - |DFLOAT;recip;$U;67| |DFLOAT;differentiate;2$;68| + (|SingleInteger|) |DFLOAT;hash;$Si;66| + (|Union| $ '"failed") |DFLOAT;recip;$U;67| + |DFLOAT;differentiate;2$;68| (|DoubleFloatSpecialFunctions|) (47 . |Gamma|) |DFLOAT;Gamma;2$;69| (52 . |Beta|) |DFLOAT;Beta;3$;70| |DFLOAT;wholePart;$I;71| |DFLOAT;float;2IPi$;72| @@ -698,24 +699,23 @@ |DFLOAT;rationalApproximation;$2NniF;84| |DFLOAT;rationalApproximation;$NniF;75| |DFLOAT;atan;3$;76| |DFLOAT;retract;$F;77| - (|Union| 105 '"failed") |DFLOAT;retractIfCan;$U;78| + (|Union| 106 '"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 . **) (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| $) + |DFLOAT;**;$F$;85| (|PatternMatchResult| 103 $) + (|Pattern| 103) (|Factored| $) (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 133 '"failed") (|List| $) (|Union| 135 '"failed") + (|Union| 134 '"failed") (|List| $) (|Union| 136 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) (|Record| (|:| |quotient| $) (|:| |remainder| $)) (|SparseUnivariatePolynomial| $) - (|Record| (|:| |coef| 135) (|:| |generator| $)) + (|Record| (|:| |coef| 136) (|:| |generator| $)) (|Record| (|:| |unit| $) (|:| |canonical| $) - (|:| |associate| $)) - (|SingleInteger|)) + (|:| |associate| $))) '#(~= 120 |zero?| 126 |wholePart| 131 |unitNormal| 136 |unitCanonical| 141 |unit?| 146 |truncate| 151 |tanh| 156 |tan| 161 |subtractIfCan| 166 |squareFreePart| 172 @@ -728,20 +728,20 @@ |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 - |Zero| 699 |One| 703 |OMwrite| 707 |Gamma| 731 D 736 - |Beta| 747 >= 753 > 759 = 765 <= 771 < 777 / 783 - 795 + - 806 ** 812 * 842) + |inv| 395 |hash| 400 |gcdPolynomial| 405 |gcd| 411 + |fractionPart| 422 |floor| 427 |float| 432 |factor| 445 + |extendedEuclidean| 450 |exquo| 463 |expressIdealMember| + 469 |exponent| 475 |exp1| 480 |exp| 484 |euclideanSize| + 489 |doubleFloatFormat| 494 |divide| 499 |digits| 505 + |differentiate| 509 |csch| 520 |csc| 525 |coth| 530 |cot| + 535 |cosh| 540 |cos| 545 |convert| 550 |coerce| 570 + |characteristic| 600 |ceiling| 604 |bits| 609 |base| 613 + |atanh| 617 |atan| 622 |associates?| 633 |asinh| 639 + |asin| 644 |asech| 649 |asec| 654 |acsch| 659 |acsc| 664 + |acoth| 669 |acot| 674 |acosh| 679 |acos| 684 |abs| 689 + |Zero| 694 |One| 698 |OMwrite| 702 |Gamma| 726 D 731 + |Beta| 742 >= 748 > 754 = 760 <= 766 < 772 / 778 - 790 + + 801 ** 807 * 837) '((|approximate| . 0) (|canonicalsClosed| . 0) (|canonicalUnitNormal| . 0) (|noZeroDivisors| . 0) ((|commutative| "*") . 0) (|rightUnitary| . 0) @@ -774,14 +774,14 @@ (|PrincipalIdealDomain|) (|UniqueFactorizationDomain|) (|GcdDomain|) (|DivisionRing|) - (|IntegralDomain|) (|Algebra| 105) + (|IntegralDomain|) (|Algebra| 106) (|Algebra| $$) (|DifferentialRing|) (|CharacteristicZero|) (|OrderedRing|) - (|Module| 105) (|EntireRing|) + (|Module| 106) (|EntireRing|) (|CommutativeRing|) (|Module| $$) - (|BiModule| 105 105) (|BiModule| $$ $$) + (|BiModule| 106 106) (|BiModule| $$ $$) (|Ring|) (|OrderedAbelianGroup|) - (|RightModule| 105) (|LeftModule| 105) + (|RightModule| 106) (|LeftModule| 106) (|LeftModule| $$) (|Rng|) (|RightModule| $$) (|OrderedCancellationAbelianMonoid|) @@ -790,7 +790,7 @@ (|CancellationAbelianMonoid|) (|OrderedAbelianSemiGroup|) (|AbelianMonoid|) (|Monoid|) - (|PatternMatchable| 102) (|OrderedSet|) + (|PatternMatchable| 103) (|OrderedSet|) (|AbelianSemiGroup|) (|SemiGroup|) (|TranscendentalFunctionCategory|) (|RealConstant|) (|SetCategory|) @@ -800,70 +800,70 @@ (|HyperbolicFunctionCategory|) (|ArcTrigonometricFunctionCategory|) (|TrigonometricFunctionCategory|) - (|OpenMath|) (|ConvertibleTo| 131) + (|OpenMath|) (|ConvertibleTo| 132) (|RadicalCategory|) - (|RetractableTo| 105) + (|RetractableTo| 106) (|RetractableTo| 26) - (|ConvertibleTo| 102) + (|ConvertibleTo| 103) (|ConvertibleTo| 15) (|BasicType|) (|CoercibleTo| 40)) (|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 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 + 15 44 1 95 15 15 96 2 95 15 15 15 98 + 1 103 0 15 104 2 26 0 0 24 119 0 106 + 0 120 2 106 0 26 26 121 2 26 0 107 0 + 122 1 106 0 26 123 1 106 20 0 124 1 + 106 20 0 125 0 106 0 126 2 106 20 0 0 + 127 1 106 26 0 128 1 106 26 0 129 2 0 + 20 0 0 1 1 0 20 0 89 1 0 26 0 100 1 0 + 142 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 92 0 0 1 + 1 0 0 0 1 1 0 133 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 140 135 + 0 117 1 0 0 0 80 1 0 0 0 67 0 0 0 1 1 + 0 0 0 1 1 0 112 0 113 1 0 115 0 116 1 + 0 106 0 111 1 0 26 0 114 2 0 0 0 0 1 + 1 0 92 0 93 2 0 106 0 107 109 3 0 106 + 0 107 107 108 2 0 0 0 0 1 1 0 141 136 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 + 0 39 3 0 131 0 132 131 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 136 135 0 1 0 0 0 34 2 0 + 20 0 88 2 0 137 136 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 - 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))))) + 2 0 0 0 0 1 1 0 0 136 1 1 0 7 0 1 1 0 + 0 0 1 1 0 90 0 91 2 0 140 140 140 1 1 + 0 0 136 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 101 + 1 0 133 0 1 3 0 135 0 0 0 1 2 0 138 0 + 0 1 2 0 92 0 0 1 2 0 137 136 0 1 1 0 + 26 0 28 0 0 0 38 1 0 0 0 61 1 0 107 0 + 1 1 0 7 7 8 2 0 139 0 0 1 0 0 24 1 1 + 0 0 0 94 2 0 0 0 107 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 132 0 1 + 1 0 15 0 102 1 0 103 0 105 1 0 0 106 + 1 1 0 0 26 60 1 0 0 106 1 1 0 0 26 60 + 1 0 0 0 1 1 0 40 0 42 0 0 107 1 1 0 0 + 0 1 0 0 24 32 0 0 24 25 1 0 0 0 83 2 + 0 0 0 0 110 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 118 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 97 1 0 0 0 1 2 0 0 0 + 107 1 2 0 0 0 0 99 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 106 130 2 0 0 + 0 26 58 2 0 0 0 107 1 2 0 0 0 24 1 2 + 0 0 0 106 1 2 0 0 106 0 1 2 0 0 0 0 + 50 2 0 0 26 0 51 2 0 0 107 0 1 2 0 0 + 24 0 31))))) '|lookupComplete|)) (SETQ |$CategoryFrame| @@ -871,18 +871,17 @@ '(((|rationalApproximation| ((|Fraction| (|Integer|)) $ (|NonNegativeInteger|) (|NonNegativeInteger|))) - T (ELT $ 107)) + T (ELT $ 108)) ((|rationalApproximation| ((|Fraction| (|Integer|)) $ (|NonNegativeInteger|))) - T (ELT $ 108)) + T (ELT $ 109)) ((|doubleFloatFormat| ((|String|) (|String|))) T (ELT $ 8)) - ((|Beta| ($ $ $)) T (ELT $ 98)) - ((|Gamma| ($ $)) T (ELT $ 96)) - ((|atan| ($ $ $)) T (ELT $ 109)) + ((|Beta| ($ $ $)) T (ELT $ 99)) + ((|Gamma| ($ $)) T (ELT $ 97)) + ((|atan| ($ $ $)) T (ELT $ 110)) ((|log10| ($ $)) T (ELT $ 57)) ((|log2| ($ $)) T (ELT $ 30)) - ((|hash| ((|Integer|) $)) T (ELT $ 90)) ((|exp1| ($)) T (ELT $ 38)) ((/ ($ $ (|Integer|))) T (ELT $ 55)) ((|convert| ((|InputForm|) $)) T (ELT $ 45)) @@ -919,7 +918,7 @@ (ELT $ 22)) ((|OMwrite| ((|String|) $ (|Boolean|))) T (ELT $ 21)) ((|OMwrite| ((|String|) $)) T (ELT $ 19)) - ((|differentiate| ($ $)) T (ELT $ 93)) + ((|differentiate| ($ $)) T (ELT $ 94)) ((D ($ $)) T (ELT $ NIL)) ((|differentiate| ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) @@ -951,12 +950,12 @@ ((|order| ((|Integer|) $)) T (ELT $ 35)) ((|float| ($ (|Integer|) (|Integer|) (|PositiveInteger|))) - T (ELT $ 100)) + T (ELT $ 101)) ((|float| ($ (|Integer|) (|Integer|))) T (ELT $ NIL)) ((|round| ($ $)) T (ELT $ NIL)) ((|truncate| ($ $)) T (ELT $ NIL)) ((|fractionPart| ($ $)) T (ELT $ NIL)) - ((|wholePart| ((|Integer|) $)) T (ELT $ 99)) + ((|wholePart| ((|Integer|) $)) T (ELT $ 100)) ((|floor| ($ $)) T (ELT $ NIL)) ((|ceiling| ($ $)) T (ELT $ NIL)) ((|norm| ($ $)) T (ELT $ NIL)) @@ -966,20 +965,20 @@ (|PatternMatchResult| (|Float|) $))) T (ELT $ NIL)) ((|convert| ((|Pattern| (|Float|)) $)) T (ELT $ NIL)) - ((** ($ $ (|Fraction| (|Integer|)))) T (ELT $ 129)) + ((** ($ $ (|Fraction| (|Integer|)))) T (ELT $ 130)) ((|nthRoot| ($ $ (|Integer|))) T (ELT $ NIL)) ((|sqrt| ($ $)) T (ELT $ 56)) - ((|retract| ((|Fraction| (|Integer|)) $)) T (ELT $ 110)) + ((|retract| ((|Fraction| (|Integer|)) $)) T (ELT $ 111)) ((|retractIfCan| ((|Union| (|Fraction| (|Integer|)) "failed") $)) - T (ELT $ 112)) + T (ELT $ 113)) ((|coerce| ($ (|Fraction| (|Integer|)))) T (ELT $ NIL)) - ((|retract| ((|Integer|) $)) T (ELT $ 113)) + ((|retract| ((|Integer|) $)) T (ELT $ 114)) ((|retractIfCan| ((|Union| (|Integer|) "failed") $)) T - (ELT $ 115)) + (ELT $ 116)) ((|coerce| ($ (|Integer|))) T (ELT $ 60)) - ((|convert| ((|DoubleFloat|) $)) T (ELT $ 101)) - ((|convert| ((|Float|) $)) T (ELT $ 104)) + ((|convert| ((|DoubleFloat|) $)) T (ELT $ 102)) + ((|convert| ((|Float|) $)) T (ELT $ 105)) ((< ((|Boolean|) $ $)) T (ELT $ 46)) ((> ((|Boolean|) $ $)) T (ELT $ NIL)) ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) @@ -988,8 +987,8 @@ ((|min| ($ $ $)) T (ELT $ 53)) ((|positive?| ((|Boolean|) $)) T (ELT $ NIL)) ((|negative?| ((|Boolean|) $)) T (ELT $ 88)) - ((|sign| ((|Integer|) $)) T (ELT $ 116)) - ((|abs| ($ $)) T (ELT $ 117)) ((/ ($ $ $)) T (ELT $ 87)) + ((|sign| ((|Integer|) $)) T (ELT $ 117)) + ((|abs| ($ $)) T (ELT $ 118)) ((/ ($ $ $)) T (ELT $ 87)) ((|coerce| ($ (|Fraction| (|Integer|)))) T (ELT $ NIL)) ((* ($ (|Fraction| (|Integer|)) $)) T (ELT $ NIL)) ((* ($ $ (|Fraction| (|Integer|)))) T (ELT $ NIL)) @@ -1055,7 +1054,7 @@ ((|One| ($)) T (CONST $ 37)) ((|one?| ((|Boolean|) $)) T (ELT $ NIL)) ((** ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) - ((|recip| ((|Union| $ "failed") $)) T (ELT $ 92)) + ((|recip| ((|Union| $ "failed") $)) T (ELT $ 93)) ((* ($ $ $)) T (ELT $ 50)) ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) ((* ($ (|Integer|) $)) T (ELT $ 51)) @@ -1069,7 +1068,7 @@ ((* ($ (|PositiveInteger|) $)) T (ELT $ 31)) ((+ ($ $ $)) T (ELT $ 48)) ((|latex| ((|String|) $)) T (ELT $ NIL)) - ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ 91)) ((|coerce| ((|OutputForm|) $)) T (ELT $ 42)) ((= ((|Boolean|) $ $)) T (ELT $ 54)) ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) @@ -1082,7 +1081,6 @@ (SIGNATURE / ($ $ (|Integer|))) (SIGNATURE ** ($ $ $)) (SIGNATURE |exp1| ($)) - (SIGNATURE |hash| ((|Integer|) $)) (SIGNATURE |log2| ($ $)) (SIGNATURE |log10| ($ $)) (SIGNATURE |atan| ($ $ $)) @@ -1108,8 +1106,6 @@ (SIGNATURE / ($ $ (|Integer|))) (SIGNATURE ** ($ $ $)) (SIGNATURE |exp1| ($)) - (SIGNATURE |hash| - ((|Integer|) $)) (SIGNATURE |log2| ($ $)) (SIGNATURE |log10| ($ $)) (SIGNATURE |atan| ($ $ $)) diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp index 0e6a1eae..50b093bb 100644 --- a/src/algebra/strap/FFIELDC-.lsp +++ b/src/algebra/strap/FFIELDC-.lsp @@ -35,10 +35,7 @@ (|getShellEntry| $ 30)))))))) (DEFUN |FFIELDC-;charthRoot;2S;6| (|x| $) - (SPADCALL |x| - (QUOTIENT2 (SPADCALL (|getShellEntry| $ 36)) - (SPADCALL (|getShellEntry| $ 37))) - (|getShellEntry| $ 38))) + (SPADCALL |x| (QUOTIENT2 2 0) (|getShellEntry| $ 36))) (DEFUN |FFIELDC-;charthRoot;SU;7| (|x| $) (CONS 0 (SPADCALL |x| (|getShellEntry| $ 28)))) @@ -46,13 +43,13 @@ (DEFUN |FFIELDC-;createPrimitiveElement;S;8| ($) (PROG (|sm1| |start| |i| #0=#:G1443 |e| |found|) (RETURN - (SEQ (LETT |sm1| (- (SPADCALL (|getShellEntry| $ 36)) 1) + (SEQ (LETT |sm1| (- (SPADCALL (|getShellEntry| $ 39)) 1) |FFIELDC-;createPrimitiveElement;S;8|) (LETT |start| (COND - ((SPADCALL (SPADCALL (|getShellEntry| $ 43)) - (CONS 1 "polynomial") (|getShellEntry| $ 44)) - (SPADCALL (|getShellEntry| $ 37))) + ((SPADCALL (SPADCALL (|getShellEntry| $ 41)) + (CONS 1 "polynomial") (|getShellEntry| $ 42)) + 0) ('T 1)) |FFIELDC-;createPrimitiveElement;S;8|) (LETT |found| 'NIL |FFIELDC-;createPrimitiveElement;S;8|) @@ -60,7 +57,7 @@ |FFIELDC-;createPrimitiveElement;S;8|) G190 (COND - ((NULL (SPADCALL |found| (|getShellEntry| $ 45))) + ((NULL (SPADCALL |found| (|getShellEntry| $ 43))) (GO G191))) (SEQ (LETT |e| (SPADCALL @@ -86,10 +83,9 @@ (SEQ (COND ((SPADCALL |a| (|getShellEntry| $ 14)) 'NIL) ('T - (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 49)) - |FFIELDC-;primitive?;SB;9|) - (LETT |q| (- (SPADCALL (|getShellEntry| $ 36)) 1) + (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 47)) |FFIELDC-;primitive?;SB;9|) + (LETT |q| (- 2 1) |FFIELDC-;primitive?;SB;9|) (LETT |equalone| 'NIL |FFIELDC-;primitive?;SB;9|) (SEQ (LETT |exp| NIL |FFIELDC-;primitive?;SB;9|) (LETT #0# |explist| |FFIELDC-;primitive?;SB;9|) @@ -101,19 +97,19 @@ |FFIELDC-;primitive?;SB;9|) NIL) (NULL (SPADCALL |equalone| - (|getShellEntry| $ 45)))) + (|getShellEntry| $ 43)))) (GO G191))) (SEQ (EXIT (LETT |equalone| (SPADCALL (SPADCALL |a| (QUOTIENT2 |q| (QCAR |exp|)) - (|getShellEntry| $ 50)) - (|spadConstant| $ 41) - (|getShellEntry| $ 51)) + (|getShellEntry| $ 48)) + (|spadConstant| $ 49) + (|getShellEntry| $ 50)) |FFIELDC-;primitive?;SB;9|))) (LETT #0# (CDR #0#) |FFIELDC-;primitive?;SB;9|) (GO G190) G191 (EXIT NIL)) - (EXIT (SPADCALL |equalone| (|getShellEntry| $ 45)))))))))) + (EXIT (SPADCALL |equalone| (|getShellEntry| $ 43)))))))))) (DEFUN |FFIELDC-;order;SPi;10| (|e| $) (PROG (|lof| |rec| #0=#:G1463 |primeDivisor| |j| #1=#:G1464 |a| @@ -121,13 +117,12 @@ (RETURN (SEQ (COND ((SPADCALL |e| (|spadConstant| $ 7) - (|getShellEntry| $ 51)) + (|getShellEntry| $ 50)) (|error| "order(0) is not defined ")) ('T - (SEQ (LETT |ord| (- (SPADCALL (|getShellEntry| $ 36)) 1) - |FFIELDC-;order;SPi;10|) + (SEQ (LETT |ord| (- 2 1) |FFIELDC-;order;SPi;10|) (LETT |a| 0 |FFIELDC-;order;SPi;10|) - (LETT |lof| (SPADCALL (|getShellEntry| $ 49)) + (LETT |lof| (SPADCALL (|getShellEntry| $ 47)) |FFIELDC-;order;SPi;10|) (SEQ (LETT |rec| NIL |FFIELDC-;order;SPi;10|) (LETT #0# |lof| |FFIELDC-;order;SPi;10|) G190 @@ -146,9 +141,9 @@ (LETT |goon| (SPADCALL (SPADCALL |e| |a| - (|getShellEntry| $ 50)) - (|spadConstant| $ 41) - (|getShellEntry| $ 51)) + (|getShellEntry| $ 48)) + (|spadConstant| $ 49) + (|getShellEntry| $ 50)) |FFIELDC-;order;SPi;10|) (SEQ (LETT |j| 0 |FFIELDC-;order;SPi;10|) (LETT #1# (- (QCDR |rec|) 2) @@ -168,9 +163,9 @@ (LETT |goon| (SPADCALL (SPADCALL |e| |a| - (|getShellEntry| $ 50)) - (|spadConstant| $ 41) - (|getShellEntry| $ 51)) + (|getShellEntry| $ 48)) + (|spadConstant| $ 49) + (|getShellEntry| $ 50)) |FFIELDC-;order;SPi;10|))) (LETT |j| (QSADD1 |j|) |FFIELDC-;order;SPi;10|) @@ -192,24 +187,20 @@ ((SPADCALL |b| (|getShellEntry| $ 14)) (|error| "discreteLog: logarithm of zero")) ('T - (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 49)) + (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 47)) |FFIELDC-;discreteLog;SNni;11|) (LETT |a| |b| |FFIELDC-;discreteLog;SNni;11|) - (LETT |gen| (SPADCALL (|getShellEntry| $ 54)) + (LETT |gen| (SPADCALL (|getShellEntry| $ 53)) |FFIELDC-;discreteLog;SNni;11|) (EXIT (COND - ((SPADCALL |b| |gen| (|getShellEntry| $ 51)) + ((SPADCALL |b| |gen| (|getShellEntry| $ 50)) 1) ('T (SEQ (LETT |disclog| 0 |FFIELDC-;discreteLog;SNni;11|) (LETT |mult| 1 |FFIELDC-;discreteLog;SNni;11|) - (LETT |groupord| - (- - (SPADCALL - (|getShellEntry| $ 36)) - 1) + (LETT |groupord| (- 2 1) |FFIELDC-;discreteLog;SNni;11|) (LETT |exp| |groupord| |FFIELDC-;discreteLog;SNni;11|) @@ -244,15 +235,15 @@ |FFIELDC-;discreteLog;SNni;11|) (LETT |exptable| (SPADCALL |fac| - (|getShellEntry| $ 56)) + (|getShellEntry| $ 55)) |FFIELDC-;discreteLog;SNni;11|) (LETT |n| (SPADCALL |exptable| - (|getShellEntry| $ 57)) + (|getShellEntry| $ 56)) |FFIELDC-;discreteLog;SNni;11|) (LETT |c| (SPADCALL |a| |exp| - (|getShellEntry| $ 50)) + (|getShellEntry| $ 48)) |FFIELDC-;discreteLog;SNni;11|) (LETT |end| (QUOTIENT2 (- |fac| 1) |n|) @@ -270,7 +261,7 @@ (QSGREATERP |i| |end|) (NULL (SPADCALL |found| - (|getShellEntry| $ 45)))) + (|getShellEntry| $ 43)))) (GO G191))) (SEQ (LETT |rho| @@ -278,7 +269,7 @@ (SPADCALL |c| (|getShellEntry| $ 11)) |exptable| - (|getShellEntry| $ 59)) + (|getShellEntry| $ 58)) |FFIELDC-;discreteLog;SNni;11|) (EXIT (COND @@ -302,9 +293,9 @@ |groupord| |fac|) (- |n|)) (|getShellEntry| $ - 50)) + 48)) (|getShellEntry| $ - 60)) + 59)) |FFIELDC-;discreteLog;SNni;11|))))) (LETT |i| (QSADD1 |i|) |FFIELDC-;discreteLog;SNni;11|) @@ -325,9 +316,9 @@ (SPADCALL |gen| (- |disc1|) (|getShellEntry| $ - 50)) + 48)) (|getShellEntry| $ - 60)) + 59)) |FFIELDC-;discreteLog;SNni;11|)))) ('T (|error| @@ -348,14 +339,14 @@ (SEQ (EXIT (COND ((SPADCALL |b| (|getShellEntry| $ 14)) (SEQ (SPADCALL "discreteLog: logarithm of zero" - (|getShellEntry| $ 65)) + (|getShellEntry| $ 64)) (EXIT (CONS 1 "failed")))) ((SPADCALL |logbase| (|getShellEntry| $ 14)) (SEQ (SPADCALL "discreteLog: logarithm to base zero" - (|getShellEntry| $ 65)) + (|getShellEntry| $ 64)) (EXIT (CONS 1 "failed")))) - ((SPADCALL |b| |logbase| (|getShellEntry| $ 51)) + ((SPADCALL |b| |logbase| (|getShellEntry| $ 50)) (CONS 0 1)) ('T (COND @@ -368,14 +359,14 @@ (|getShellEntry| $ 17))))) (SEQ (SPADCALL "discreteLog: second argument not in cyclic group generated by first argument" - (|getShellEntry| $ 65)) + (|getShellEntry| $ 64)) (EXIT (CONS 1 "failed")))) ('T (SEQ (LETT |faclist| (SPADCALL (SPADCALL |groupord| - (|getShellEntry| $ 67)) - (|getShellEntry| $ 69)) + (|getShellEntry| $ 66)) + (|getShellEntry| $ 68)) |FFIELDC-;discreteLog;2SU;12|) (LETT |a| |b| |FFIELDC-;discreteLog;2SU;12|) @@ -402,7 +393,7 @@ (LETT |primroot| (SPADCALL |logbase| (QUOTIENT2 |groupord| |fac|) - (|getShellEntry| $ 50)) + (|getShellEntry| $ 48)) |FFIELDC-;discreteLog;2SU;12|) (EXIT (SEQ @@ -421,9 +412,9 @@ (LETT |rhoHelp| (SPADCALL |primroot| (SPADCALL |a| |exp| - (|getShellEntry| $ 50)) + (|getShellEntry| $ 48)) |fac| - (|getShellEntry| $ 71)) + (|getShellEntry| $ 70)) |FFIELDC-;discreteLog;2SU;12|) (EXIT (COND @@ -436,9 +427,8 @@ ('T (SEQ (LETT |rho| - (SPADCALL - (QCDR |rhoHelp|) |mult| - (|getShellEntry| $ 72)) + (* (QCDR |rhoHelp|) + |mult|) |FFIELDC-;discreteLog;2SU;12|) (LETT |disclog| (+ |disclog| |rho|) @@ -452,8 +442,8 @@ (SPADCALL |logbase| (- |rho|) (|getShellEntry| $ - 50)) - (|getShellEntry| $ 60)) + 48)) + (|getShellEntry| $ 59)) |FFIELDC-;discreteLog;2SU;12|))))))) (LETT |t| (QSADD1 |t|) |FFIELDC-;discreteLog;2SU;12|) @@ -465,25 +455,25 @@ #2# (EXIT #2#))))) (DEFUN |FFIELDC-;squareFreePolynomial| (|f| $) - (SPADCALL |f| (|getShellEntry| $ 77))) + (SPADCALL |f| (|getShellEntry| $ 75))) (DEFUN |FFIELDC-;factorPolynomial| (|f| $) - (SPADCALL |f| (|getShellEntry| $ 79))) + (SPADCALL |f| (|getShellEntry| $ 77))) (DEFUN |FFIELDC-;factorSquareFreePolynomial| (|f| $) (PROG (|flist| |u| #0=#:G1517 #1=#:G1514 #2=#:G1512 #3=#:G1513) (RETURN (SEQ (COND - ((SPADCALL |f| (|spadConstant| $ 80) - (|getShellEntry| $ 81)) - (|spadConstant| $ 82)) + ((SPADCALL |f| (|spadConstant| $ 78) + (|getShellEntry| $ 79)) + (|spadConstant| $ 80)) ('T (SEQ (LETT |flist| - (SPADCALL |f| 'T (|getShellEntry| $ 86)) + (SPADCALL |f| 'T (|getShellEntry| $ 84)) |FFIELDC-;factorSquareFreePolynomial|) (EXIT (SPADCALL (SPADCALL (QCAR |flist|) - (|getShellEntry| $ 87)) + (|getShellEntry| $ 85)) (PROGN (LETT #3# NIL |FFIELDC-;factorSquareFreePolynomial|) @@ -505,13 +495,13 @@ (LETT #1# (SPADCALL (QCAR |u|) (QCDR |u|) - (|getShellEntry| $ 88)) + (|getShellEntry| $ 86)) |FFIELDC-;factorSquareFreePolynomial|) (COND (#3# (LETT #2# (SPADCALL #2# #1# - (|getShellEntry| $ 89)) + (|getShellEntry| $ 87)) |FFIELDC-;factorSquareFreePolynomial|)) ('T (PROGN @@ -524,11 +514,11 @@ (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) - ('T (|spadConstant| $ 90)))) - (|getShellEntry| $ 91)))))))))) + ('T (|spadConstant| $ 88)))) + (|getShellEntry| $ 89)))))))))) (DEFUN |FFIELDC-;gcdPolynomial;3Sup;16| (|f| |g| $) - (SPADCALL |f| |g| (|getShellEntry| $ 93))) + (SPADCALL |f| |g| (|getShellEntry| $ 91))) (DEFUN |FiniteFieldCategory&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -536,7 +526,7 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|FiniteFieldCategory&|)) (LETT |dv$| (LIST '|FiniteFieldCategory&| |dv$1|) . #0#) - (LETT $ (|newShell| 96) . #0#) + (LETT $ (|newShell| 94) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -556,76 +546,75 @@ (34 . |every?|) (40 . |charthRoot|) (|Mapping| 6 6) (45 . |map|) (|Vector| $) (|Union| 31 '"failed") (|Matrix| $) |FFIELDC-;conditionP;MU;5| - (|NonNegativeInteger|) (51 . |size|) - (55 . |characteristic|) (59 . **) + (|NonNegativeInteger|) (51 . **) |FFIELDC-;charthRoot;2S;6| |FFIELDC-;charthRoot;SU;7| - (65 . |One|) + (57 . |size|) (|Union| '"prime" '"polynomial" '"normal" '"cyclic") - (69 . |representationType|) (73 . =) (79 . |not|) + (61 . |representationType|) (65 . =) (71 . |not|) |FFIELDC-;createPrimitiveElement;S;8| (|Record| (|:| |factor| 18) (|:| |exponent| 18)) - (|List| 47) (84 . |factorsOfCyclicGroupSize|) (88 . **) - (94 . =) |FFIELDC-;primitive?;SB;9| - |FFIELDC-;order;SPi;10| (100 . |primitiveElement|) - (|Table| 10 35) (104 . |tableForDiscreteLogarithm|) - (109 . |#|) (|Union| 35 '"failed") (114 . |search|) - (120 . *) |FFIELDC-;discreteLog;SNni;11| (|Void|) - (|String|) (|OutputForm|) (126 . |messagePrint|) - (|Factored| $) (131 . |factor|) (|Factored| 18) - (136 . |factors|) (|DiscreteLogarithmPackage| 6) - (141 . |shanksDiscLogAlgorithm|) (148 . *) + (|List| 45) (76 . |factorsOfCyclicGroupSize|) (80 . **) + (86 . |One|) (90 . =) |FFIELDC-;primitive?;SB;9| + |FFIELDC-;order;SPi;10| (96 . |primitiveElement|) + (|Table| 10 35) (100 . |tableForDiscreteLogarithm|) + (105 . |#|) (|Union| 35 '"failed") (110 . |search|) + (116 . *) |FFIELDC-;discreteLog;SNni;11| (|Void|) + (|String|) (|OutputForm|) (122 . |messagePrint|) + (|Factored| $) (127 . |factor|) (|Factored| 18) + (132 . |factors|) (|DiscreteLogarithmPackage| 6) + (137 . |shanksDiscLogAlgorithm|) |FFIELDC-;discreteLog;2SU;12| - (|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| $) + (|SparseUnivariatePolynomial| 6) (|Factored| 72) + (|UnivariatePolynomialSquareFree| 6 72) + (144 . |squareFree|) (|DistinctDegreeFactorize| 6 72) + (149 . |factor|) (154 . |Zero|) (158 . =) (164 . |Zero|) + (|Record| (|:| |irr| 72) (|:| |pow| 18)) (|List| 81) + (|Record| (|:| |cont| 6) (|:| |factors| 82)) + (168 . |distdfact|) (174 . |coerce|) (179 . |primeFactor|) + (185 . *) (191 . |One|) (195 . *) (|EuclideanDomain&| 72) + (201 . |gcd|) (|SparseUnivariatePolynomial| $) |FFIELDC-;gcdPolynomial;3Sup;16|) - '#(|primitive?| 217 |order| 222 |nextItem| 232 |init| 237 - |gcdPolynomial| 241 |discreteLog| 247 |differentiate| 258 - |createPrimitiveElement| 263 |conditionP| 267 |charthRoot| - 272) + '#(|primitive?| 207 |order| 212 |nextItem| 222 |init| 227 + |gcdPolynomial| 231 |discreteLog| 237 |differentiate| 248 + |createPrimitiveElement| 253 |conditionP| 257 |charthRoot| + 262) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 95 + (|makeByteWordVec2| 93 '(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 - 22 0 29 0 30 0 6 35 36 0 6 35 37 2 6 - 0 0 35 38 0 6 0 41 0 6 42 43 2 42 13 - 0 0 44 1 13 0 0 45 0 6 48 49 2 6 0 0 - 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 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))))) + 22 0 29 0 30 2 6 0 0 35 36 0 6 35 39 + 0 6 40 41 2 40 13 0 0 42 1 13 0 0 43 + 0 6 46 47 2 6 0 0 18 48 0 6 0 49 2 6 + 13 0 0 50 0 6 0 53 1 6 54 18 55 1 54 + 35 0 56 2 54 57 10 0 58 2 6 0 0 0 59 + 1 63 61 62 64 1 18 65 0 66 1 67 46 0 + 68 3 69 57 6 6 35 70 1 74 73 72 75 1 + 76 73 72 77 0 72 0 78 2 72 13 0 0 79 + 0 73 0 80 2 76 83 72 13 84 1 72 0 6 + 85 2 73 0 72 18 86 2 73 0 0 0 87 0 73 + 0 88 2 73 0 72 0 89 2 90 0 0 0 91 1 0 + 13 0 51 1 0 10 0 52 1 0 19 0 21 1 0 + 15 0 16 0 0 0 9 2 0 92 92 92 93 1 0 + 35 0 60 2 0 57 0 0 71 1 0 0 0 8 0 0 0 + 44 1 0 32 33 34 1 0 0 0 37 1 0 15 0 + 38))))) '|lookupComplete|)) (SETQ |$CategoryFrame| (|put| '|FiniteFieldCategory&| '|isFunctor| - '(((|order| ((|PositiveInteger|) $)) T (ELT $ 53)) + '(((|order| ((|PositiveInteger|) $)) T (ELT $ 52)) ((|discreteLog| ((|NonNegativeInteger|) $)) T - (ELT $ 61)) - ((|primitive?| ((|Boolean|) $)) T (ELT $ 52)) - ((|createPrimitiveElement| ($)) T (ELT $ 46)) + (ELT $ 60)) + ((|primitive?| ((|Boolean|) $)) T (ELT $ 51)) + ((|createPrimitiveElement| ($)) T (ELT $ 44)) ((|conditionP| ((|Union| (|Vector| $) "failed") (|Matrix| $))) T (ELT $ 34)) - ((|charthRoot| ($ $)) T (ELT $ 39)) + ((|charthRoot| ($ $)) T (ELT $ 37)) ((|differentiate| ($ $)) T (ELT $ 8)) ((|differentiate| ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) @@ -633,15 +622,15 @@ ((|nextItem| ((|Union| $ "failed") $)) T (ELT $ 16)) ((|discreteLog| ((|Union| (|NonNegativeInteger|) "failed") $ $)) - T (ELT $ 73)) + T (ELT $ 71)) ((|order| ((|OnePointCompletion| (|PositiveInteger|)) $)) T (ELT $ 21)) - ((|charthRoot| ((|Union| $ "failed") $)) T (ELT $ 40)) + ((|charthRoot| ((|Union| $ "failed") $)) T (ELT $ 38)) ((|gcdPolynomial| ((|SparseUnivariatePolynomial| $) (|SparseUnivariatePolynomial| $) (|SparseUnivariatePolynomial| $))) - T (ELT $ 95))) + T (ELT $ 93))) (|addModemap| '|FiniteFieldCategory&| '(|FiniteFieldCategory&| |#1|) '((CATEGORY |domain| diff --git a/src/algebra/strap/INS.lsp b/src/algebra/strap/INS.lsp index 3d827807..5759f408 100644 --- a/src/algebra/strap/INS.lsp +++ b/src/algebra/strap/INS.lsp @@ -54,7 +54,6 @@ T) ((|random| ($)) T) ((|random| ($ $)) T) - ((|hash| ($ $)) T) ((|copy| ($ $)) T) ((|inc| ($ $)) T) ((|dec| ($ $)) T) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index bee38736..afb2e425 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -86,16 +86,16 @@ (DEFUN |INT;dec;2$;13| (|x| $) (- |x| 1)) -(PUT '|INT;hash;2$;14| '|SPADreplace| 'SXHASH) +(PUT '|INT;hash;$Si;14| '|SPADreplace| 'SXHASH) -(DEFUN |INT;hash;2$;14| (|x| $) (SXHASH |x|)) +(DEFUN |INT;hash;$Si;14| (|x| $) (SXHASH |x|)) (PUT '|INT;negative?;$B;15| '|SPADreplace| 'MINUSP) (DEFUN |INT;negative?;$B;15| (|x| $) (MINUSP |x|)) (DEFUN |INT;coerce;$Of;16| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 36))) + (SPADCALL |x| (|getShellEntry| $ 37))) (PUT '|INT;coerce;2$;17| '|SPADreplace| '(XLAM (|m|) |m|)) @@ -132,7 +132,7 @@ (REMAINDER2 (* |a| |b|) |p|)) (DEFUN |INT;convert;$F;23| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 45))) + (SPADCALL |x| (|getShellEntry| $ 46))) (PUT '|INT;convert;$Df;24| '|SPADreplace| '(XLAM (|x|) (FLOAT |x| |$DoubleFloatMaximum|))) @@ -140,7 +140,7 @@ (DEFUN |INT;convert;$Df;24| (|x| $) (FLOAT |x| |$DoubleFloatMaximum|)) (DEFUN |INT;convert;$If;25| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 50))) + (SPADCALL |x| (|getShellEntry| $ 51))) (PUT '|INT;convert;$S;26| '|SPADreplace| 'STRINGIMAGE) @@ -263,51 +263,51 @@ (DEFUN |INT;unitCanonical;2$;53| (|x| $) (ABS |x|)) (DEFUN |INT;solveLinearPolynomialEquation| (|lp| |p| $) - (SPADCALL |lp| |p| (|getShellEntry| $ 93))) + (SPADCALL |lp| |p| (|getShellEntry| $ 94))) (DEFUN |INT;squareFreePolynomial| (|p| $) - (SPADCALL |p| (|getShellEntry| $ 97))) + (SPADCALL |p| (|getShellEntry| $ 98))) (DEFUN |INT;factorPolynomial| (|p| $) (PROG (|pp| #0=#:G1500) (RETURN - (SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 98)) + (SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 99)) |INT;factorPolynomial|) (EXIT (COND - ((EQL (SPADCALL |pp| (|getShellEntry| $ 99)) - (SPADCALL |p| (|getShellEntry| $ 99))) - (SPADCALL |p| (|getShellEntry| $ 101))) + ((EQL (SPADCALL |pp| (|getShellEntry| $ 100)) + (SPADCALL |p| (|getShellEntry| $ 100))) + (SPADCALL |p| (|getShellEntry| $ 102))) ('T - (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 101)) + (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 102)) (SPADCALL (CONS #'|INT;factorPolynomial!0| $) (SPADCALL (PROG2 (LETT #0# (SPADCALL (SPADCALL |p| - (|getShellEntry| $ 99)) + (|getShellEntry| $ 100)) (SPADCALL |pp| - (|getShellEntry| $ 99)) - (|getShellEntry| $ 83)) + (|getShellEntry| $ 100)) + (|getShellEntry| $ 84)) |INT;factorPolynomial|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) $ #0#)) - (|getShellEntry| $ 104)) - (|getShellEntry| $ 108)) - (|getShellEntry| $ 110))))))))) + (|getShellEntry| $ 105)) + (|getShellEntry| $ 109)) + (|getShellEntry| $ 111))))))))) (DEFUN |INT;factorPolynomial!0| (|#1| $) - (SPADCALL |#1| (|getShellEntry| $ 102))) + (SPADCALL |#1| (|getShellEntry| $ 103))) (DEFUN |INT;factorSquareFreePolynomial| (|p| $) - (SPADCALL |p| (|getShellEntry| $ 111))) + (SPADCALL |p| (|getShellEntry| $ 112))) (DEFUN |INT;gcdPolynomial;3Sup;58| (|p| |q| $) (COND - ((SPADCALL |p| (|getShellEntry| $ 112)) - (SPADCALL |q| (|getShellEntry| $ 113))) - ((SPADCALL |q| (|getShellEntry| $ 112)) - (SPADCALL |p| (|getShellEntry| $ 113))) - ('T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 116))))) + ((SPADCALL |p| (|getShellEntry| $ 113)) + (SPADCALL |q| (|getShellEntry| $ 114))) + ((SPADCALL |q| (|getShellEntry| $ 113)) + (SPADCALL |p| (|getShellEntry| $ 114))) + ('T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 117))))) (DEFUN |Integer| () (PROG () @@ -337,8 +337,8 @@ (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) (|haddProp| |$ConstructorCache| '|Integer| NIL (CONS 1 $)) (|stuffDomainSlots| $) - (|setShellEntry| $ 71 - (|setShellEntry| $ 70 + (|setShellEntry| $ 72 + (|setShellEntry| $ 71 (CONS (|dispatchFunction| |INT;*;3$;40|) $))) $)))) @@ -357,17 +357,18 @@ (CONS IDENTITY (FUNCALL (|dispatchFunction| |INT;One;$;9|) $)) |INT;base;$;10| |INT;copy;2$;11| |INT;inc;2$;12| - |INT;dec;2$;13| |INT;hash;2$;14| |INT;negative?;$B;15| - (|OutputForm|) (48 . |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| |INT;mulmod;4$;22| - (|Float|) (53 . |coerce|) |INT;convert;$F;23| - (|DoubleFloat|) |INT;convert;$Df;24| (|InputForm|) - (58 . |convert|) |INT;convert;$If;25| |INT;convert;$S;26| - |INT;latex;$S;27| |INT;positiveRemainder;3$;28| - (|Matrix| 11) (|Matrix| $) |INT;reducedSystem;2M;29| - (|Vector| 11) (|Record| (|:| |mat| 55) (|:| |vec| 58)) - (|Vector| $) |INT;reducedSystem;MVR;30| |INT;abs;2$;31| + |INT;dec;2$;13| (|SingleInteger|) |INT;hash;$Si;14| + |INT;negative?;$B;15| (|OutputForm|) (48 . |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| + |INT;mulmod;4$;22| (|Float|) (53 . |coerce|) + |INT;convert;$F;23| (|DoubleFloat|) |INT;convert;$Df;24| + (|InputForm|) (58 . |convert|) |INT;convert;$If;25| + |INT;convert;$S;26| |INT;latex;$S;27| + |INT;positiveRemainder;3$;28| (|Matrix| 11) (|Matrix| $) + |INT;reducedSystem;2M;29| (|Vector| 11) + (|Record| (|:| |mat| 56) (|:| |vec| 59)) (|Vector| $) + |INT;reducedSystem;MVR;30| |INT;abs;2$;31| |INT;random;$;32| |INT;random;2$;33| |INT;=;2$B;34| |INT;<;2$B;35| |INT;-;2$;36| |INT;+;3$;37| |INT;-;3$;38| NIL NIL (|NonNegativeInteger|) |INT;**;$Nni$;41| @@ -379,31 +380,30 @@ (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) |INT;unitNormal;$R;52| |INT;unitCanonical;2$;53| - (|SparseUnivariatePolynomial| 11) (|List| 89) - (|Union| 90 '"failed") + (|SparseUnivariatePolynomial| 11) (|List| 90) + (|Union| 91 '"failed") (|IntegerSolveLinearPolynomialEquation|) (63 . |solveLinearPolynomialEquation|) - (|SparseUnivariatePolynomial| $$) (|Factored| 94) - (|UnivariatePolynomialSquareFree| $$ 94) + (|SparseUnivariatePolynomial| $$) (|Factored| 95) + (|UnivariatePolynomialSquareFree| $$ 95) (69 . |squareFree|) (74 . |primitivePart|) - (79 . |leadingCoefficient|) (|GaloisGroupFactorizer| 94) + (79 . |leadingCoefficient|) (|GaloisGroupFactorizer| 95) (84 . |factor|) (89 . |coerce|) (|Factored| $) - (94 . |factor|) (|Mapping| 94 $$) (|Factored| $$) - (|FactoredFunctions2| $$ 94) (99 . |map|) - (|FactoredFunctionUtilities| 94) (105 . |mergeFactors|) + (94 . |factor|) (|Mapping| 95 $$) (|Factored| $$) + (|FactoredFunctions2| $$ 95) (99 . |map|) + (|FactoredFunctionUtilities| 95) (105 . |mergeFactors|) (111 . |factorSquareFree|) (116 . |zero?|) - (121 . |unitCanonical|) (|List| 94) (|HeuGcd| 94) + (121 . |unitCanonical|) (|List| 95) (|HeuGcd| 95) (126 . |gcd|) (|SparseUnivariatePolynomial| $) |INT;gcdPolynomial;3Sup;58| (|Fraction| 11) - (|Union| 119 '"failed") (|Pattern| 11) - (|PatternMatchResult| 11 $) (|Union| 11 '"failed") - (|List| $) (|Record| (|:| |coef| 124) (|:| |generator| $)) - (|Union| 124 '"failed") + (|Union| 120 '"failed") (|PatternMatchResult| 11 $) + (|Pattern| 11) (|Union| 11 '"failed") (|List| $) + (|Record| (|:| |coef| 125) (|:| |generator| $)) + (|Union| 125 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 128 '"failed") (|PositiveInteger|) - (|SingleInteger|)) + (|Union| 129 '"failed") (|PositiveInteger|)) '#(~= 131 |zero?| 137 |unitNormal| 142 |unitCanonical| 147 |unit?| 152 |symmetricRemainder| 157 |subtractIfCan| 163 |submod| 169 |squareFreePart| 176 |squareFree| 181 @@ -416,15 +416,15 @@ |one?| 310 |odd?| 315 |nextItem| 320 |negative?| 325 |multiEuclidean| 330 |mulmod| 336 |min| 343 |max| 349 |mask| 355 |length| 360 |lcm| 365 |latex| 376 |invmod| 381 - |init| 387 |inc| 391 |hash| 396 |gcdPolynomial| 406 |gcd| - 412 |factorial| 423 |factor| 428 |extendedEuclidean| 433 - |exquo| 446 |expressIdealMember| 452 |even?| 458 - |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 |Zero| 583 |One| 587 |OMwrite| 591 - D 615 >= 626 > 632 = 638 <= 644 < 650 - 656 + 667 ** 673 * - 685) + |init| 387 |inc| 391 |hash| 396 |gcdPolynomial| 401 |gcd| + 407 |factorial| 418 |factor| 423 |extendedEuclidean| 428 + |exquo| 441 |expressIdealMember| 447 |even?| 453 + |euclideanSize| 458 |divide| 463 |differentiate| 469 |dec| + 480 |copy| 485 |convert| 490 |coerce| 520 |characteristic| + 540 |bit?| 544 |binomial| 550 |base| 556 |associates?| 560 + |addmod| 566 |abs| 573 |Zero| 578 |One| 582 |OMwrite| 586 + D 610 >= 621 > 627 = 633 <= 639 < 645 - 651 + 662 ** 668 * + 680) '((|infinite| . 0) (|noetherian| . 0) (|canonicalsClosed| . 0) (|canonical| . 0) (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0) @@ -468,60 +468,60 @@ (|OrderedSet|) (|AbelianSemiGroup|) (|SemiGroup|) (|RealConstant|) (|SetCategory|) (|OpenMath|) - (|ConvertibleTo| 9) (|ConvertibleTo| 44) - (|ConvertibleTo| 47) + (|ConvertibleTo| 9) (|ConvertibleTo| 45) + (|ConvertibleTo| 48) (|CombinatorialFunctionCategory|) - (|ConvertibleTo| 121) - (|ConvertibleTo| 49) + (|ConvertibleTo| 123) + (|ConvertibleTo| 50) (|RetractableTo| 11) (|ConvertibleTo| 11) (|BasicType|) - (|CoercibleTo| 35)) + (|CoercibleTo| 36)) (|makeByteWordVec2| 131 '(1 7 6 0 8 3 7 6 0 9 9 10 2 7 6 0 11 12 1 7 6 0 13 0 14 0 15 2 7 0 9 14 16 - 1 7 6 0 17 1 7 6 0 18 1 7 6 0 19 1 35 - 0 11 36 1 44 0 11 45 1 49 0 11 50 2 - 92 91 90 89 93 1 96 95 94 97 1 94 0 0 - 98 1 94 2 0 99 1 100 95 94 101 1 94 0 - 2 102 1 0 103 0 104 2 107 95 105 106 - 108 2 109 95 95 95 110 1 100 95 94 - 111 1 94 21 0 112 1 94 0 0 113 1 115 - 94 114 116 2 0 21 0 0 1 1 0 21 0 25 1 - 0 86 0 87 1 0 0 0 88 1 0 21 0 1 2 0 0 - 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 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 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 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 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 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 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 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 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))))) + 1 7 6 0 17 1 7 6 0 18 1 7 6 0 19 1 36 + 0 11 37 1 45 0 11 46 1 50 0 11 51 2 + 93 92 91 90 94 1 97 96 95 98 1 95 0 0 + 99 1 95 2 0 100 1 101 96 95 102 1 95 + 0 2 103 1 0 104 0 105 2 108 96 106 + 107 109 2 110 96 96 96 111 1 101 96 + 95 112 1 95 21 0 113 1 95 0 0 114 1 + 116 95 115 117 2 0 21 0 0 1 1 0 21 0 + 25 1 0 87 0 88 1 0 0 0 89 1 0 21 0 1 + 2 0 0 0 0 1 2 0 83 0 0 1 3 0 0 0 0 0 + 43 1 0 0 0 1 1 0 104 0 1 2 0 21 0 0 1 + 1 0 11 0 1 2 0 0 0 0 82 0 0 0 1 1 0 + 124 0 1 1 0 11 0 1 2 0 0 0 0 81 2 0 + 60 57 61 62 1 0 56 57 58 1 0 83 0 85 + 1 0 121 0 1 1 0 21 0 1 1 0 120 0 1 0 + 0 0 64 1 0 0 0 65 2 0 0 0 0 80 1 0 + 126 125 1 1 0 21 0 1 3 0 0 0 0 0 1 2 + 0 0 0 0 55 1 0 21 0 1 2 0 0 0 0 1 3 0 + 122 0 123 122 1 1 0 21 0 26 1 0 21 0 + 75 1 0 83 0 1 1 0 21 0 35 2 0 127 125 + 0 1 3 0 0 0 0 0 44 2 0 0 0 0 77 2 0 0 + 0 0 76 1 0 0 0 1 1 0 0 0 41 2 0 0 0 0 + 1 1 0 0 125 1 1 0 9 0 54 2 0 0 0 0 1 + 0 0 0 1 1 0 0 0 31 1 0 33 0 34 2 0 + 118 118 118 119 2 0 0 0 0 86 1 0 0 + 125 1 1 0 0 0 1 1 0 104 0 105 2 0 128 + 0 0 1 3 0 130 0 0 0 1 2 0 83 0 0 84 2 + 0 127 125 0 1 1 0 21 0 1 1 0 73 0 1 2 + 0 78 0 0 79 1 0 0 0 1 2 0 0 0 73 1 1 + 0 0 0 32 1 0 0 0 30 1 0 9 0 53 1 0 48 + 0 49 1 0 45 0 47 1 0 50 0 52 1 0 123 + 0 1 1 0 11 0 40 1 0 0 11 39 1 0 0 0 1 + 1 0 0 11 39 1 0 36 0 38 0 0 73 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 42 1 0 0 0 63 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 73 1 2 0 21 0 0 1 2 0 21 0 + 0 1 2 0 21 0 0 66 2 0 21 0 0 1 2 0 21 + 0 0 67 2 0 0 0 0 70 1 0 0 0 68 2 0 0 + 0 0 69 2 0 0 0 73 74 2 0 0 0 131 1 2 + 0 0 0 0 71 2 0 0 11 0 72 2 0 0 73 0 1 + 2 0 0 131 0 1))))) '|lookupComplete|)) (SETQ |$CategoryFrame| @@ -532,19 +532,18 @@ (ELT $ 23)) ((|OMwrite| ((|String|) $ (|Boolean|))) T (ELT $ 22)) ((|OMwrite| ((|String|) $)) T (ELT $ 20)) - ((|convert| ((|String|) $)) T (ELT $ 52)) + ((|convert| ((|String|) $)) T (ELT $ 53)) ((|invmod| ($ $ $)) T (ELT $ NIL)) ((|powmod| ($ $ $ $)) T (ELT $ NIL)) - ((|mulmod| ($ $ $ $)) T (ELT $ 43)) - ((|submod| ($ $ $ $)) T (ELT $ 42)) - ((|addmod| ($ $ $ $)) T (ELT $ 41)) + ((|mulmod| ($ $ $ $)) T (ELT $ 44)) + ((|submod| ($ $ $ $)) T (ELT $ 43)) + ((|addmod| ($ $ $ $)) T (ELT $ 42)) ((|mask| ($ $)) T (ELT $ NIL)) ((|dec| ($ $)) T (ELT $ 32)) ((|inc| ($ $)) T (ELT $ 31)) ((|copy| ($ $)) T (ELT $ 30)) - ((|hash| ($ $)) T (ELT $ 33)) - ((|random| ($ $)) T (ELT $ 64)) - ((|random| ($)) T (ELT $ 63)) + ((|random| ($ $)) T (ELT $ 65)) + ((|random| ($)) T (ELT $ 64)) ((|rationalIfCan| ((|Union| (|Fraction| (|Integer|)) "failed") $)) T (ELT $ NIL)) @@ -552,17 +551,17 @@ (ELT $ NIL)) ((|rational?| ((|Boolean|) $)) T (ELT $ NIL)) ((|symmetricRemainder| ($ $ $)) T (ELT $ NIL)) - ((|positiveRemainder| ($ $ $)) T (ELT $ 54)) + ((|positiveRemainder| ($ $ $)) T (ELT $ 55)) ((|bit?| ((|Boolean|) $ $)) T (ELT $ NIL)) - ((|shift| ($ $ $)) T (ELT $ 81)) - ((|length| ($ $)) T (ELT $ 40)) + ((|shift| ($ $ $)) T (ELT $ 82)) + ((|length| ($ $)) T (ELT $ 41)) ((|base| ($)) T (ELT $ 29)) ((|even?| ((|Boolean|) $)) T (ELT $ NIL)) - ((|odd?| ((|Boolean|) $)) T (ELT $ 74)) + ((|odd?| ((|Boolean|) $)) T (ELT $ 75)) ((|init| ($)) T (CONST $ NIL)) ((|nextItem| ((|Union| $ "failed") $)) T (ELT $ NIL)) - ((|convert| ((|DoubleFloat|) $)) T (ELT $ 48)) - ((|convert| ((|Float|) $)) T (ELT $ 46)) + ((|convert| ((|DoubleFloat|) $)) T (ELT $ 49)) + ((|convert| ((|Float|) $)) T (ELT $ 47)) ((|permutation| ($ $ $)) T (ELT $ NIL)) ((|factorial| ($ $)) T (ELT $ NIL)) ((|binomial| ($ $ $)) T (ELT $ NIL)) @@ -572,34 +571,34 @@ (|PatternMatchResult| (|Integer|) $))) T (ELT $ NIL)) ((|convert| ((|Pattern| (|Integer|)) $)) T (ELT $ NIL)) - ((|convert| ((|InputForm|) $)) T (ELT $ 51)) + ((|convert| ((|InputForm|) $)) T (ELT $ 52)) ((|reducedSystem| ((|Matrix| (|Integer|)) (|Matrix| $))) - T (ELT $ 57)) + T (ELT $ 58)) ((|reducedSystem| ((|Record| (|:| |mat| (|Matrix| (|Integer|))) (|:| |vec| (|Vector| (|Integer|)))) (|Matrix| $) (|Vector| $))) - T (ELT $ 61)) + T (ELT $ 62)) ((|retract| ((|Integer|) $)) T (ELT $ NIL)) ((|retractIfCan| ((|Union| (|Integer|) "failed") $)) T (ELT $ NIL)) - ((|coerce| ($ (|Integer|))) T (ELT $ 38)) - ((|convert| ((|Integer|) $)) T (ELT $ 39)) + ((|coerce| ($ (|Integer|))) T (ELT $ 39)) + ((|convert| ((|Integer|) $)) T (ELT $ 40)) ((|differentiate| ($ $)) T (ELT $ NIL)) ((D ($ $)) T (ELT $ NIL)) ((|differentiate| ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) ((D ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) - ((|abs| ($ $)) T (ELT $ 62)) + ((|abs| ($ $)) T (ELT $ 63)) ((|sign| ((|Integer|) $)) T (ELT $ NIL)) - ((|negative?| ((|Boolean|) $)) T (ELT $ 34)) + ((|negative?| ((|Boolean|) $)) T (ELT $ 35)) ((|positive?| ((|Boolean|) $)) T (ELT $ NIL)) - ((|min| ($ $ $)) T (ELT $ 76)) - ((|max| ($ $ $)) T (ELT $ 75)) + ((|min| ($ $ $)) T (ELT $ 77)) + ((|max| ($ $ $)) T (ELT $ 76)) ((<= ((|Boolean|) $ $)) T (ELT $ NIL)) ((>= ((|Boolean|) $ $)) T (ELT $ NIL)) ((> ((|Boolean|) $ $)) T (ELT $ NIL)) - ((< ((|Boolean|) $ $)) T (ELT $ 66)) + ((< ((|Boolean|) $ $)) T (ELT $ 67)) ((|principalIdeal| ((|Record| (|:| |coef| (|List| $)) (|:| |generator| $)) @@ -614,9 +613,9 @@ ((|divide| ((|Record| (|:| |quotient| $) (|:| |remainder| $)) $ $)) - T (ELT $ 78)) - ((|quo| ($ $ $)) T (ELT $ 79)) - ((|rem| ($ $ $)) T (ELT $ 80)) + T (ELT $ 79)) + ((|quo| ($ $ $)) T (ELT $ 80)) + ((|rem| ($ $ $)) T (ELT $ 81)) ((|extendedEuclidean| ((|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) @@ -631,7 +630,7 @@ ((|multiEuclidean| ((|Union| (|List| $) "failed") (|List| $) $)) T (ELT $ NIL)) - ((|factor| ((|Factored| $) $)) T (ELT $ 104)) + ((|factor| ((|Factored| $) $)) T (ELT $ 105)) ((|squareFreePart| ($ $)) T (ELT $ NIL)) ((|squareFree| ((|Factored| $) $)) T (ELT $ NIL)) ((|prime?| ((|Boolean|) $)) T (ELT $ NIL)) @@ -639,32 +638,32 @@ ((|SparseUnivariatePolynomial| $) (|SparseUnivariatePolynomial| $) (|SparseUnivariatePolynomial| $))) - T (ELT $ 118)) + T (ELT $ 119)) ((|lcm| ($ (|List| $))) T (ELT $ NIL)) ((|lcm| ($ $ $)) T (ELT $ NIL)) ((|gcd| ($ (|List| $))) T (ELT $ NIL)) - ((|gcd| ($ $ $)) T (ELT $ 85)) + ((|gcd| ($ $ $)) T (ELT $ 86)) ((|unit?| ((|Boolean|) $)) T (ELT $ NIL)) ((|associates?| ((|Boolean|) $ $)) T (ELT $ NIL)) - ((|unitCanonical| ($ $)) T (ELT $ 88)) + ((|unitCanonical| ($ $)) T (ELT $ 89)) ((|unitNormal| ((|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) $)) - T (ELT $ 87)) - ((|exquo| ((|Union| $ "failed") $ $)) T (ELT $ 83)) + T (ELT $ 88)) + ((|exquo| ((|Union| $ "failed") $ $)) T (ELT $ 84)) ((|coerce| ($ $)) T (ELT $ NIL)) - ((|coerce| ($ (|Integer|))) T (ELT $ 38)) + ((|coerce| ($ (|Integer|))) T (ELT $ 39)) ((|characteristic| ((|NonNegativeInteger|))) T (ELT $ NIL)) ((|One| ($)) T (CONST $ 28)) ((|one?| ((|Boolean|) $)) T (ELT $ 26)) - ((** ($ $ (|NonNegativeInteger|))) T (ELT $ 73)) - ((|recip| ((|Union| $ "failed") $)) T (ELT $ 84)) - ((* ($ $ $)) T (ELT $ 70)) + ((** ($ $ (|NonNegativeInteger|))) T (ELT $ 74)) + ((|recip| ((|Union| $ "failed") $)) T (ELT $ 85)) + ((* ($ $ $)) T (ELT $ 71)) ((** ($ $ (|PositiveInteger|))) T (ELT $ NIL)) - ((* ($ (|Integer|) $)) T (ELT $ 71)) - ((- ($ $ $)) T (ELT $ 69)) ((- ($ $)) T (ELT $ 67)) + ((* ($ (|Integer|) $)) T (ELT $ 72)) + ((- ($ $ $)) T (ELT $ 70)) ((- ($ $)) T (ELT $ 68)) ((|subtractIfCan| ((|Union| $ "failed") $ $)) T (ELT $ NIL)) ((* ($ (|NonNegativeInteger|) $)) T (ELT $ NIL)) @@ -672,11 +671,11 @@ ((|sample| ($)) T (CONST $ NIL)) ((|Zero| ($)) T (CONST $ 27)) ((* ($ (|PositiveInteger|) $)) T (ELT $ NIL)) - ((+ ($ $ $)) T (ELT $ 68)) - ((|latex| ((|String|) $)) T (ELT $ 53)) - ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) - ((|coerce| ((|OutputForm|) $)) T (ELT $ 37)) - ((= ((|Boolean|) $ $)) T (ELT $ 65)) + ((+ ($ $ $)) T (ELT $ 69)) + ((|latex| ((|String|) $)) T (ELT $ 54)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ 34)) + ((|coerce| ((|OutputForm|) $)) T (ELT $ 38)) + ((= ((|Boolean|) $ $)) T (ELT $ 66)) ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) (|addModemap| '|Integer| '(|Integer|) '((|Join| (|IntegerNumberSystem|) diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index c89f6600..eb926f3d 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -322,27 +322,26 @@ (|Record| (|:| |quotient| $) (|:| |remainder| $)) |SINT;divide;2$R;34| |SINT;gcd;3$;35| |SINT;abs;2$;36| |SINT;odd?;$B;37| |SINT;zero?;$B;38| |SINT;one?;$B;39| - |SINT;max;3$;40| |SINT;min;3$;41| |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| (|Vector| 12) - (|Record| (|:| |mat| 26) (|:| |vec| 76)) (|Vector| $) + |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| (|Vector| 12) + (|Record| (|:| |mat| 26) (|:| |vec| 77)) (|Vector| $) |SINT;reducedSystem;MVR;49| |SINT;positiveRemainder;3$;50| |SINT;coerce;I$;51| |SINT;random;$;52| |SINT;random;2$;53| (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) |SINT;unitNormal;$R;54| (|Fraction| 12) - (|Union| 86 '"failed") (|DoubleFloat|) - (|Union| $ '"failed") (|Float|) - (|PatternMatchResult| 12 $) (|Pattern| 12) (|InputForm|) - (|Union| 12 '"failed") (|List| $) (|Union| 95 '"failed") - (|Record| (|:| |coef| 95) (|:| |generator| $)) - (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 98 '"failed") + (|Union| 87 '"failed") (|Union| $ '"failed") (|Float|) + (|DoubleFloat|) (|Pattern| 12) (|PatternMatchResult| 12 $) + (|InputForm|) (|Union| 12 '"failed") (|List| $) + (|Record| (|:| |coef| 96) (|:| |generator| $)) + (|Union| 96 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) - (|Factored| $) (|SparseUnivariatePolynomial| $) - (|PositiveInteger|) (|SingleInteger|)) + (|Record| (|:| |coef1| $) (|:| |coef2| $)) + (|Union| 100 '"failed") (|Factored| $) + (|SparseUnivariatePolynomial| $) (|PositiveInteger|)) '#(~= 58 ~ 64 |zero?| 69 |xor| 74 |unitNormal| 80 |unitCanonical| 85 |unit?| 90 |symmetricRemainder| 95 |subtractIfCan| 101 |submod| 107 |squareFreePart| 114 @@ -356,15 +355,15 @@ |nextItem| 263 |negative?| 268 |multiEuclidean| 273 |mulmod| 279 |min| 286 |max| 296 |mask| 306 |length| 311 |lcm| 316 |latex| 327 |invmod| 332 |init| 338 |inc| 342 - |hash| 347 |gcdPolynomial| 357 |gcd| 363 |factorial| 374 - |factor| 379 |extendedEuclidean| 384 |exquo| 397 - |expressIdealMember| 403 |even?| 409 |euclideanSize| 414 - |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 |Zero| 535 |Or| 539 |One| 545 - |OMwrite| 549 |Not| 573 D 578 |And| 589 >= 595 > 601 = 607 - <= 613 < 619 |/\\| 625 - 631 + 642 ** 648 * 660) + |hash| 347 |gcdPolynomial| 352 |gcd| 358 |factorial| 369 + |factor| 374 |extendedEuclidean| 379 |exquo| 392 + |expressIdealMember| 398 |even?| 404 |euclideanSize| 409 + |divide| 414 |differentiate| 420 |dec| 431 |copy| 436 + |convert| 441 |coerce| 466 |characteristic| 486 |bit?| 490 + |binomial| 496 |base| 502 |associates?| 506 |addmod| 512 + |abs| 519 |\\/| 524 |Zero| 530 |Or| 534 |One| 540 + |OMwrite| 544 |Not| 568 D 573 |And| 584 >= 590 > 596 = 602 + <= 608 < 614 |/\\| 620 - 626 + 637 ** 643 * 655) '((|noetherian| . 0) (|canonicalsClosed| . 0) (|canonical| . 0) (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0) (|noZeroDivisors| . 0) @@ -408,10 +407,10 @@ (|SemiGroup|) (|Logic|) (|RealConstant|) (|SetCategory|) (|OpenMath|) (|ConvertibleTo| 90) - (|ConvertibleTo| 88) + (|ConvertibleTo| 91) (|CombinatorialFunctionCategory|) (|ConvertibleTo| 92) - (|ConvertibleTo| 93) + (|ConvertibleTo| 94) (|RetractableTo| 12) (|ConvertibleTo| 12) (|BasicType|) (|CoercibleTo| 29)) @@ -421,42 +420,42 @@ 17 1 8 7 0 18 1 8 7 0 19 1 8 7 0 20 1 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 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 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 91 0 92 91 1 1 0 22 0 + 85 0 86 1 0 0 0 1 1 0 22 0 1 2 0 0 0 + 0 1 2 0 89 0 0 1 3 0 0 0 0 0 75 1 0 0 + 0 1 1 0 102 0 1 2 0 22 0 0 1 1 0 12 0 + 1 2 0 0 0 0 72 0 0 0 1 1 0 95 0 1 1 0 + 12 0 1 2 0 0 0 0 59 1 0 26 27 28 2 0 + 78 27 79 80 1 0 89 0 1 1 0 88 0 1 1 0 + 22 0 1 1 0 87 0 1 1 0 0 0 84 0 0 0 83 + 2 0 0 0 0 58 1 0 97 96 1 1 0 22 0 1 3 + 0 0 0 0 0 1 2 0 0 0 0 81 1 0 22 0 1 2 + 0 0 0 0 1 3 0 93 0 92 93 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 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))))) + 1 0 22 0 76 2 0 98 96 0 1 3 0 0 0 0 0 + 73 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 71 2 0 0 0 + 0 1 1 0 0 96 1 1 0 10 0 1 2 0 0 0 0 1 + 0 0 0 1 1 0 0 0 50 1 0 69 0 70 2 0 + 103 103 103 1 2 0 0 0 0 62 1 0 0 96 1 + 1 0 0 0 1 1 0 102 0 1 2 0 99 0 0 1 3 + 0 101 0 0 0 1 2 0 89 0 0 1 2 0 98 96 + 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 90 0 1 1 0 91 0 1 1 0 + 92 0 1 1 0 94 0 1 1 0 12 0 32 1 0 0 + 12 82 1 0 0 12 82 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 74 + 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 + 104 1 2 0 0 0 0 55 2 0 0 12 0 34 2 0 + 0 56 0 1 2 0 0 104 0 1))))) '|lookupComplete|)) (SETQ |$CategoryFrame| @@ -477,16 +476,15 @@ ((|\\/| ($ $ $)) T (ELT $ 44)) ((|invmod| ($ $ $)) T (ELT $ NIL)) ((|powmod| ($ $ $ $)) T (ELT $ NIL)) - ((|mulmod| ($ $ $ $)) T (ELT $ 72)) - ((|submod| ($ $ $ $)) T (ELT $ 74)) - ((|addmod| ($ $ $ $)) T (ELT $ 73)) + ((|mulmod| ($ $ $ $)) T (ELT $ 73)) + ((|submod| ($ $ $ $)) T (ELT $ 75)) + ((|addmod| ($ $ $ $)) T (ELT $ 74)) ((|mask| ($ $)) T (ELT $ NIL)) ((|dec| ($ $)) T (ELT $ 51)) ((|inc| ($ $)) T (ELT $ 50)) ((|copy| ($ $)) T (ELT $ NIL)) - ((|hash| ($ $)) T (ELT $ 69)) - ((|random| ($ $)) T (ELT $ 83)) - ((|random| ($)) T (ELT $ 82)) + ((|random| ($ $)) T (ELT $ 84)) + ((|random| ($)) T (ELT $ 83)) ((|rationalIfCan| ((|Union| (|Fraction| (|Integer|)) "failed") $)) T (ELT $ NIL)) @@ -494,10 +492,10 @@ (ELT $ NIL)) ((|rational?| ((|Boolean|) $)) T (ELT $ NIL)) ((|symmetricRemainder| ($ $ $)) T (ELT $ NIL)) - ((|positiveRemainder| ($ $ $)) T (ELT $ 80)) + ((|positiveRemainder| ($ $ $)) T (ELT $ 81)) ((|bit?| ((|Boolean|) $ $)) T (ELT $ NIL)) - ((|shift| ($ $ $)) T (ELT $ 71)) - ((|length| ($ $)) T (ELT $ 70)) + ((|shift| ($ $ $)) T (ELT $ 72)) + ((|length| ($ $)) T (ELT $ 71)) ((|base| ($)) T (ELT $ 37)) ((|even?| ((|Boolean|) $)) T (ELT $ NIL)) ((|odd?| ((|Boolean|) $)) T (ELT $ 64)) @@ -521,11 +519,11 @@ ((|Record| (|:| |mat| (|Matrix| (|Integer|))) (|:| |vec| (|Vector| (|Integer|)))) (|Matrix| $) (|Vector| $))) - T (ELT $ 79)) + T (ELT $ 80)) ((|retract| ((|Integer|) $)) T (ELT $ NIL)) ((|retractIfCan| ((|Union| (|Integer|) "failed") $)) T (ELT $ NIL)) - ((|coerce| ($ (|Integer|))) T (ELT $ 81)) + ((|coerce| ($ (|Integer|))) T (ELT $ 82)) ((|convert| ((|Integer|) $)) T (ELT $ 32)) ((|differentiate| ($ $)) T (ELT $ NIL)) ((D ($ $)) T (ELT $ NIL)) @@ -534,7 +532,7 @@ ((D ($ $ (|NonNegativeInteger|))) T (ELT $ NIL)) ((|abs| ($ $)) T (ELT $ 63)) ((|sign| ((|Integer|) $)) T (ELT $ NIL)) - ((|negative?| ((|Boolean|) $)) T (ELT $ 75)) + ((|negative?| ((|Boolean|) $)) T (ELT $ 76)) ((|positive?| ((|Boolean|) $)) T (ELT $ NIL)) ((|min| ($ $ $)) T (ELT $ 68)) ((|max| ($ $ $)) T (ELT $ 67)) @@ -593,10 +591,10 @@ ((|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) $)) - T (ELT $ 85)) + T (ELT $ 86)) ((|exquo| ((|Union| $ "failed") $ $)) T (ELT $ NIL)) ((|coerce| ($ $)) T (ELT $ NIL)) - ((|coerce| ($ (|Integer|))) T (ELT $ 81)) + ((|coerce| ($ (|Integer|))) T (ELT $ 82)) ((|characteristic| ((|NonNegativeInteger|))) T (ELT $ NIL)) ((|One| ($)) T (CONST $ 36)) @@ -616,7 +614,7 @@ ((* ($ (|PositiveInteger|) $)) T (ELT $ NIL)) ((+ ($ $ $)) T (ELT $ 53)) ((|latex| ((|String|) $)) T (ELT $ NIL)) - ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL)) + ((|hash| ((|SingleInteger|) $)) T (ELT $ 70)) ((|coerce| ((|OutputForm|) $)) T (ELT $ 31)) ((= ((|Boolean|) $ $)) T (ELT $ 40)) ((~= ((|Boolean|) $ $)) T (ELT $ NIL))) |