From 77d293322d11ad09575a85f421796da7db471797 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Tue, 29 Jun 2010 16:22:49 +0000 Subject: * algebra/catdef.spad.pamphlet (BasicType) [before?]: Declare here. (OrderedType) [max,min]: Export and provide defaults. (OrderedSet): Simplify. (SetCategory) [before?]: Move to BasicType. --- src/algebra/strap/BOOLEAN.lsp | 18 +++++++++--------- src/algebra/strap/CHAR.lsp | 9 +++++---- src/algebra/strap/DFLOAT.lsp | 13 +++++++------ src/algebra/strap/ILIST.lsp | 37 +++++++++++++++++++------------------ src/algebra/strap/INT.lsp | 13 +++++++------ src/algebra/strap/ISTRING.lsp | 42 ++++++++++++++++++++++-------------------- src/algebra/strap/LIST.lsp | 21 +++++++++++---------- src/algebra/strap/NNI.lsp | 20 +++++++++++--------- src/algebra/strap/PI.lsp | 18 +++++++++--------- src/algebra/strap/SINT.lsp | 14 +++++++------- src/algebra/strap/SYMBOL.lsp | 9 +++++---- src/algebra/strap/VECTOR.lsp | 26 ++++++++++++++------------ 12 files changed, 126 insertions(+), 114 deletions(-) (limited to 'src/algebra/strap') diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index 97df8f04..32d29e58 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -191,7 +191,7 @@ |BOOLEAN;lookup;$Pi;19| (9 . |random|) |BOOLEAN;random;$;20| (|InputForm|) |BOOLEAN;convert;$If;21| (|OutputForm|) - |BOOLEAN;coerce;$Of;22| (|SingleInteger|) (|String|)) + |BOOLEAN;coerce;$Of;22| (|String|) (|SingleInteger|)) '#(~= 13 ~ 19 |xor| 24 |true| 30 |test| 34 |size| 39 |random| 43 |or| 47 |not| 53 |nor| 58 |nand| 64 |min| 70 |max| 80 |lookup| 90 |latex| 95 |index| 100 |implies| 105 |hash| @@ -199,23 +199,23 @@ |before?| 136 |and| 142 |\\/| 148 >= 154 > 160 = 166 <= 172 < 178 |/\\| 184) 'NIL - (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0)) - (CONS '#(NIL |OrderedSet&| NIL NIL |Logic&| - |SetCategory&| NIL |BasicType&| NIL NIL NIL) + (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0)) + (CONS '#(NIL NIL NIL NIL |Logic&| |SetCategory&| + |OrderedType&| NIL |BasicType&| NIL NIL NIL) (CONS '#((|OrderedFinite|) (|OrderedSet|) (|PropositionalLogic|) (|Finite|) (|Logic|) (|SetCategory|) - (|BooleanLogic|) (|BasicType|) - (|ConvertibleTo| 33) (|Type|) - (|CoercibleTo| 35)) + (|OrderedType|) (|BooleanLogic|) + (|BasicType|) (|ConvertibleTo| 33) + (|Type|) (|CoercibleTo| 35)) (|makeByteWordVec2| 38 '(1 25 18 0 26 0 27 0 29 0 25 0 31 2 0 18 0 0 1 1 0 0 0 10 2 0 0 0 0 15 0 0 0 7 1 0 0 0 6 0 0 23 24 0 0 0 32 2 0 0 0 0 13 1 0 0 0 9 2 0 0 0 0 16 2 0 0 0 0 17 0 0 0 1 2 0 0 0 0 1 0 0 0 1 2 - 0 0 0 0 1 1 0 27 0 30 1 0 38 0 1 1 0 - 0 27 28 2 0 0 0 0 20 1 0 37 0 1 0 0 0 + 0 0 0 0 1 1 0 27 0 30 1 0 37 0 1 1 0 + 0 27 28 2 0 0 0 0 20 1 0 38 0 1 0 0 0 8 2 0 0 0 0 21 1 0 33 0 34 1 0 35 0 36 2 0 18 0 0 1 2 0 0 0 0 11 2 0 0 0 0 14 2 0 18 0 0 1 2 0 18 0 0 1 2 0 18 diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp index 9db524ee..ed6ac052 100644 --- a/src/algebra/strap/CHAR.lsp +++ b/src/algebra/strap/CHAR.lsp @@ -243,12 +243,13 @@ |alphanumeric?| 210 |alphabetic?| 215 >= 220 > 226 = 232 <= 238 < 244) 'NIL - (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0)) - (CONS '#(NIL |OrderedSet&| NIL |SetCategory&| + (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0)) + (CONS '#(NIL NIL NIL |SetCategory&| |OrderedType&| |BasicType&| NIL NIL) (CONS '#((|OrderedFinite|) (|OrderedSet|) - (|Finite|) (|SetCategory|) (|BasicType|) - (|Type|) (|CoercibleTo| 29)) + (|Finite|) (|SetCategory|) + (|OrderedType|) (|BasicType|) (|Type|) + (|CoercibleTo| 29)) (|makeByteWordVec2| 57 '(0 14 0 15 0 12 0 16 2 17 0 0 0 18 2 12 0 0 0 22 1 12 0 0 24 0 31 0 32 2 diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index f290b4f4..596307d8 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -968,7 +968,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 0 0 0 0 0)) (CONS '#(|FloatingPointSystem&| |RealNumberSystem&| |Field&| |EuclideanDomain&| NIL |UniqueFactorizationDomain&| |GcdDomain&| @@ -976,10 +976,10 @@ |Algebra&| NIL NIL |OrderedRing&| |Module&| NIL NIL |Module&| NIL NIL |Ring&| NIL NIL NIL NIL NIL NIL NIL |AbelianGroup&| NIL NIL NIL - NIL NIL |AbelianMonoid&| |Monoid&| NIL - |OrderedSet&| NIL NIL NIL NIL - |AbelianSemiGroup&| |SemiGroup&| NIL - |DifferentialSpace&| |SetCategory&| + NIL NIL |AbelianMonoid&| |Monoid&| NIL NIL NIL + NIL NIL NIL |AbelianSemiGroup&| |SemiGroup&| + NIL |DifferentialSpace&| |OrderedType&| + |SetCategory&| |TranscendentalFunctionCategory&| |DifferentialDomain&| |RetractableTo&| |RetractableTo&| NIL |BasicType&| NIL @@ -1019,7 +1019,8 @@ (|RightLinearSet| $$) (|AbelianSemiGroup|) (|SemiGroup|) (|LeftLinearSet| 25) - (|DifferentialSpace|) (|SetCategory|) + (|DifferentialSpace|) (|OrderedType|) + (|SetCategory|) (|TranscendentalFunctionCategory|) (|DifferentialDomain| $$) (|RetractableTo| 114) diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index caed8efd..8ba9493f 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -459,12 +459,12 @@ (LIST '|CoercibleTo| '(|OutputForm|)))) (|HasCategory| |#1| (LIST '|ConvertibleTo| '(|InputForm|))) - (OR (|HasCategory| |#1| '(|BasicType|)) - (|HasCategory| |#1| '(|OrderedSet|)) - (|HasCategory| |#1| '(|SetCategory|))) (OR (|HasCategory| |#1| '(|OrderedSet|)) (|HasCategory| |#1| '(|SetCategory|))) (|HasCategory| |#1| '(|OrderedSet|)) + (OR (|HasCategory| |#1| '(|BasicType|)) + (|HasCategory| |#1| '(|OrderedSet|)) + (|HasCategory| |#1| '(|SetCategory|))) (|HasCategory| (|Integer|) '(|OrderedSet|)) (|HasCategory| |#1| '(|SetCategory|)) (|HasCategory| |#1| @@ -555,15 +555,15 @@ 904 > 910 = 916 <= 922 < 928 |#| 934) '((|shallowlyMutable| . 0) (|finiteAggregate| . 0)) (CONS (|makeByteWordVec2| 6 - '(0 0 0 0 0 0 0 0 0 0 6 0 5 0 0 0 1 4 0 1 2 3)) + '(0 0 0 0 0 0 0 0 0 0 5 0 4 5 0 0 0 1 6 0 1 2 3)) (CONS '#(|ListAggregate&| |StreamAggregate&| |ExtensibleLinearAggregate&| |FiniteLinearAggregate&| |UnaryRecursiveAggregate&| |LinearAggregate&| |RecursiveAggregate&| |IndexedAggregate&| - |Collection&| |HomogeneousAggregate&| - |OrderedSet&| |EltableAggregate&| - |SetCategory&| NIL |Aggregate&| NIL + |Collection&| |HomogeneousAggregate&| NIL + |EltableAggregate&| |SetCategory&| + |OrderedType&| NIL |Aggregate&| NIL |Evalable&| |BasicType&| NIL |InnerEvalable&| NIL NIL) (CONS '#((|ListAggregate| 6) @@ -577,9 +577,10 @@ (|Collection| 6) (|HomogeneousAggregate| 6) (|OrderedSet|) (|EltableAggregate| 30 6) - (|SetCategory|) (|Eltable| 78 $$) - (|Aggregate|) (|Eltable| 30 6) - (|Evalable| 6) (|BasicType|) (|Type|) + (|SetCategory|) (|OrderedType|) + (|Eltable| 78 $$) (|Aggregate|) + (|Eltable| 30 6) (|Evalable| 6) + (|BasicType|) (|Type|) (|InnerEvalable| 6 6) (|CoercibleTo| 37) (|ConvertibleTo| 82)) (|makeByteWordVec2| 85 @@ -595,8 +596,8 @@ 30 0 0 0 69 2 30 11 0 0 71 2 30 0 0 0 72 2 10 11 0 0 1 1 0 6 0 1 1 0 6 0 1 1 0 0 0 1 3 0 77 0 30 30 1 2 0 0 0 30 - 70 1 6 11 0 1 2 0 11 63 0 1 1 6 0 0 1 - 2 0 0 63 0 64 1 6 0 0 1 2 0 0 63 0 1 + 70 1 5 11 0 1 2 0 11 63 0 1 1 5 0 0 1 + 2 0 0 63 0 64 1 5 0 0 1 2 0 0 63 0 1 2 0 11 0 8 1 2 0 6 0 6 1 2 0 0 0 0 23 2 0 6 0 6 1 2 0 6 0 6 21 3 0 6 0 30 6 1 3 0 6 0 78 6 1 3 0 6 0 79 6 1 3 0 0 @@ -611,9 +612,9 @@ 3 8 30 6 0 30 1 2 8 30 6 0 1 2 0 30 76 0 1 1 0 25 0 27 1 0 44 0 1 2 8 11 0 0 1 2 0 0 8 6 1 2 0 11 0 8 1 1 7 30 - 0 31 2 6 0 0 0 1 2 6 0 0 0 1 3 0 0 63 - 0 0 65 2 6 0 0 0 1 3 0 0 63 0 0 1 1 0 - 25 0 1 2 8 11 6 0 60 1 7 30 0 1 2 6 0 + 0 31 2 5 0 0 0 1 2 5 0 0 0 1 3 0 0 63 + 0 0 65 2 5 0 0 0 1 3 0 0 63 0 0 1 1 0 + 25 0 1 2 8 11 6 0 60 1 7 30 0 1 2 5 0 0 0 1 2 0 0 81 0 1 3 0 0 73 0 0 1 2 0 0 81 0 1 1 0 0 6 1 2 0 11 0 8 1 1 0 25 0 1 1 0 11 0 1 1 8 55 0 58 2 0 0 0 @@ -635,8 +636,8 @@ 0 0 36 1 3 82 0 1 1 0 0 25 26 2 0 0 0 6 1 2 0 0 0 0 61 2 0 0 0 6 1 1 0 0 44 1 2 0 0 6 0 10 2 0 0 0 0 1 1 9 37 0 - 50 1 0 44 0 1 2 8 11 0 0 1 2 8 11 0 0 - 1 2 0 11 76 0 1 2 6 11 0 0 1 2 6 11 0 - 0 1 2 10 11 0 0 54 2 6 11 0 0 1 2 6 + 50 1 0 44 0 1 2 8 11 0 0 1 2 10 11 0 + 0 1 2 0 11 76 0 1 2 5 11 0 0 1 2 5 11 + 0 0 1 2 10 11 0 0 54 2 5 11 0 0 1 2 5 11 0 0 1 1 0 8 0 9))))) '|lookupComplete|)) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index 2bd30e1b..c489ab5c 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -612,16 +612,16 @@ (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)) (CONS '#(|IntegerNumberSystem&| |EuclideanDomain&| |UniqueFactorizationDomain&| NIL NIL |GcdDomain&| |IntegralDomain&| |Algebra&| NIL NIL |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 |DifferentialSpace&| + |AbelianMonoid&| |Monoid&| NIL NIL NIL NIL NIL + |AbelianSemiGroup&| |SemiGroup&| NIL + |DifferentialSpace&| |OrderedType&| |SetCategory&| NIL |RetractableTo&| |DifferentialDomain&| |BasicType&| NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) @@ -653,8 +653,9 @@ (|RightLinearSet| $$) (|AbelianSemiGroup|) (|SemiGroup|) (|LeftLinearSet| 17) - (|DifferentialSpace|) (|SetCategory|) - (|RealConstant|) (|RetractableTo| 17) + (|DifferentialSpace|) (|OrderedType|) + (|SetCategory|) (|RealConstant|) + (|RetractableTo| 17) (|DifferentialDomain| $$) (|BasicType|) (|OpenMath|) (|ConvertibleTo| 14) (|ConvertibleTo| 55) diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp index 3e20cd5c..55b813f7 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -692,16 +692,16 @@ (|HasCategory| (|Character|) (LIST '|ConvertibleTo| '(|InputForm|))) (OR (|HasCategory| (|Character|) - '(|BasicType|)) - (|HasCategory| (|Character|) '(|OrderedSet|)) (|HasCategory| (|Character|) '(|SetCategory|))) + (|HasCategory| (|Character|) '(|OrderedSet|)) (OR (|HasCategory| (|Character|) + '(|BasicType|)) + (|HasCategory| (|Character|) '(|OrderedSet|)) (|HasCategory| (|Character|) '(|SetCategory|))) - (|HasCategory| (|Character|) '(|OrderedSet|)) (|HasCategory| (|Integer|) '(|OrderedSet|)) (|HasCategory| (|Character|) '(|SetCategory|)) @@ -778,15 +778,16 @@ 801 |#| 807) '((|shallowlyMutable| . 0) (|finiteAggregate| . 0)) (CONS (|makeByteWordVec2| 6 - '(0 0 0 0 0 0 0 6 0 5 0 0 0 1 4 0 1 2 3)) + '(0 0 0 0 0 0 0 5 0 4 5 0 0 0 1 6 0 1 2 3)) (CONS '#(|StringAggregate&| |OneDimensionalArrayAggregate&| |FiniteLinearAggregate&| |LinearAggregate&| |IndexedAggregate&| |Collection&| - |HomogeneousAggregate&| |OrderedSet&| - |EltableAggregate&| |SetCategory&| NIL - |Aggregate&| NIL |Evalable&| |BasicType&| NIL - |InnerEvalable&| NIL NIL) + |HomogeneousAggregate&| NIL + |EltableAggregate&| |SetCategory&| + |OrderedType&| NIL |Aggregate&| NIL + |Evalable&| |BasicType&| NIL |InnerEvalable&| + NIL NIL) (CONS '#((|StringAggregate|) (|OneDimensionalArrayAggregate| 8) (|FiniteLinearAggregate| 8) @@ -795,9 +796,10 @@ (|Collection| 8) (|HomogeneousAggregate| 8) (|OrderedSet|) (|EltableAggregate| 11 8) - (|SetCategory|) (|Eltable| 23 $$) - (|Aggregate|) (|Eltable| 11 8) - (|Evalable| 8) (|BasicType|) (|Type|) + (|SetCategory|) (|OrderedType|) + (|Eltable| 23 $$) (|Aggregate|) + (|Eltable| 11 8) (|Evalable| 8) + (|BasicType|) (|Type|) (|InnerEvalable| 8 8) (|CoercibleTo| 29) (|ConvertibleTo| 94)) (|makeByteWordVec2| 99 @@ -816,9 +818,9 @@ 88 2 10 13 0 0 1 1 0 0 0 38 1 0 0 0 1 2 0 0 0 8 1 2 0 0 0 33 1 3 0 97 0 11 11 1 2 0 13 0 0 67 3 0 13 0 0 11 62 2 - 0 74 0 33 76 2 0 74 0 8 75 1 6 13 0 1 - 2 0 13 96 0 1 1 6 0 0 1 2 0 0 96 0 1 - 1 6 0 0 1 2 0 0 96 0 1 2 0 13 0 7 1 3 + 0 74 0 33 76 2 0 74 0 8 75 1 5 13 0 1 + 2 0 13 96 0 1 1 5 0 0 1 2 0 0 96 0 1 + 1 5 0 0 1 2 0 0 96 0 1 2 0 13 0 7 1 3 0 8 0 23 8 1 3 0 8 0 11 8 59 2 0 0 95 0 1 0 0 0 1 2 0 0 0 8 79 2 0 0 0 33 80 1 0 0 0 1 1 0 0 0 1 3 0 0 0 23 0 @@ -828,9 +830,9 @@ 0 13 0 0 88 3 8 11 8 0 11 64 2 8 11 8 0 1 3 0 11 33 0 11 66 3 0 11 0 0 11 63 2 0 11 95 0 1 1 0 90 0 1 2 0 0 7 8 - 9 2 0 13 0 7 1 1 7 11 0 32 2 6 0 0 0 - 1 2 6 0 0 0 1 3 0 0 96 0 0 1 1 0 90 0 - 1 2 8 13 8 0 1 1 7 11 0 47 2 6 0 0 0 + 9 2 0 13 0 7 1 1 7 11 0 32 2 5 0 0 0 + 1 2 5 0 0 0 1 3 0 0 96 0 0 1 1 0 90 0 + 1 2 8 13 8 0 1 1 7 11 0 47 2 5 0 0 0 1 3 0 13 0 0 8 89 3 0 7 0 0 8 86 2 0 0 36 0 37 3 0 0 93 0 0 1 2 0 0 36 0 1 1 0 0 0 41 1 0 0 0 1 2 0 13 0 7 1 2 0 @@ -847,8 +849,8 @@ 1 3 0 0 0 0 11 81 1 0 0 0 20 1 3 94 0 1 1 0 0 90 1 2 0 0 0 0 19 1 0 0 74 82 2 0 0 8 0 1 2 0 0 0 8 1 1 9 29 0 31 1 - 0 0 8 1 2 8 13 0 0 1 2 0 13 95 0 1 2 - 6 13 0 0 1 2 6 13 0 0 1 2 10 13 0 0 - 17 2 6 13 0 0 1 2 6 13 0 0 18 1 0 7 0 + 0 0 8 1 2 10 13 0 0 1 2 0 13 95 0 1 2 + 5 13 0 0 1 2 5 13 0 0 1 2 10 13 0 0 + 17 2 5 13 0 0 1 2 5 13 0 0 18 1 0 7 0 16))))) '|lookupComplete|)) diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp index f9271e8b..5e52d0bc 100644 --- a/src/algebra/strap/LIST.lsp +++ b/src/algebra/strap/LIST.lsp @@ -203,12 +203,12 @@ (LIST '|CoercibleTo| '(|OutputForm|)))) (|HasCategory| |#1| (LIST '|ConvertibleTo| '(|InputForm|))) - (OR (|HasCategory| |#1| '(|BasicType|)) - (|HasCategory| |#1| '(|OrderedSet|)) - (|HasCategory| |#1| '(|SetCategory|))) (OR (|HasCategory| |#1| '(|OrderedSet|)) (|HasCategory| |#1| '(|SetCategory|))) (|HasCategory| |#1| '(|OrderedSet|)) + (OR (|HasCategory| |#1| '(|BasicType|)) + (|HasCategory| |#1| '(|OrderedSet|)) + (|HasCategory| |#1| '(|SetCategory|))) (|HasCategory| |#1| '(|OpenMath|)) (|HasCategory| (|Integer|) '(|OrderedSet|)) (|HasCategory| |#1| '(|SetCategory|)) @@ -283,15 +283,15 @@ |OMwrite| 270) '((|shallowlyMutable| . 0) (|finiteAggregate| . 0)) (CONS (|makeByteWordVec2| 7 - '(0 0 0 0 0 0 0 0 0 0 6 0 5 0 0 0 1 4 0 1 2 3 7)) + '(0 0 0 0 0 0 0 0 0 0 5 0 4 5 0 0 0 1 6 0 1 2 3 7)) (CONS '#(|ListAggregate&| |StreamAggregate&| |ExtensibleLinearAggregate&| |FiniteLinearAggregate&| |UnaryRecursiveAggregate&| |LinearAggregate&| |RecursiveAggregate&| |IndexedAggregate&| - |Collection&| |HomogeneousAggregate&| - |OrderedSet&| |EltableAggregate&| - |SetCategory&| NIL |Aggregate&| NIL + |Collection&| |HomogeneousAggregate&| NIL + |EltableAggregate&| |SetCategory&| + |OrderedType&| NIL |Aggregate&| NIL |Evalable&| |BasicType&| NIL |InnerEvalable&| NIL NIL NIL) (CONS '#((|ListAggregate| 6) @@ -305,9 +305,10 @@ (|Collection| 6) (|HomogeneousAggregate| 6) (|OrderedSet|) (|EltableAggregate| 7 6) - (|SetCategory|) (|Eltable| 61 $$) - (|Aggregate|) (|Eltable| 7 6) - (|Evalable| 6) (|BasicType|) (|Type|) + (|SetCategory|) (|OrderedType|) + (|Eltable| 61 $$) (|Aggregate|) + (|Eltable| 7 6) (|Evalable| 6) + (|BasicType|) (|Type|) (|InnerEvalable| 6 6) (|CoercibleTo| 45) (|ConvertibleTo| 46) (|OpenMath|)) (|makeByteWordVec2| 53 diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index 6ba995a7..4347bb34 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -73,8 +73,8 @@ (14 . -) (20 . <) (|Union| $ '"failed") |NNI;subtractIfCan;2$U;3| (|Record| (|:| |quotient| $) (|:| |remainder| $)) - (|PositiveInteger|) (|NonNegativeInteger|) - (|SingleInteger|) (|String|) (|OutputForm|)) + (|PositiveInteger|) (|NonNegativeInteger|) (|String|) + (|OutputForm|) (|SingleInteger|)) '#(~= 26 |zero?| 32 |sup| 37 |subtractIfCan| 43 |shift| 49 |sample| 55 |rem| 59 |recip| 65 |random| 70 |quo| 75 |one?| 81 |min| 86 |max| 92 |latex| 98 |hash| 103 |gcd| @@ -82,10 +82,11 @@ |Zero| 137 |One| 141 >= 145 > 151 = 157 <= 163 < 169 + 175 ** 181 * 193) '(((|commutative| "*") . 0)) - (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0 0)) + (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)) (CONS '#(NIL NIL NIL NIL NIL |Monoid&| |AbelianMonoid&| - |OrderedSet&| |SemiGroup&| |AbelianSemiGroup&| - |SetCategory&| |BasicType&| NIL NIL) + NIL |SemiGroup&| |AbelianSemiGroup&| + |SetCategory&| |OrderedType&| |BasicType&| NIL + NIL) (CONS '#((|OrderedAbelianMonoidSup|) (|OrderedCancellationAbelianMonoid|) (|OrderedAbelianMonoid|) @@ -93,17 +94,18 @@ (|OrderedAbelianSemiGroup|) (|Monoid|) (|AbelianMonoid|) (|OrderedSet|) (|SemiGroup|) (|AbelianSemiGroup|) - (|SetCategory|) (|BasicType|) (|Type|) - (|CoercibleTo| 21)) + (|SetCategory|) (|OrderedType|) + (|BasicType|) (|Type|) + (|CoercibleTo| 20)) (|makeByteWordVec2| 21 '(0 0 0 6 0 5 0 7 2 5 8 0 0 9 2 5 0 0 0 12 2 5 8 0 0 13 2 0 8 0 0 1 1 0 8 0 1 2 0 0 0 0 10 2 0 14 0 0 15 2 0 0 0 5 11 0 0 0 1 2 0 0 0 0 1 1 0 14 0 1 1 0 0 0 1 2 0 0 0 0 1 1 0 8 0 1 2 0 0 0 0 - 1 2 0 0 0 0 1 1 0 20 0 1 1 0 19 0 1 2 + 1 2 0 0 0 0 1 1 0 19 0 1 1 0 21 0 1 2 0 0 0 0 1 2 0 14 0 0 1 2 0 16 0 0 1 1 - 0 21 0 1 2 0 8 0 0 1 0 0 0 6 0 0 0 1 + 0 20 0 1 2 0 8 0 0 1 0 0 0 6 0 0 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2 0 0 0 0 1 2 0 0 0 17 1 2 0 0 0 18 1 2 0 0 0 0 1 2 0 diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp index de4ba8f3..3ed76477 100644 --- a/src/algebra/strap/PI.lsp +++ b/src/algebra/strap/PI.lsp @@ -33,26 +33,26 @@ (MAKEPROP '|PositiveInteger| '|infovec| (LIST '#(NIL NIL NIL NIL NIL (|NonNegativeInteger|) (0 . |Zero|) (|Integer|) (4 . |Zero|) (|Boolean|) (8 . >) - (|PositiveInteger|) (|Union| $ '"failed") - (|SingleInteger|) (|String|) (|OutputForm|)) + (|PositiveInteger|) (|Union| $ '"failed") (|String|) + (|OutputForm|) (|SingleInteger|)) '#(~= 14 |sample| 20 |recip| 24 |one?| 29 |min| 34 |max| 40 |latex| 46 |hash| 51 |gcd| 56 |coerce| 62 |before?| 67 |One| 73 >= 77 > 83 = 89 <= 95 < 101 + 107 ** 113 * 125) '(((|commutative| "*") . 0)) - (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0)) - (CONS '#(NIL |Monoid&| |OrderedSet&| |SemiGroup&| + (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0)) + (CONS '#(NIL |Monoid&| NIL |SemiGroup&| |AbelianSemiGroup&| |SetCategory&| - |BasicType&| NIL NIL) + |OrderedType&| |BasicType&| NIL NIL) (CONS '#((|OrderedAbelianSemiGroup|) (|Monoid|) (|OrderedSet|) (|SemiGroup|) (|AbelianSemiGroup|) (|SetCategory|) - (|BasicType|) (|Type|) - (|CoercibleTo| 15)) + (|OrderedType|) (|BasicType|) (|Type|) + (|CoercibleTo| 14)) (|makeByteWordVec2| 15 '(0 5 0 6 0 7 0 8 2 5 9 0 0 10 2 0 9 0 0 1 0 0 0 1 1 0 12 0 1 1 0 9 0 1 2 0 - 0 0 0 1 2 0 0 0 0 1 1 0 14 0 1 1 0 13 - 0 1 2 0 0 0 0 1 1 0 15 0 1 2 0 9 0 0 + 0 0 0 1 2 0 0 0 0 1 1 0 13 0 1 1 0 15 + 0 1 2 0 0 0 0 1 1 0 14 0 1 2 0 9 0 0 1 0 0 0 1 2 0 9 0 0 1 2 0 9 0 0 1 2 0 9 0 0 1 2 0 9 0 0 1 2 0 9 0 0 1 2 0 0 0 0 1 2 0 0 0 11 1 2 0 0 0 5 1 2 0 0 diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index 32a69f40..d37ff34e 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -626,16 +626,16 @@ (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)) (CONS '#(|IntegerNumberSystem&| |EuclideanDomain&| |UniqueFactorizationDomain&| NIL NIL |GcdDomain&| |IntegralDomain&| |Algebra&| NIL NIL |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&| |DifferentialSpace&| + |AbelianMonoid&| |Monoid&| NIL NIL NIL NIL NIL + NIL |AbelianSemiGroup&| |SemiGroup&| NIL + |Logic&| |DifferentialSpace&| |OrderedType&| |SetCategory&| NIL NIL |RetractableTo&| |DifferentialDomain&| |BasicType&| NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) @@ -667,9 +667,9 @@ (|RightLinearSet| $$) (|AbelianSemiGroup|) (|SemiGroup|) (|LeftLinearSet| 5) (|Logic|) - (|DifferentialSpace|) (|SetCategory|) - (|BooleanLogic|) (|RealConstant|) - (|RetractableTo| 5) + (|DifferentialSpace|) (|OrderedType|) + (|SetCategory|) (|BooleanLogic|) + (|RealConstant|) (|RetractableTo| 5) (|DifferentialDomain| $$) (|BasicType|) (|OpenMath|) (|ConvertibleTo| 102) (|ConvertibleTo| 103) diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index 9f36bb38..0c928c37 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -728,17 +728,18 @@ |argscript| 600 |OMwrite| 606 >= 630 > 636 = 642 <= 648 < 654) 'NIL - (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0)) - (CONS '#(|OrderedSet&| NIL NIL |SetCategory&| + (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0 0)) + (CONS '#(NIL NIL NIL |SetCategory&| |OrderedType&| |BasicType&| NIL NIL NIL NIL NIL NIL NIL NIL) (CONS '#((|OrderedSet|) (|PatternMatchable| 70) (|PatternMatchable| 6) (|SetCategory|) - (|BasicType|) (|Type|) + (|OrderedType|) (|BasicType|) (|ConvertibleTo| 72) (|ConvertibleTo| 65) (|CoercibleFrom| 14) (|ConvertibleTo| 25) (|OpenMath|) - (|ConvertibleTo| 46) (|CoercibleTo| 53)) + (|ConvertibleTo| 46) (|Type|) + (|CoercibleTo| 53)) (|makeByteWordVec2| 164 '(0 6 0 7 1 8 0 6 9 0 11 0 12 1 16 0 15 17 2 26 24 0 25 27 0 28 0 29 2 26 0 diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp index 26f9b901..c4b8430e 100644 --- a/src/algebra/strap/VECTOR.lsp +++ b/src/algebra/strap/VECTOR.lsp @@ -63,12 +63,12 @@ (LIST '|CoercibleTo| '(|OutputForm|)))) (|HasCategory| |#1| (LIST '|ConvertibleTo| '(|InputForm|))) - (OR (|HasCategory| |#1| '(|BasicType|)) - (|HasCategory| |#1| '(|OrderedSet|)) - (|HasCategory| |#1| '(|SetCategory|))) (OR (|HasCategory| |#1| '(|OrderedSet|)) (|HasCategory| |#1| '(|SetCategory|))) (|HasCategory| |#1| '(|OrderedSet|)) + (OR (|HasCategory| |#1| '(|BasicType|)) + (|HasCategory| |#1| '(|OrderedSet|)) + (|HasCategory| |#1| '(|SetCategory|))) (|HasCategory| (|Integer|) '(|OrderedSet|)) (|HasCategory| |#1| '(|SetCategory|)) (|HasCategory| |#1| '(|AbelianSemiGroup|)) @@ -108,21 +108,22 @@ (|Boolean|) (|NonNegativeInteger|) (|Equation| 6) (|List| 24) (|Mapping| 22 6) (|Mapping| 22 6 6) (|UniversalSegment| 7) (|Void|) (|Mapping| 6 6) - (|Matrix| 6) (|SingleInteger|) (|String|) + (|Matrix| 6) (|String|) (|SingleInteger|) (|Union| 6 '"failed") (|List| 7)) '#(|vector| 34 |parts| 39 |maxIndex| 44 |convert| 49 |construct| 54) '((|shallowlyMutable| . 0) (|finiteAggregate| . 0)) (CONS (|makeByteWordVec2| 6 - '(0 0 0 0 0 0 0 6 0 5 0 0 0 1 4 0 1 2 3)) + '(0 0 0 0 0 0 0 5 0 4 5 0 0 0 1 6 0 1 2 3)) (CONS '#(|VectorCategory&| |OneDimensionalArrayAggregate&| |FiniteLinearAggregate&| |LinearAggregate&| |IndexedAggregate&| |Collection&| - |HomogeneousAggregate&| |OrderedSet&| - |EltableAggregate&| |SetCategory&| NIL - |Aggregate&| NIL |Evalable&| |BasicType&| NIL - |InnerEvalable&| NIL NIL) + |HomogeneousAggregate&| NIL + |EltableAggregate&| |SetCategory&| + |OrderedType&| NIL |Aggregate&| NIL + |Evalable&| |BasicType&| NIL |InnerEvalable&| + NIL NIL) (CONS '#((|VectorCategory| 6) (|OneDimensionalArrayAggregate| 6) (|FiniteLinearAggregate| 6) @@ -131,9 +132,10 @@ (|Collection| 6) (|HomogeneousAggregate| 6) (|OrderedSet|) (|EltableAggregate| 7 6) - (|SetCategory|) (|Eltable| 28 $$) - (|Aggregate|) (|Eltable| 7 6) - (|Evalable| 6) (|BasicType|) (|Type|) + (|SetCategory|) (|OrderedType|) + (|Eltable| 28 $$) (|Aggregate|) + (|Eltable| 7 6) (|Evalable| 6) + (|BasicType|) (|Type|) (|InnerEvalable| 6 6) (|CoercibleTo| 13) (|ConvertibleTo| 14)) (|makeByteWordVec2| 20 -- cgit v1.2.3