From 2b41f1bdaab0f71eebea39ec388371acd3777d62 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Tue, 15 Jun 2010 15:37:19 +0000 Subject: * algebra/catdef.spad.pamphlet (DifferentialSpace): New. --- src/ChangeLog | 4 ++ src/algebra/Makefile.in | 8 ++- src/algebra/Makefile.pamphlet | 8 ++- src/algebra/catdef.spad.pamphlet | 25 +++++++ src/algebra/strap/DFLOAT.lsp | 16 +++-- src/algebra/strap/DIFRING-.lsp | 33 ++++----- src/algebra/strap/DIFRING.lsp | 5 +- src/algebra/strap/INT.lsp | 137 +++++++++++++++++++------------------ src/algebra/strap/POLYCAT-.lsp | 17 +++-- src/algebra/strap/QFCAT-.lsp | 8 +-- src/algebra/strap/SINT.lsp | 141 ++++++++++++++++++++------------------- 11 files changed, 219 insertions(+), 183 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 36ba420b..08839649 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-06-15 Gabriel Dos Reis + + * algebra/catdef.spad.pamphlet (DifferentialSpace): New. + 2010-06-14 Gabriel Dos Reis * algebra/catdef.spad.pamphlet (LinearlyExplicitRingOver): Now diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index a70711d9..a520dce5 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -258,11 +258,12 @@ $(OUT)/PRQAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FLAGG.$(FASLEXT): $(OUT)/BMODULE.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) \ $(OUT)/LINEXP.$(FASLEXT) $(OUT)/PATMAB.$(FASLEXT) \ - $(OUT)/REAL.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) + $(OUT)/REAL.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ + $(OUT)/DIFFDOM.$(FASLEXT) $(OUT)/A1AGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/LOGIC.$(FASLEXT) \ $(OUT)/FLAGG.$(FASLEXT) $(OUT)/LOGIC-.$(FASLEXT) $(OUT)/SRAGG.$(FASLEXT): $(OUT)/A1AGG.$(FASLEXT) -$(OUT)/ISTRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) +$(OUT)/ISTRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) $(OUT)/DIFFDOM-.$(FASLEXT) $(OUT)/STAGG.$(FASLEXT): $(OUT)/URAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT): $(OUT)/SEGCAT.$(FASLEXT) $(OUT)/SEGCAT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) @@ -336,6 +337,7 @@ $(OUT)/VOID.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/OUT.$(FASLEXT): $(OUT)/VOID.$(FASLEXT) $(OUT)/DIFFDOM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) axiom_algebra_layer_0 = \ AHYP ATTREG CFCAT ELTAB KOERCE KONVERT \ @@ -360,7 +362,7 @@ axiom_algebra_layer_0 = \ RCAGG RCAGG- SETAGG SETAGG- HOAGG HOAGG- \ TBAGG TBAGG- KDAGG KDAGG- DIAGG DIAGG- \ DIOPS DIOPS- STRING STRICAT ISTRING ILIST \ - LIST DIFFDOM DIFFDOM- \ + LIST DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- \ LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ RTVALUE SYSPTR diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 9f76645f..128ce269 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -212,11 +212,12 @@ $(OUT)/PRQAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FLAGG.$(FASLEXT): $(OUT)/BMODULE.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) \ $(OUT)/LINEXP.$(FASLEXT) $(OUT)/PATMAB.$(FASLEXT) \ - $(OUT)/REAL.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) + $(OUT)/REAL.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ + $(OUT)/DIFFDOM.$(FASLEXT) $(OUT)/A1AGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/LOGIC.$(FASLEXT) \ $(OUT)/FLAGG.$(FASLEXT) $(OUT)/LOGIC-.$(FASLEXT) $(OUT)/SRAGG.$(FASLEXT): $(OUT)/A1AGG.$(FASLEXT) -$(OUT)/ISTRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) +$(OUT)/ISTRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) $(OUT)/DIFFDOM-.$(FASLEXT) $(OUT)/STAGG.$(FASLEXT): $(OUT)/URAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT): $(OUT)/SEGCAT.$(FASLEXT) $(OUT)/SEGCAT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) @@ -290,6 +291,7 @@ $(OUT)/VOID.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/OUT.$(FASLEXT): $(OUT)/VOID.$(FASLEXT) $(OUT)/DIFFDOM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) axiom_algebra_layer_0 = \ AHYP ATTREG CFCAT ELTAB KOERCE KONVERT \ @@ -314,7 +316,7 @@ axiom_algebra_layer_0 = \ RCAGG RCAGG- SETAGG SETAGG- HOAGG HOAGG- \ TBAGG TBAGG- KDAGG KDAGG- DIAGG DIAGG- \ DIOPS DIOPS- STRING STRICAT ISTRING ILIST \ - LIST DIFFDOM DIFFDOM- \ + LIST DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- \ LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ RTVALUE SYSPTR diff --git a/src/algebra/catdef.spad.pamphlet b/src/algebra/catdef.spad.pamphlet index 0a1a435b..815e4d43 100644 --- a/src/algebra/catdef.spad.pamphlet +++ b/src/algebra/catdef.spad.pamphlet @@ -383,6 +383,31 @@ DifferentialDomain(T: Type): Category == Type with @ +<>= +)abbrev category DIFFSPC DifferentialSpace +++ Author: Gabriel Dos Reis +++ Date Created: June 13, 2010 +++ Date Last Modified: June 15, 2010 +++ Description: +++ This category is like \spadtype{DifferentialDomain} where the +++ target of the differentiation operator is the same as its source. +DifferentialSpace(): Category == DifferentialDomain % with + differentiate: (%, NonNegativeInteger) -> % + ++ \spad{differentiate(x,n)} returns the \spad{n}-th + ++ derivative of \spad{x}. + D: (%, NonNegativeInteger) -> % + ++ \spad{D(x, n)} returns the \spad{n}-th derivative of \spad{x}. + add + differentiate(r, n) == + for i in 1..n repeat r := differentiate r + r + D(r,n) == + differentiate(r,n) + +@ + + + \section{category DIFRING DifferentialRing} <>= )abbrev category DIFRING DifferentialRing diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index a33c35b3..4cb323b5 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -1004,7 +1004,7 @@ (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)) + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)) (CONS '#(|FloatingPointSystem&| |RealNumberSystem&| |Field&| |EuclideanDomain&| NIL |UniqueFactorizationDomain&| |GcdDomain&| @@ -1017,12 +1017,12 @@ NIL NIL NIL NIL |AbelianSemiGroup&| |SemiGroup&| NIL |TranscendentalFunctionCategory&| - |RetractableTo&| |RetractableTo&| NIL - |SetCategory&| NIL + |DifferentialDomain&| |RetractableTo&| + |RetractableTo&| NIL |SetCategory&| NIL |ElementaryFunctionCategory&| NIL |HyperbolicFunctionCategory&| |ArcTrigonometricFunctionCategory&| - |TrigonometricFunctionCategory&| NIL NIL + |TrigonometricFunctionCategory&| NIL NIL NIL |RadicalCategory&| NIL NIL NIL NIL NIL |BasicType&| NIL) (CONS '#((|FloatingPointSystem|) @@ -1056,6 +1056,7 @@ (|AbelianSemiGroup|) (|SemiGroup|) (|LeftLinearSet| 26) (|TranscendentalFunctionCategory|) + (|DifferentialDomain| $$) (|RetractableTo| 114) (|RetractableTo| 26) (|RealConstant|) (|SetCategory|) (|ConvertibleTo| 50) @@ -1064,7 +1065,8 @@ (|HyperbolicFunctionCategory|) (|ArcTrigonometricFunctionCategory|) (|TrigonometricFunctionCategory|) - (|OpenMath|) (|ConvertibleTo| 154) + (|OpenMath|) (|Type|) + (|ConvertibleTo| 154) (|RadicalCategory|) (|ConvertibleTo| 111) (|ConvertibleTo| 13) @@ -1113,8 +1115,8 @@ 0 1 2 0 158 0 0 1 3 0 160 0 0 0 1 2 0 102 0 0 1 2 0 157 156 0 1 1 0 26 0 28 0 0 0 45 1 0 0 0 71 1 0 115 0 1 2 0 - 139 0 0 1 0 0 24 1 1 0 0 0 104 2 0 0 - 0 115 1 1 0 0 0 88 1 0 0 0 78 1 0 0 0 + 139 0 0 1 0 0 24 1 2 0 0 0 115 1 1 0 + 0 0 104 1 0 0 0 88 1 0 0 0 78 1 0 0 0 89 1 0 0 0 76 1 0 0 0 86 1 0 0 0 74 1 0 50 0 52 1 0 154 0 1 1 0 111 0 113 1 0 13 0 14 1 0 0 114 1 1 0 0 26 70 1 0 diff --git a/src/algebra/strap/DIFRING-.lsp b/src/algebra/strap/DIFRING-.lsp index 02ec25d9..a10aba70 100644 --- a/src/algebra/strap/DIFRING-.lsp +++ b/src/algebra/strap/DIFRING-.lsp @@ -1,36 +1,31 @@ (/VERSIONCHECK 2) -(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|) - |DIFRING-;D;2S;1|)) - (DECLAIM (FTYPE (FUNCTION (|%Thing| (|%IntegerSection| 0) |%Shell|) |%Thing|) - |DIFRING-;differentiate;SNniS;2|)) + |DIFRING-;differentiate;SNniS;1|)) (DECLAIM (FTYPE (FUNCTION (|%Thing| (|%IntegerSection| 0) |%Shell|) |%Thing|) - |DIFRING-;D;SNniS;3|)) - -(DEFUN |DIFRING-;D;2S;1| (|r| $) (SPADCALL |r| (|getShellEntry| $ 7))) + |DIFRING-;D;SNniS;2|)) -(DEFUN |DIFRING-;differentiate;SNniS;2| (|r| |n| $) +(DEFUN |DIFRING-;differentiate;SNniS;1| (|r| |n| $) (PROG (|i|) (RETURN - (SEQ (SEQ (LETT |i| 1 |DIFRING-;differentiate;SNniS;2|) G190 + (SEQ (SEQ (LETT |i| 1 |DIFRING-;differentiate;SNniS;1|) G190 (COND ((QSGREATERP |i| |n|) (GO G191))) (SEQ (EXIT (LETT |r| (SPADCALL |r| (|getShellEntry| $ 7)) - |DIFRING-;differentiate;SNniS;2|))) + |DIFRING-;differentiate;SNniS;1|))) (SETQ |i| (QSADD1 |i|)) (GO G190) G191 (EXIT NIL)) (EXIT |r|))))) -(DEFUN |DIFRING-;D;SNniS;3| (|r| |n| $) - (SPADCALL |r| |n| (|getShellEntry| $ 11))) +(DEFUN |DIFRING-;D;SNniS;2| (|r| |n| $) + (SPADCALL |r| |n| (|getShellEntry| $ 10))) (DEFUN |DifferentialRing&| (|#1|) (LET* ((|dv$1| (|devaluate| |#1|)) - (|dv$| (LIST '|DifferentialRing&| |dv$1|)) ($ (|newShell| 13)) + (|dv$| (LIST '|DifferentialRing&| |dv$1|)) ($ (|newShell| 12)) (|pv$| (|buildPredVector| 0 0 NIL))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) @@ -40,14 +35,14 @@ (MAKEPROP '|DifferentialRing&| '|infovec| (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) - (0 . |differentiate|) |DIFRING-;D;2S;1| - (|NonNegativeInteger|) |DIFRING-;differentiate;SNniS;2| - (5 . |differentiate|) |DIFRING-;D;SNniS;3|) + (0 . |differentiate|) (|NonNegativeInteger|) + |DIFRING-;differentiate;SNniS;1| (5 . |differentiate|) + |DIFRING-;D;SNniS;2|) '#(|differentiate| 11 D 17) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 12 - '(1 6 0 0 7 2 6 0 0 9 11 2 0 0 0 9 10 2 - 0 0 0 9 12 1 0 0 0 8))))) + (|makeByteWordVec2| 11 + '(1 6 0 0 7 2 6 0 0 8 10 2 0 0 0 8 9 2 + 0 0 0 8 11))))) '|lookupComplete|)) diff --git a/src/algebra/strap/DIFRING.lsp b/src/algebra/strap/DIFRING.lsp index 2d5ab93c..8777af26 100644 --- a/src/algebra/strap/DIFRING.lsp +++ b/src/algebra/strap/DIFRING.lsp @@ -5,10 +5,9 @@ (DEFUN |DifferentialRing;| () (LET ((#0=#:G1397 - (|Join| (|Ring|) + (|Join| (|Ring|) (|DifferentialDomain| '$) (|mkCategory| '|domain| - '(((|differentiate| ($ $)) T) ((D ($ $)) T) - ((|differentiate| + '(((|differentiate| ($ $ (|NonNegativeInteger|))) T) ((D ($ $ (|NonNegativeInteger|))) T)) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index 80d2f9e7..e6b040eb 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -597,36 +597,35 @@ (|HeuGcd| 103) (162 . |gcd|) (|SparseUnivariatePolynomial| $) |INT;gcdPolynomial;3Sup;60| (|Fraction| 17) - (|Union| 129 '"failed") (|PatternMatchResult| 17 $) - (|Pattern| 17) (|Union| 17 '"failed") (|List| $) + (|Union| 129 '"failed") (|Pattern| 17) + (|PatternMatchResult| 17 $) (|Union| 17 '"failed") + (|List| $) (|Record| (|:| |coef| 134) (|:| |generator| $)) (|Union| 134 '"failed") - (|Record| (|:| |coef| 134) (|:| |generator| $)) - (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 137 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) - (|PositiveInteger|)) + (|Record| (|:| |coef1| $) (|:| |coef2| $)) + (|Union| 138 '"failed") (|PositiveInteger|)) '#(~= 167 |zero?| 173 |unitNormal| 178 |unitCanonical| 183 |unit?| 188 |symmetricRemainder| 193 |subtractIfCan| 199 |submod| 205 |squareFreePart| 212 |squareFree| 217 |sizeLess?| 222 |sign| 228 |shift| 233 |sample| 239 |retractIfCan| 243 |retract| 248 |rem| 253 |reducedSystem| - 259 |recip| 270 |rationalIfCan| 275 |rational?| 280 - |rational| 285 |random| 290 |quo| 299 |principalIdeal| 305 - |prime?| 310 |powmod| 315 |positiveRemainder| 322 - |positive?| 328 |permutation| 333 |patternMatch| 339 - |one?| 346 |odd?| 351 |nextItem| 356 |negative?| 361 - |multiEuclidean| 366 |mulmod| 372 |min| 379 |max| 385 - |mask| 391 |length| 396 |lcm| 401 |latex| 412 |invmod| 417 - |init| 423 |inc| 427 |hash| 432 |gcdPolynomial| 437 |gcd| - 443 |factorial| 454 |factor| 459 |extendedEuclidean| 464 - |exquo| 477 |expressIdealMember| 483 |even?| 489 - |euclideanSize| 494 |divide| 499 |differentiate| 505 |dec| - 516 |copy| 521 |convert| 526 |coerce| 556 |characteristic| - 576 |bit?| 580 |binomial| 586 |before?| 592 |base| 598 - |associates?| 602 |addmod| 608 |abs| 615 |Zero| 620 |One| - 624 |OMwrite| 628 D 652 >= 663 > 669 = 675 <= 681 < 687 - - 693 + 704 ** 710 * 722) + 259 |recip| 275 |rationalIfCan| 280 |rational?| 285 + |rational| 290 |random| 295 |quo| 304 |principalIdeal| 310 + |prime?| 315 |powmod| 320 |positiveRemainder| 327 + |positive?| 333 |permutation| 338 |patternMatch| 344 + |one?| 351 |odd?| 356 |nextItem| 361 |negative?| 366 + |multiEuclidean| 371 |mulmod| 377 |min| 384 |max| 390 + |mask| 396 |length| 401 |lcm| 406 |latex| 417 |invmod| 422 + |init| 428 |inc| 432 |hash| 437 |gcdPolynomial| 442 |gcd| + 448 |factorial| 459 |factor| 464 |extendedEuclidean| 469 + |exquo| 482 |expressIdealMember| 488 |even?| 494 + |euclideanSize| 499 |divide| 504 |differentiate| 510 |dec| + 521 |copy| 526 |convert| 531 |coerce| 561 |characteristic| + 581 |bit?| 585 |binomial| 591 |before?| 597 |base| 603 + |associates?| 607 |addmod| 613 |abs| 620 |Zero| 625 |One| + 629 |OMwrite| 633 D 657 >= 668 > 674 = 680 <= 686 < 692 - + 698 + 709 ** 715 * 727) '((|infinite| . 0) (|noetherian| . 0) (|canonicalsClosed| . 0) (|canonical| . 0) (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0) @@ -636,18 +635,19 @@ (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0)) + 0 0 0 0 0)) (CONS '#(|IntegerNumberSystem&| |EuclideanDomain&| |UniqueFactorizationDomain&| NIL NIL |GcdDomain&| |IntegralDomain&| |Algebra&| NIL - NIL |DifferentialRing&| |OrderedRing&| NIL NIL - |Module&| NIL |Ring&| NIL NIL NIL NIL NIL - |AbelianGroup&| NIL NIL NIL NIL + |DifferentialRing&| |OrderedRing&| NIL NIL + |Module&| NIL NIL |Ring&| NIL NIL NIL NIL NIL + NIL |AbelianGroup&| NIL NIL NIL NIL |AbelianMonoid&| |Monoid&| NIL NIL |OrderedSet&| NIL NIL |AbelianSemiGroup&| |SemiGroup&| NIL NIL |RetractableTo&| - |SetCategory&| NIL NIL NIL NIL NIL NIL NIL NIL - NIL NIL |BasicType&| NIL) + |DifferentialDomain&| |SetCategory&| NIL NIL + NIL NIL NIL NIL NIL NIL NIL NIL NIL + |BasicType&| NIL) (CONS '#((|IntegerNumberSystem|) (|EuclideanDomain|) (|UniqueFactorizationDomain|) @@ -655,11 +655,13 @@ (|OrderedIntegralDomain|) (|GcdDomain|) (|IntegralDomain|) (|Algebra| $$) (|CharacteristicZero|) - (|LinearlyExplicitRingOver| 17) (|DifferentialRing|) (|OrderedRing|) (|CommutativeRing|) (|EntireRing|) - (|Module| $$) (|BiModule| $$ $$) - (|Ring|) (|OrderedAbelianGroup|) + (|Module| $$) + (|LinearlyExplicitRingOver| 17) + (|BiModule| $$ $$) (|Ring|) + (|LeftModule| 17) + (|OrderedAbelianGroup|) (|LeftModule| $$) (|Rng|) (|RightModule| $$) (|OrderedCancellationAbelianMonoid|) @@ -674,14 +676,16 @@ (|RightLinearSet| $$) (|AbelianSemiGroup|) (|SemiGroup|) (|LeftLinearSet| 17) (|RealConstant|) - (|RetractableTo| 17) (|SetCategory|) - (|OpenMath|) (|ConvertibleTo| 14) + (|RetractableTo| 17) + (|DifferentialDomain| $$) + (|SetCategory|) (|OpenMath|) + (|ConvertibleTo| 14) (|ConvertibleTo| 56) (|ConvertibleTo| 59) (|CombinatorialFunctionCategory|) - (|ConvertibleTo| 132) + (|ConvertibleTo| 131) (|ConvertibleTo| 62) - (|ConvertibleTo| 17) + (|ConvertibleTo| 17) (|Type|) (|CoercibleFrom| $$) (|CoercibleFrom| 17) (|BasicType|) (|CoercibleTo| 44)) @@ -703,37 +707,38 @@ 9 0 1 2 0 0 0 0 1 2 0 92 0 0 1 3 0 0 0 0 0 52 1 0 0 0 1 1 0 113 0 1 2 0 9 0 0 1 1 0 17 0 1 2 0 0 0 0 91 0 0 0 1 - 1 0 133 0 1 1 0 17 0 1 2 0 0 0 0 54 2 - 0 75 72 76 77 1 0 71 72 73 1 0 92 0 - 93 1 0 130 0 1 1 0 9 0 1 1 0 129 0 1 - 0 0 0 79 1 0 0 0 80 2 0 0 0 0 90 1 0 - 136 134 1 1 0 9 0 1 3 0 0 0 0 0 1 2 0 - 0 0 0 70 1 0 9 0 1 2 0 0 0 0 1 3 0 - 131 0 132 131 1 1 0 9 0 34 1 0 9 0 85 - 1 0 92 0 1 1 0 9 0 43 2 0 135 134 0 1 - 3 0 0 0 0 0 55 2 0 0 0 0 87 2 0 0 0 0 - 86 1 0 0 0 1 1 0 0 0 49 1 0 0 134 1 2 - 0 0 0 0 1 1 0 14 0 69 2 0 0 0 0 1 0 0 - 0 1 1 0 0 0 38 1 0 41 0 42 2 0 127 - 127 127 128 1 0 0 134 1 2 0 0 0 0 94 - 1 0 0 0 1 1 0 113 0 114 3 0 138 0 0 0 - 1 2 0 139 0 0 1 2 0 92 0 0 112 2 0 - 135 134 0 1 1 0 9 0 1 1 0 7 0 1 2 0 - 88 0 0 89 1 0 0 0 1 2 0 0 0 7 1 1 0 0 - 0 40 1 0 0 0 36 1 0 14 0 66 1 0 59 0 - 61 1 0 56 0 58 1 0 62 0 64 1 0 132 0 - 1 1 0 17 0 48 1 0 0 17 47 1 0 0 0 1 1 - 0 0 17 47 1 0 44 0 46 0 0 7 1 2 0 9 0 - 0 1 2 0 0 0 0 1 2 0 9 0 0 1 0 0 0 35 - 2 0 9 0 0 1 3 0 0 0 0 0 51 1 0 0 0 78 - 0 0 0 6 0 0 0 31 3 0 11 12 0 9 29 2 0 - 14 0 9 27 2 0 11 12 0 28 1 0 14 0 26 - 1 0 0 0 1 2 0 0 0 7 1 2 0 9 0 0 50 2 - 0 9 0 0 81 2 0 9 0 0 33 2 0 9 0 0 82 - 2 0 9 0 0 10 1 0 0 0 16 2 0 0 0 0 39 - 2 0 0 0 0 37 2 0 0 0 7 84 2 0 0 0 140 - 1 2 0 0 0 0 53 2 0 0 17 0 83 2 0 0 7 - 0 1 2 0 0 140 0 1))))) + 1 0 133 0 1 1 0 17 0 1 2 0 0 0 0 54 1 + 0 71 72 73 1 0 71 76 1 2 0 75 72 76 + 77 1 0 92 0 93 1 0 130 0 1 1 0 9 0 1 + 1 0 129 0 1 0 0 0 79 1 0 0 0 80 2 0 0 + 0 0 90 1 0 135 134 1 1 0 9 0 1 3 0 0 + 0 0 0 1 2 0 0 0 0 70 1 0 9 0 1 2 0 0 + 0 0 1 3 0 132 0 131 132 1 1 0 9 0 34 + 1 0 9 0 85 1 0 92 0 1 1 0 9 0 43 2 0 + 136 134 0 1 3 0 0 0 0 0 55 2 0 0 0 0 + 87 2 0 0 0 0 86 1 0 0 0 1 1 0 0 0 49 + 1 0 0 134 1 2 0 0 0 0 1 1 0 14 0 69 2 + 0 0 0 0 1 0 0 0 1 1 0 0 0 38 1 0 41 0 + 42 2 0 127 127 127 128 1 0 0 134 1 2 + 0 0 0 0 94 1 0 0 0 1 1 0 113 0 114 2 + 0 137 0 0 1 3 0 139 0 0 0 1 2 0 92 0 + 0 112 2 0 136 134 0 1 1 0 9 0 1 1 0 7 + 0 1 2 0 88 0 0 89 1 0 0 0 1 2 0 0 0 7 + 1 1 0 0 0 40 1 0 0 0 36 1 0 14 0 66 1 + 0 59 0 61 1 0 56 0 58 1 0 131 0 1 1 0 + 62 0 64 1 0 17 0 48 1 0 0 17 47 1 0 0 + 0 1 1 0 0 17 47 1 0 44 0 46 0 0 7 1 2 + 0 9 0 0 1 2 0 0 0 0 1 2 0 9 0 0 1 0 0 + 0 35 2 0 9 0 0 1 3 0 0 0 0 0 51 1 0 0 + 0 78 0 0 0 6 0 0 0 31 3 0 11 12 0 9 + 29 2 0 14 0 9 27 2 0 11 12 0 28 1 0 + 14 0 26 1 0 0 0 1 2 0 0 0 7 1 2 0 9 0 + 0 50 2 0 9 0 0 81 2 0 9 0 0 33 2 0 9 + 0 0 82 2 0 9 0 0 10 1 0 0 0 16 2 0 0 + 0 0 39 2 0 0 0 0 37 2 0 0 0 7 84 2 0 + 0 0 140 1 2 0 0 17 0 83 2 0 0 0 0 53 + 2 0 0 17 0 83 2 0 0 7 0 1 2 0 0 140 0 + 1))))) '|lookupComplete|)) (MAKEPROP '|Integer| 'NILADIC T) diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp index 4ca58e41..7da03455 100644 --- a/src/algebra/strap/POLYCAT-.lsp +++ b/src/algebra/strap/POLYCAT-.lsp @@ -1544,20 +1544,19 @@ 218 0 236 1 9 225 0 237 1 7 225 0 238 3 241 225 239 240 6 242 1 0 225 0 243 1 9 244 0 245 1 7 244 0 246 3 249 244 - 247 248 6 250 1 0 244 0 251 2 0 45 0 - 19 93 1 0 45 0 88 1 0 0 0 203 1 0 148 + 247 248 6 250 1 0 244 0 251 1 0 45 0 + 88 2 0 45 0 19 93 1 0 0 0 203 1 0 148 0 195 2 0 140 139 58 141 1 0 15 0 74 1 0 9 0 73 3 0 0 0 0 9 95 2 0 129 120 130 131 1 0 110 120 121 2 0 0 0 9 213 - 1 0 0 0 210 1 0 20 0 77 3 0 228 0 225 - 228 229 3 0 221 0 218 221 222 1 0 20 + 1 0 0 0 210 1 0 20 0 77 3 0 221 0 218 + 221 222 3 0 228 0 225 228 229 1 0 20 0 34 3 0 0 0 19 63 71 3 0 190 0 0 9 192 1 0 38 0 52 1 0 38 0 39 1 0 56 0 57 2 0 58 58 58 134 1 0 144 58 147 1 0 144 58 145 1 0 148 0 165 2 0 0 0 23 - 24 2 0 0 0 9 97 1 0 218 0 236 1 0 244 - 0 251 1 0 225 0 243 2 0 0 0 9 205 1 0 - 179 120 184 3 0 0 0 9 45 62 3 0 0 0 - 19 63 69 1 0 172 0 186 2 0 10 0 0 - 216))))) + 24 2 0 0 0 9 97 1 0 244 0 251 1 0 225 + 0 243 1 0 218 0 236 2 0 0 0 9 205 1 0 + 179 120 184 3 0 0 0 19 63 69 3 0 0 0 + 9 45 62 1 0 172 0 186 2 0 10 0 0 216))))) '|lookupComplete|)) diff --git a/src/algebra/strap/QFCAT-.lsp b/src/algebra/strap/QFCAT-.lsp index ffa5c6e5..bc8aab46 100644 --- a/src/algebra/strap/QFCAT-.lsp +++ b/src/algebra/strap/QFCAT-.lsp @@ -497,11 +497,11 @@ 109 5 23 0 0 67 67 67 67 110 2 23 111 0 67 112 1 0 94 0 96 1 0 64 0 66 1 0 67 0 93 1 0 56 0 61 2 0 113 27 114 - 115 1 0 23 27 28 0 0 0 99 3 0 84 0 77 - 84 85 3 0 75 0 68 75 76 1 0 0 0 10 1 + 115 1 0 23 27 28 0 0 0 99 3 0 75 0 68 + 75 76 3 0 84 0 77 84 85 1 0 0 0 10 1 0 17 0 20 2 0 0 21 0 22 0 0 0 16 1 0 0 0 55 2 0 0 0 21 36 1 0 0 0 12 1 0 - 45 0 48 1 0 37 0 40 1 0 41 0 44 1 0 - 68 0 71 1 0 77 0 80 1 0 0 56 58 1 0 0 + 45 0 48 1 0 41 0 44 1 0 37 0 40 1 0 + 77 0 80 1 0 68 0 71 1 0 0 56 58 1 0 0 86 91 0 0 29 31 2 0 49 0 0 51))))) '|lookupComplete|)) diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index d1f9499b..c86638ab 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -599,38 +599,38 @@ (|:| |associate| $)) |SINT;unitNormal;$R;62| (|Fraction| 5) (|Union| 99 '"failed") (|Union| $ '"failed") (|Float|) - (|DoubleFloat|) (|Pattern| 5) (|PatternMatchResult| 5 $) + (|DoubleFloat|) (|PatternMatchResult| 5 $) (|Pattern| 5) (|InputForm|) (|Union| 5 '"failed") (|List| $) - (|Union| 108 '"failed") (|Record| (|:| |coef| 108) (|:| |generator| $)) - (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 111 '"failed") + (|Union| 108 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) - (|Factored| $) (|SparseUnivariatePolynomial| $)) + (|Record| (|:| |coef1| $) (|:| |coef2| $)) + (|Union| 112 '"failed") (|Factored| $) + (|SparseUnivariatePolynomial| $)) '#(~= 78 ~ 84 |zero?| 89 |xor| 94 |unitNormal| 100 |unitCanonical| 105 |unit?| 110 |symmetricRemainder| 115 |subtractIfCan| 121 |submod| 127 |squareFreePart| 134 |squareFree| 139 |sizeLess?| 144 |size| 150 |sign| 154 |shift| 159 |sample| 165 |retractIfCan| 169 |retract| 174 - |rem| 179 |reducedSystem| 185 |recip| 196 |rationalIfCan| - 201 |rational?| 206 |rational| 211 |random| 216 |quo| 225 - |principalIdeal| 231 |prime?| 236 |powmod| 241 - |positiveRemainder| 248 |positive?| 254 |permutation| 259 - |patternMatch| 265 |or| 272 |one?| 278 |odd?| 283 |not| - 288 |nextItem| 293 |negative?| 298 |multiEuclidean| 303 - |mulmod| 309 |min| 316 |max| 326 |mask| 336 |lookup| 341 - |length| 346 |lcm| 351 |latex| 362 |invmod| 367 |init| 373 - |index| 377 |inc| 382 |hash| 387 |gcdPolynomial| 392 |gcd| - 398 |factorial| 409 |factor| 414 |extendedEuclidean| 419 - |exquo| 432 |expressIdealMember| 438 |even?| 444 - |euclideanSize| 449 |divide| 454 |differentiate| 460 |dec| - 471 |copy| 476 |convert| 481 |coerce| 506 |characteristic| - 526 |bit?| 530 |binomial| 536 |before?| 542 |base| 548 - |associates?| 552 |and| 558 |addmod| 564 |abs| 571 |\\/| - 576 |Zero| 582 |Or| 586 |One| 592 |OMwrite| 596 |Not| 620 - D 625 |And| 636 >= 642 > 648 = 654 <= 660 < 666 |/\\| 672 - - 678 + 689 ** 695 * 707) + |rem| 179 |reducedSystem| 185 |recip| 201 |rationalIfCan| + 206 |rational?| 211 |rational| 216 |random| 221 |quo| 230 + |principalIdeal| 236 |prime?| 241 |powmod| 246 + |positiveRemainder| 253 |positive?| 259 |permutation| 264 + |patternMatch| 270 |or| 277 |one?| 283 |odd?| 288 |not| + 293 |nextItem| 298 |negative?| 303 |multiEuclidean| 308 + |mulmod| 314 |min| 321 |max| 331 |mask| 341 |lookup| 346 + |length| 351 |lcm| 356 |latex| 367 |invmod| 372 |init| 378 + |index| 382 |inc| 387 |hash| 392 |gcdPolynomial| 397 |gcd| + 403 |factorial| 414 |factor| 419 |extendedEuclidean| 424 + |exquo| 437 |expressIdealMember| 443 |even?| 449 + |euclideanSize| 454 |divide| 459 |differentiate| 465 |dec| + 476 |copy| 481 |convert| 486 |coerce| 511 |characteristic| + 531 |bit?| 535 |binomial| 541 |before?| 547 |base| 553 + |associates?| 557 |and| 563 |addmod| 569 |abs| 576 |\\/| + 581 |Zero| 587 |Or| 591 |One| 597 |OMwrite| 601 |Not| 625 + D 630 |And| 641 >= 647 > 653 = 659 <= 665 < 671 |/\\| 677 + - 683 + 694 ** 700 * 712) '((|noetherian| . 0) (|canonicalsClosed| . 0) (|canonical| . 0) (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0) (|noZeroDivisors| . 0) @@ -639,18 +639,19 @@ (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0)) + 0 0 0 0 0 0 0 0)) (CONS '#(|IntegerNumberSystem&| |EuclideanDomain&| |UniqueFactorizationDomain&| NIL NIL |GcdDomain&| |IntegralDomain&| |Algebra&| NIL - NIL |DifferentialRing&| |OrderedRing&| NIL NIL - |Module&| NIL |Ring&| NIL NIL NIL NIL NIL - |AbelianGroup&| NIL NIL NIL NIL NIL + |DifferentialRing&| |OrderedRing&| NIL NIL + |Module&| NIL NIL |Ring&| NIL NIL NIL NIL NIL + NIL |AbelianGroup&| NIL NIL NIL NIL NIL |AbelianMonoid&| |Monoid&| NIL NIL NIL |OrderedSet&| NIL NIL |AbelianSemiGroup&| |SemiGroup&| NIL |Logic&| NIL NIL - |RetractableTo&| |SetCategory&| NIL NIL NIL - NIL NIL NIL NIL NIL NIL NIL |BasicType&| NIL) + |RetractableTo&| |DifferentialDomain&| + |SetCategory&| NIL NIL NIL NIL NIL NIL NIL NIL + NIL NIL |BasicType&| NIL) (CONS '#((|IntegerNumberSystem|) (|EuclideanDomain|) (|UniqueFactorizationDomain|) @@ -658,11 +659,12 @@ (|OrderedIntegralDomain|) (|GcdDomain|) (|IntegralDomain|) (|Algebra| $$) (|CharacteristicZero|) - (|LinearlyExplicitRingOver| 5) (|DifferentialRing|) (|OrderedRing|) (|CommutativeRing|) (|EntireRing|) - (|Module| $$) (|BiModule| $$ $$) - (|Ring|) (|OrderedAbelianGroup|) + (|Module| $$) + (|LinearlyExplicitRingOver| 5) + (|BiModule| $$ $$) (|Ring|) + (|LeftModule| 5) (|OrderedAbelianGroup|) (|LeftModule| $$) (|Rng|) (|RightModule| $$) (|OrderedCancellationAbelianMonoid|) @@ -679,16 +681,17 @@ (|AbelianSemiGroup|) (|SemiGroup|) (|LeftLinearSet| 5) (|Logic|) (|BooleanLogic|) (|RealConstant|) - (|RetractableTo| 5) (|SetCategory|) - (|OpenMath|) (|Type|) + (|RetractableTo| 5) + (|DifferentialDomain| $$) + (|SetCategory|) (|OpenMath|) (|ConvertibleTo| 102) (|ConvertibleTo| 103) (|CombinatorialFunctionCategory|) - (|ConvertibleTo| 104) + (|ConvertibleTo| 105) (|ConvertibleTo| 106) - (|ConvertibleTo| 5) (|CoercibleFrom| $$) - (|CoercibleFrom| 5) (|BasicType|) - (|CoercibleTo| 33)) + (|ConvertibleTo| 5) (|Type|) + (|CoercibleFrom| $$) (|CoercibleFrom| 5) + (|BasicType|) (|CoercibleTo| 33)) (|makeByteWordVec2| 115 '(0 5 0 8 1 12 11 0 13 3 12 11 0 14 14 15 2 12 11 0 5 18 1 12 11 0 19 0 20 0 @@ -701,40 +704,40 @@ 0 0 0 0 0 81 1 0 0 0 1 1 0 114 0 1 2 0 9 0 0 1 0 0 61 83 1 0 5 0 1 2 0 0 0 0 78 0 0 0 1 1 0 107 0 1 1 0 5 0 1 2 - 0 0 0 0 64 1 0 30 31 32 2 0 90 31 91 - 92 1 0 101 0 1 1 0 100 0 1 1 0 9 0 1 - 1 0 99 0 1 0 0 0 95 1 0 0 0 96 2 0 0 - 0 0 63 1 0 110 108 1 1 0 9 0 1 3 0 0 - 0 0 0 1 2 0 0 0 0 93 1 0 9 0 1 2 0 0 - 0 0 1 3 0 105 0 104 105 1 2 0 0 0 0 - 52 1 0 9 0 72 1 0 9 0 69 1 0 0 0 45 1 - 0 101 0 1 1 0 9 0 82 2 0 109 108 0 1 - 3 0 0 0 0 0 79 0 0 0 42 2 0 0 0 0 74 - 0 0 0 41 2 0 0 0 0 73 1 0 0 0 1 1 0 - 84 0 88 1 0 0 0 77 2 0 0 0 0 1 1 0 0 - 108 1 1 0 14 0 1 2 0 0 0 0 1 0 0 0 1 - 1 0 0 84 87 1 0 0 0 57 1 0 75 0 76 2 - 0 115 115 115 1 2 0 0 0 0 67 1 0 0 - 108 1 1 0 0 0 1 1 0 114 0 1 3 0 112 0 - 0 0 1 2 0 113 0 0 1 2 0 101 0 0 1 2 0 - 109 108 0 1 1 0 9 0 1 1 0 61 0 1 2 0 - 65 0 0 66 1 0 0 0 1 2 0 0 0 61 1 1 0 - 0 0 58 1 0 0 0 1 1 0 102 0 1 1 0 103 - 0 1 1 0 104 0 1 1 0 106 0 1 1 0 5 0 - 17 1 0 0 5 94 1 0 0 0 1 1 0 0 5 94 1 - 0 33 0 35 0 0 61 1 2 0 9 0 0 1 2 0 0 - 0 0 1 2 0 9 0 0 1 0 0 0 40 2 0 9 0 0 - 1 2 0 0 0 0 50 3 0 0 0 0 0 80 1 0 0 0 - 68 2 0 0 0 0 47 0 0 0 7 2 0 0 0 0 51 - 0 0 0 39 3 0 11 12 0 9 29 2 0 14 0 9 - 27 2 0 11 12 0 28 1 0 14 0 26 1 0 0 0 - 48 1 0 0 0 1 2 0 0 0 61 1 2 0 0 0 0 + 0 0 0 0 64 1 0 30 91 1 2 0 90 31 91 + 92 1 0 30 31 32 1 0 101 0 1 1 0 100 0 + 1 1 0 9 0 1 1 0 99 0 1 0 0 0 95 1 0 0 + 0 96 2 0 0 0 0 63 1 0 109 108 1 1 0 9 + 0 1 3 0 0 0 0 0 1 2 0 0 0 0 93 1 0 9 + 0 1 2 0 0 0 0 1 3 0 104 0 105 104 1 2 + 0 0 0 0 52 1 0 9 0 72 1 0 9 0 69 1 0 + 0 0 45 1 0 101 0 1 1 0 9 0 82 2 0 110 + 108 0 1 3 0 0 0 0 0 79 0 0 0 42 2 0 0 + 0 0 74 0 0 0 41 2 0 0 0 0 73 1 0 0 0 + 1 1 0 84 0 88 1 0 0 0 77 1 0 0 108 1 + 2 0 0 0 0 1 1 0 14 0 1 2 0 0 0 0 1 0 + 0 0 1 1 0 0 84 87 1 0 0 0 57 1 0 75 0 + 76 2 0 115 115 115 1 1 0 0 108 1 2 0 + 0 0 0 67 1 0 0 0 1 1 0 114 0 1 2 0 + 111 0 0 1 3 0 113 0 0 0 1 2 0 101 0 0 + 1 2 0 110 108 0 1 1 0 9 0 1 1 0 61 0 + 1 2 0 65 0 0 66 1 0 0 0 1 2 0 0 0 61 + 1 1 0 0 0 58 1 0 0 0 1 1 0 102 0 1 1 + 0 103 0 1 1 0 106 0 1 1 0 105 0 1 1 0 + 5 0 17 1 0 0 5 94 1 0 0 0 1 1 0 0 5 + 94 1 0 33 0 35 0 0 61 1 2 0 9 0 0 1 2 + 0 0 0 0 1 2 0 9 0 0 1 0 0 0 40 2 0 9 + 0 0 1 2 0 0 0 0 50 3 0 0 0 0 0 80 1 0 + 0 0 68 2 0 0 0 0 47 0 0 0 7 2 0 0 0 0 + 51 0 0 0 39 3 0 11 12 0 9 29 2 0 14 0 + 9 27 2 0 11 12 0 28 1 0 14 0 26 1 0 0 + 0 48 1 0 0 0 1 2 0 0 0 61 1 2 0 0 0 0 49 2 0 9 0 0 56 2 0 9 0 0 54 2 0 9 0 0 43 2 0 9 0 0 55 2 0 9 0 0 10 2 0 0 - 0 0 46 2 0 0 0 0 60 1 0 0 0 16 2 0 0 + 0 0 46 1 0 0 0 16 2 0 0 0 0 60 2 0 0 0 0 59 2 0 0 0 61 62 2 0 0 0 84 1 2 0 - 0 0 0 37 2 0 0 5 0 38 2 0 0 61 0 1 2 - 0 0 84 0 1))))) + 0 5 0 38 2 0 0 0 0 37 2 0 0 5 0 38 2 + 0 0 61 0 1 2 0 0 84 0 1))))) '|lookupComplete|)) (MAKEPROP '|SingleInteger| 'NILADIC T) -- cgit v1.2.3