aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-05-21 19:33:24 +0000
committerdos-reis <gdr@axiomatics.org>2009-05-21 19:33:24 +0000
commit67eb28e8fcfd246d7f149c00bdd3089e2f606676 (patch)
tree156e78c30a13c788a7bb194aba20fb7ac8a6996b /src/algebra
parent0fd61f7b731145923414f6fe21a511f2304bd9d9 (diff)
downloadopen-axiom-67eb28e8fcfd246d7f149c00bdd3089e2f606676.tar.gz
* algebra/catdef.spad.pamphlet (before?$SetCategory): New.
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/catdef.spad.pamphlet8
-rw-r--r--src/algebra/domain.spad.pamphlet2
-rw-r--r--src/algebra/strap/BOOLEAN.lsp18
-rw-r--r--src/algebra/strap/CHAR.lsp12
-rw-r--r--src/algebra/strap/DFLOAT.lsp68
-rw-r--r--src/algebra/strap/ILIST.lsp24
-rw-r--r--src/algebra/strap/INT.lsp48
-rw-r--r--src/algebra/strap/ISTRING.lsp43
-rw-r--r--src/algebra/strap/LIST.lsp8
-rw-r--r--src/algebra/strap/NNI.lsp21
-rw-r--r--src/algebra/strap/OUTFORM.lsp52
-rw-r--r--src/algebra/strap/PI.lsp14
-rw-r--r--src/algebra/strap/SINT.lsp80
-rw-r--r--src/algebra/strap/SYMBOL.lsp25
14 files changed, 218 insertions, 205 deletions
diff --git a/src/algebra/catdef.spad.pamphlet b/src/algebra/catdef.spad.pamphlet
index aec301d8..7170da6e 100644
--- a/src/algebra/catdef.spad.pamphlet
+++ b/src/algebra/catdef.spad.pamphlet
@@ -1286,9 +1286,7 @@ OrderedSet(): Category == SetCategory with
min: (%,%) -> %
++ min(x,y) returns the minimum of x and y relative to "<".
add
- --declarations
- x,y: %
- --definitions
+ before?(x,y) == x < y
-- These really ought to become some sort of macro
max(x,y) ==
x > y => x
@@ -1613,6 +1611,7 @@ SemiGroup(): Category == SetCategory with
++ Date Created:
++ Date Last Updated:
++ 09/09/92 RSS added latex and hash
+++ May 21, 2009: added before? -- gdr
++ Basic Functions:
++ Related Constructors:
++ Also See:
@@ -1630,6 +1629,9 @@ SetCategory(): Category == Join(BasicType,CoercibleTo OutputForm) with
hash: % -> SingleInteger ++ hash(s) calculates a hash code for s.
latex: % -> String ++ latex(s) returns a LaTeX-printable output
++ representation of s.
+ before?: (%,%) -> Boolean
+ ++ spad{before?(x,y)} holds if \spad{x} comes before \spad{y}
+ ++ in the internal total ordering used by OpenAxiom.
add
hash(s : %): SingleInteger == SXHASH(s)$Lisp
latex(s : %): String == "\mbox{\bf Unimplemented}"
diff --git a/src/algebra/domain.spad.pamphlet b/src/algebra/domain.spad.pamphlet
index 8cb16c5e..ba2bd7be 100644
--- a/src/algebra/domain.spad.pamphlet
+++ b/src/algebra/domain.spad.pamphlet
@@ -16,7 +16,7 @@
<<domain CTORKIND ConstructorKinid>>=
)abbrev domain CTORKIND ConstructorKind
++ Author: Gabriel Dos Reis
-++ Date Create: October 07, 2008.
+++ Date Created: October 07, 2008.
++ Date Last Updated: October 07, 2008.
++ Related Constructors:
++ Description:
diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp
index b7865097..b8bd682a 100644
--- a/src/algebra/strap/BOOLEAN.lsp
+++ b/src/algebra/strap/BOOLEAN.lsp
@@ -203,13 +203,13 @@
|BOOLEAN;lookup;$Pi;20| (17 . |random|)
|BOOLEAN;random;$;21| (|InputForm|)
|BOOLEAN;convert;$If;22| (|OutputForm|)
- |BOOLEAN;coerce;$Of;23| (|String|) (|SingleInteger|))
+ |BOOLEAN;coerce;$Of;23| (|SingleInteger|) (|String|))
'#(~= 21 ~ 27 |xor| 32 |true| 38 |test| 42 |size| 47 |random|
51 |or| 55 |not| 61 |nor| 66 |nand| 72 |min| 78 |max| 88
|lookup| 98 |latex| 103 |index| 108 |implies| 113 |hash|
119 |false| 124 |equiv| 128 |convert| 134 |coerce| 139
- |and| 144 |\\/| 150 >= 156 > 162 = 168 <= 174 < 180 |/\\|
- 186)
+ |before?| 144 |and| 150 |\\/| 156 >= 162 > 168 = 174 <=
+ 180 < 186 |/\\| 192)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0))
(CONS '#(NIL |OrderedSet&| NIL NIL |Logic&|
@@ -226,12 +226,12 @@
25 26 0 0 0 34 2 0 0 0 0 16 1 0 0 0 9
2 0 0 0 0 19 2 0 0 0 0 20 0 0 0 1 2 0
0 0 0 1 0 0 0 1 2 0 0 0 0 1 1 0 29 0
- 32 1 0 39 0 1 1 0 0 29 30 2 0 0 0 0
- 22 1 0 40 0 1 0 0 0 8 2 0 0 0 0 23 1
- 0 35 0 36 1 0 37 0 38 2 0 0 0 0 14 2
- 0 0 0 0 17 2 0 10 0 0 1 2 0 10 0 0 1
- 2 0 10 0 0 21 2 0 10 0 0 1 2 0 10 0 0
- 24 2 0 0 0 0 15)))))
+ 32 1 0 40 0 1 1 0 0 29 30 2 0 0 0 0
+ 22 1 0 39 0 1 0 0 0 8 2 0 0 0 0 23 1
+ 0 35 0 36 1 0 37 0 38 2 0 10 0 0 1 2
+ 0 0 0 0 14 2 0 0 0 0 17 2 0 10 0 0 1
+ 2 0 10 0 0 1 2 0 10 0 0 21 2 0 10 0 0
+ 1 2 0 10 0 0 24 2 0 0 0 0 15)))))
'|lookupComplete|))
(MAKEPROP '|Boolean| 'NILADIC T)
diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp
index ef10b20b..f16acad3 100644
--- a/src/algebra/strap/CHAR.lsp
+++ b/src/algebra/strap/CHAR.lsp
@@ -215,8 +215,9 @@
108 |random| 112 |quote| 116 |ord| 120 |min| 125 |max| 135
|lowerCase?| 145 |lowerCase| 150 |lookup| 155 |latex| 160
|index| 165 |hexDigit?| 170 |hash| 175 |escape| 180
- |digit?| 184 |coerce| 189 |char| 194 |alphanumeric?| 204
- |alphabetic?| 209 >= 214 > 220 = 226 <= 232 < 238)
+ |digit?| 184 |coerce| 189 |char| 194 |before?| 204
+ |alphanumeric?| 210 |alphabetic?| 215 >= 220 > 226 = 232
+ <= 238 < 244)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0))
(CONS '#(NIL |OrderedSet&| NIL |SetCategory&|
@@ -237,9 +238,10 @@
0 6 0 38 1 0 0 0 53 1 0 11 0 20 1 0
43 0 46 1 0 0 11 17 1 0 6 0 34 1 0 54
0 1 0 0 0 25 1 0 6 0 32 1 0 26 0 27 1
- 0 0 9 16 1 0 0 43 51 1 0 6 0 42 1 0 6
- 0 40 2 0 6 0 0 1 2 0 6 0 0 1 2 0 6 0
- 0 7 2 0 6 0 0 1 2 0 6 0 0 8)))))
+ 0 0 43 51 1 0 0 9 16 2 0 6 0 0 1 1 0
+ 6 0 42 1 0 6 0 40 2 0 6 0 0 1 2 0 6 0
+ 0 1 2 0 6 0 0 7 2 0 6 0 0 1 2 0 6 0 0
+ 8)))))
'|lookupComplete|))
(MAKEPROP '|Character| 'NILADIC T)
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp
index 5e8043f1..f6af98ec 100644
--- a/src/algebra/strap/DFLOAT.lsp
+++ b/src/algebra/strap/DFLOAT.lsp
@@ -995,12 +995,13 @@
(196 . |negative?|) (201 . |one?|) (206 . |numer|)
(211 . |denom|) (216 . |odd?|) |DFLOAT;**;$F$;85|
(|PatternMatchResult| 109 $) (|Pattern| 109)
- (|Factored| $) (|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 153 '"failed") (|List| $) (|Union| 155 '"failed")
+ (|Factored| $) (|List| $) (|Union| 153 '"failed")
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
+ (|Record| (|:| |coef1| $) (|:| |coef2| $))
+ (|Union| 156 '"failed")
+ (|Record| (|:| |coef| 153) (|:| |generator| $))
(|SparseUnivariatePolynomial| $)
- (|Record| (|:| |coef| 155) (|:| |generator| $))
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $)))
'#(~= 221 |zero?| 227 |wholePart| 232 |unitNormal| 237
@@ -1022,12 +1023,12 @@
590 |divide| 595 |digits| 601 |differentiate| 605 |csch|
616 |csc| 621 |coth| 626 |cot| 631 |cosh| 636 |cos| 641
|convert| 646 |coerce| 666 |characteristic| 696 |ceiling|
- 700 |bits| 705 |base| 709 |atanh| 713 |atan| 718
- |associates?| 729 |asinh| 735 |asin| 740 |asech| 745
- |asec| 750 |acsch| 755 |acsc| 760 |acoth| 765 |acot| 770
- |acosh| 775 |acos| 780 |abs| 785 |Zero| 790 |One| 794
- |OMwrite| 798 |Gamma| 822 D 827 |Beta| 838 >= 844 > 850 =
- 856 <= 862 < 868 / 874 - 886 + 897 ** 903 * 933)
+ 700 |bits| 705 |before?| 709 |base| 715 |atanh| 719 |atan|
+ 724 |associates?| 735 |asinh| 741 |asin| 746 |asech| 751
+ |asec| 756 |acsch| 761 |acsc| 766 |acoth| 771 |acot| 776
+ |acosh| 781 |acos| 786 |abs| 791 |Zero| 796 |One| 800
+ |OMwrite| 804 |Gamma| 828 D 833 |Beta| 844 >= 850 > 856 =
+ 862 <= 868 < 874 / 880 - 892 + 903 ** 909 * 939)
'((|approximate| . 0) (|canonicalsClosed| . 0)
(|canonicalUnitNormal| . 0) (|noZeroDivisors| . 0)
((|commutative| "*") . 0) (|rightUnitary| . 0)
@@ -1123,19 +1124,19 @@
122 1 0 124 0 125 1 0 112 0 120 1 0
26 0 123 2 0 0 0 0 1 1 0 100 0 101 2
0 112 0 113 115 3 0 112 0 113 113 114
- 2 0 0 0 0 1 1 0 159 155 1 1 0 19 0 1
+ 2 0 0 0 0 1 1 0 158 153 1 1 0 19 0 1
0 0 24 29 1 0 19 0 1 0 0 0 47 3 0 150
0 151 150 1 1 0 26 0 43 1 0 19 0 97 2
0 0 0 26 1 1 0 0 0 1 1 0 19 0 95 2 0
- 156 155 0 1 0 0 0 39 2 0 0 0 0 61 0 0
+ 154 153 0 1 0 0 0 39 2 0 0 0 0 61 0 0
0 38 2 0 0 0 0 60 1 0 26 0 27 1 0 0 0
- 34 1 0 0 0 65 1 0 0 0 70 2 0 0 0 0 1
- 1 0 0 155 1 1 0 8 0 1 1 0 0 0 1 1 0
- 98 0 99 2 0 158 158 158 1 1 0 0 155 1
+ 34 1 0 0 0 65 1 0 0 0 70 1 0 0 153 1
+ 2 0 0 0 0 1 1 0 8 0 1 1 0 0 0 1 1 0
+ 98 0 99 2 0 159 159 159 1 1 0 0 153 1
2 0 0 0 0 1 1 0 0 0 1 1 0 0 0 1 3 0 0
26 26 24 108 2 0 0 26 26 1 1 0 152 0
- 1 3 0 154 0 0 0 1 2 0 157 0 0 1 2 0
- 100 0 0 1 2 0 156 155 0 1 1 0 26 0 28
+ 1 2 0 155 0 0 1 3 0 157 0 0 0 1 2 0
+ 100 0 0 1 2 0 154 153 0 1 1 0 26 0 28
0 0 0 46 1 0 0 0 69 1 0 113 0 1 2 0
136 0 0 1 0 0 24 1 1 0 0 0 102 2 0 0
0 113 1 1 0 0 0 86 1 0 0 0 76 1 0 0 0
@@ -1143,23 +1144,24 @@
0 51 0 53 1 0 151 0 1 1 0 109 0 111 1
0 13 0 14 1 0 0 112 1 1 0 0 26 68 1 0
0 112 1 1 0 0 0 1 1 0 0 26 68 1 0 48
- 0 50 0 0 113 1 1 0 0 0 1 0 0 24 37 0
- 0 24 25 1 0 0 0 91 2 0 0 0 0 118 1 0
- 0 0 79 2 0 19 0 0 1 1 0 0 0 89 1 0 0
- 0 77 1 0 0 0 94 1 0 0 0 82 1 0 0 0 92
- 1 0 0 0 80 1 0 0 0 93 1 0 0 0 81 1 0
- 0 0 90 1 0 0 0 78 1 0 0 0 117 0 0 0
- 23 0 0 0 44 2 0 11 9 0 21 3 0 11 9 0
- 19 22 1 0 8 0 18 2 0 8 0 19 20 1 0 0
- 0 105 1 0 0 0 1 2 0 0 0 113 1 2 0 0 0
- 0 107 2 0 19 0 0 1 2 0 19 0 0 1 2 0
- 19 0 0 62 2 0 19 0 0 1 2 0 19 0 0 54
- 2 0 0 0 26 63 2 0 0 0 0 45 2 0 0 0 0
- 57 1 0 0 0 55 2 0 0 0 0 56 2 0 0 0 0
- 67 2 0 0 0 112 149 2 0 0 0 26 66 2 0
- 0 0 113 1 2 0 0 0 24 1 2 0 0 112 0 1
- 2 0 0 0 112 1 2 0 0 0 0 58 2 0 0 26 0
- 59 2 0 0 113 0 1 2 0 0 24 0 35)))))
+ 0 50 0 0 113 1 1 0 0 0 1 0 0 24 37 2
+ 0 19 0 0 1 0 0 24 25 1 0 0 0 91 2 0 0
+ 0 0 118 1 0 0 0 79 2 0 19 0 0 1 1 0 0
+ 0 89 1 0 0 0 77 1 0 0 0 94 1 0 0 0 82
+ 1 0 0 0 92 1 0 0 0 80 1 0 0 0 93 1 0
+ 0 0 81 1 0 0 0 90 1 0 0 0 78 1 0 0 0
+ 117 0 0 0 23 0 0 0 44 2 0 11 9 0 21 3
+ 0 11 9 0 19 22 1 0 8 0 18 2 0 8 0 19
+ 20 1 0 0 0 105 1 0 0 0 1 2 0 0 0 113
+ 1 2 0 0 0 0 107 2 0 19 0 0 1 2 0 19 0
+ 0 1 2 0 19 0 0 62 2 0 19 0 0 1 2 0 19
+ 0 0 54 2 0 0 0 26 63 2 0 0 0 0 45 1 0
+ 0 0 55 2 0 0 0 0 57 2 0 0 0 0 56 2 0
+ 0 0 0 67 2 0 0 0 112 149 2 0 0 0 26
+ 66 2 0 0 0 113 1 2 0 0 0 24 1 2 0 0
+ 112 0 1 2 0 0 0 112 1 2 0 0 0 0 58 2
+ 0 0 26 0 59 2 0 0 113 0 1 2 0 0 24 0
+ 35)))))
'|lookupComplete|))
(MAKEPROP '|DoubleFloat| 'NILADIC T)
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index dd576d32..5f67bbd8 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -612,8 +612,8 @@
|cycleSplit!| 798 |cycleLength| 803 |cycleEntry| 808
|count| 813 |copyInto!| 825 |copy| 832 |convert| 837
|construct| 842 |concat!| 847 |concat| 859 |coerce| 882
- |children| 887 |child?| 892 |any?| 898 >= 904 > 910 = 916
- <= 922 < 928 |#| 934)
+ |children| 887 |child?| 892 |before?| 898 |any?| 904 >=
+ 910 > 916 = 922 <= 928 < 934 |#| 940)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 5
'(0 0 0 0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4))
@@ -668,8 +668,8 @@
7 0 6 0 1 2 0 0 79 0 1 2 7 0 6 0 1 2
0 0 79 0 1 4 7 6 76 0 6 6 1 2 0 6 76
0 1 3 0 6 76 0 6 1 3 0 6 0 30 6 1 2 0
- 6 0 30 1 1 0 11 0 1 2 7 30 6 0 1 3 7
- 30 6 0 30 1 2 0 30 79 0 1 1 0 25 0 27
+ 6 0 30 1 1 0 11 0 1 3 7 30 6 0 30 1 2
+ 7 30 6 0 1 2 0 30 79 0 1 1 0 25 0 27
1 0 48 0 1 2 7 11 0 0 1 2 0 0 8 6 1 2
0 11 0 8 1 1 6 30 0 31 2 5 0 0 0 1 2
5 0 0 0 1 3 0 0 67 0 0 69 2 5 0 0 0 1
@@ -678,25 +678,25 @@
1 3 0 0 76 0 0 1 2 0 0 84 0 1 1 0 0 6
1 2 0 11 0 8 1 1 0 25 0 1 1 0 11 0 1
1 7 59 0 62 2 0 0 0 8 1 1 0 6 0 1 3 0
- 0 6 0 30 1 3 0 0 0 0 30 1 3 0 0 0 0
+ 0 0 0 30 1 3 0 0 6 0 30 1 3 0 0 0 0
30 1 3 0 0 6 0 30 1 1 0 86 0 1 2 0 11
30 0 1 1 7 32 0 1 2 0 0 0 8 1 1 0 6 0
13 2 0 87 79 0 1 2 0 0 0 6 1 1 0 11 0
1 2 0 11 79 0 1 3 9 0 0 6 6 1 3 9 0 0
25 25 1 2 9 0 0 77 1 2 9 0 0 78 1 2 0
11 0 0 12 2 7 11 6 0 1 1 0 25 0 1 1 0
- 11 0 17 0 0 0 16 2 0 6 0 30 1 3 0 6 0
- 30 6 1 2 0 0 0 81 1 2 0 6 0 82 1 2 0
+ 11 0 17 0 0 0 16 3 0 6 0 30 6 1 2 0 6
+ 0 30 1 2 0 0 0 81 1 2 0 6 0 82 1 2 0
0 0 19 20 2 0 6 0 14 15 2 0 6 0 83 1
- 2 0 30 0 0 1 2 0 0 0 81 1 2 0 0 0 30
+ 2 0 30 0 0 1 2 0 0 0 30 1 2 0 0 0 81
1 2 0 0 0 81 1 2 0 0 0 30 1 1 0 11 0
39 1 0 0 0 1 1 0 0 0 1 1 0 8 0 1 1 0
0 0 44 2 7 8 6 0 1 2 0 8 79 0 1 3 0 0
0 0 30 1 1 0 0 0 40 1 3 85 0 1 1 0 0
- 25 26 2 0 0 0 0 65 2 0 0 0 6 1 1 0 0
+ 25 26 2 0 0 0 6 1 2 0 0 0 0 65 1 0 0
48 1 2 0 0 0 6 1 2 0 0 6 0 10 2 0 0 0
0 1 1 8 41 0 54 1 0 48 0 1 2 7 11 0 0
- 1 2 0 11 79 0 1 2 5 11 0 0 1 2 5 11 0
- 0 1 2 7 11 0 0 58 2 5 11 0 0 1 2 5 11
- 0 0 1 1 0 8 0 9)))))
+ 1 2 7 11 0 0 1 2 0 11 79 0 1 2 5 11 0
+ 0 1 2 5 11 0 0 1 2 7 11 0 0 58 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 4bb78bc9..2d9d4f7a 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -587,12 +587,13 @@
|INT;gcdPolynomial;3Sup;57| (|Fraction| 17)
(|Union| 126 '"failed") (|PatternMatchResult| 17 $)
(|Pattern| 17) (|Union| 17 '"failed") (|List| $)
- (|Record| (|:| |coef| 131) (|:| |generator| $))
(|Union| 131 '"failed")
+ (|Record| (|:| |coef| 131) (|:| |generator| $))
+ (|Record| (|:| |coef1| $) (|:| |coef2| $))
+ (|Union| 134 '"failed")
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
- (|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 135 '"failed") (|PositiveInteger|))
+ (|PositiveInteger|))
'#(~= 167 |zero?| 173 |unitNormal| 178 |unitCanonical| 183
|unit?| 188 |symmetricRemainder| 193 |subtractIfCan| 199
|submod| 205 |squareFreePart| 212 |squareFree| 217
@@ -610,10 +611,10 @@
|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 |base| 592 |associates?| 596
- |addmod| 602 |abs| 609 |Zero| 614 |One| 618 |OMwrite| 622
- D 646 >= 657 > 663 = 669 <= 675 < 681 - 687 + 698 ** 704 *
- 716)
+ 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)
'((|infinite| . 0) (|noetherian| . 0)
(|canonicalsClosed| . 0) (|canonical| . 0)
(|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0)
@@ -688,33 +689,34 @@
0 130 0 1 1 0 17 0 1 2 0 0 0 0 53 2 0
74 71 75 76 1 0 70 71 72 1 0 89 0 90
1 0 127 0 1 1 0 9 0 1 1 0 126 0 1 0 0
- 0 78 1 0 0 0 79 2 0 0 0 0 87 1 0 132
+ 0 78 1 0 0 0 79 2 0 0 0 0 87 1 0 133
131 1 1 0 9 0 1 3 0 0 0 0 0 1 2 0 0 0
0 69 1 0 9 0 1 2 0 0 0 0 1 3 0 128 0
129 128 1 1 0 9 0 34 1 0 9 0 82 1 0
- 89 0 1 1 0 9 0 43 2 0 133 131 0 1 3 0
+ 89 0 1 1 0 9 0 43 2 0 132 131 0 1 3 0
0 0 0 0 54 2 0 0 0 0 84 2 0 0 0 0 83
- 1 0 0 0 1 1 0 0 0 49 2 0 0 0 0 1 1 0
- 0 131 1 1 0 14 0 68 2 0 0 0 0 1 0 0 0
+ 1 0 0 0 1 1 0 0 0 49 1 0 0 131 1 2 0
+ 0 0 0 1 1 0 14 0 68 2 0 0 0 0 1 0 0 0
1 1 0 0 0 38 1 0 41 0 42 2 0 124 124
- 124 125 2 0 0 0 0 91 1 0 0 131 1 1 0
- 0 0 1 1 0 110 0 111 2 0 134 0 0 1 3 0
- 136 0 0 0 1 2 0 89 0 0 109 2 0 133
+ 124 125 1 0 0 131 1 2 0 0 0 0 91 1 0
+ 0 0 1 1 0 110 0 111 3 0 135 0 0 0 1 2
+ 0 136 0 0 1 2 0 89 0 0 109 2 0 132
131 0 1 1 0 9 0 1 1 0 7 0 1 2 0 85 0
0 86 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 65 1 0 58 0 60 1
0 55 0 57 1 0 61 0 63 1 0 129 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 0 0 0 35 2 0 9 0 0 1 3 0
- 0 0 0 0 50 1 0 0 0 77 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 1 2 0 9 0 0 1 2 0 9
- 0 0 33 2 0 9 0 0 1 2 0 9 0 0 10 2 0 0
- 0 0 39 1 0 0 0 16 2 0 0 0 0 37 2 0 0
- 0 7 81 2 0 0 0 137 1 2 0 0 0 0 52 2 0
- 0 17 0 80 2 0 0 7 0 1 2 0 0 137 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 50 1 0 0 0 77 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 1 2 0 9 0
+ 0 1 2 0 9 0 0 33 2 0 9 0 0 1 2 0 9 0
+ 0 10 2 0 0 0 0 39 1 0 0 0 16 2 0 0 0
+ 0 37 2 0 0 0 7 81 2 0 0 0 137 1 2 0 0
+ 0 0 52 2 0 0 17 0 80 2 0 0 7 0 1 2 0
+ 0 137 0 1)))))
'|lookupComplete|))
(MAKEPROP '|Integer| 'NILADIC T)
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index dc7ed95f..dbc68e7c 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -980,7 +980,8 @@
670 |entry?| 676 |entries| 682 |empty?| 687 |empty| 692
|elt| 696 |delete| 721 |count| 733 |copyInto!| 745 |copy|
752 |convert| 757 |construct| 762 |concat| 767 |coerce|
- 790 |any?| 800 >= 806 > 812 = 818 <= 824 < 830 |#| 836)
+ 790 |before?| 800 |any?| 806 >= 812 > 818 = 824 <= 830 <
+ 836 |#| 842)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 5
'(0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4))
@@ -1021,28 +1022,28 @@
0 86 1 8 7 0 87 2 11 0 11 0 88 2 11 0
0 0 89 2 11 13 0 0 92 2 0 13 0 0 93 2
7 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 102 0 11 11 1
+ 0 33 1 2 0 0 0 8 1 3 0 102 0 11 11 1
2 0 13 0 0 66 3 0 13 0 0 11 60 2 0 73
- 0 33 75 2 0 73 0 8 74 1 5 13 0 1 2 0
+ 0 8 74 2 0 73 0 33 75 1 5 13 0 1 2 0
13 101 0 1 1 5 0 0 1 2 0 0 101 0 1 1
5 0 0 1 2 0 0 101 0 1 2 0 13 0 7 1 3
0 8 0 23 8 1 3 0 8 0 11 8 57 2 0 0
- 100 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 56 1 7 0 0 1 2 7 0 8 0 1 2 0 0 100
- 0 1 4 7 8 98 0 8 8 1 3 0 8 98 0 8 1 2
- 0 8 98 0 1 3 0 8 0 11 8 1 2 0 8 0 11
- 1 2 0 13 0 0 93 3 7 11 8 0 11 63 2 7
- 11 8 0 1 3 0 11 33 0 11 65 3 0 11 0 0
- 11 61 2 0 11 100 0 1 1 0 95 0 1 2 0 0
- 7 8 9 2 0 13 0 7 1 1 6 11 0 32 2 5 0
- 0 0 1 2 5 0 0 0 1 3 0 0 101 0 0 1 1 0
+ 100 0 1 0 0 0 1 2 0 0 0 33 80 2 0 0 0
+ 8 79 1 0 0 0 1 1 0 0 0 1 3 0 0 0 23 0
+ 56 1 7 0 0 1 2 7 0 8 0 1 2 0 0 100 0
+ 1 4 7 8 98 0 8 8 1 2 0 8 98 0 1 3 0 8
+ 98 0 8 1 3 0 8 0 11 8 1 2 0 8 0 11 1
+ 2 0 13 0 0 93 2 7 11 8 0 1 3 7 11 8 0
+ 11 63 3 0 11 0 0 11 61 3 0 11 33 0 11
+ 65 2 0 11 100 0 1 1 0 95 0 1 2 0 0 7
+ 8 9 2 0 13 0 7 1 1 6 11 0 32 2 5 0 0
+ 0 1 2 5 0 0 0 1 3 0 0 101 0 0 1 1 0
95 0 1 2 7 13 8 0 1 1 6 11 0 47 2 5 0
0 0 1 3 0 13 0 0 8 94 3 0 7 0 0 8 91
2 0 0 36 0 37 3 0 0 98 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 0 0 8 76 2 0 0 0 33 77 1 7 28 0
- 43 3 0 0 8 0 11 1 3 0 0 0 0 11 27 1 0
+ 2 0 0 0 33 77 2 0 0 0 8 76 1 7 28 0
+ 43 3 0 0 0 0 11 27 3 0 0 8 0 11 1 1 0
104 0 1 2 0 13 11 0 1 1 7 53 0 1 1 0
11 0 90 1 6 8 0 1 2 0 103 100 0 1 2 0
0 0 8 1 2 0 13 100 0 1 3 9 0 0 95 95
@@ -1050,12 +1051,12 @@
96 1 2 0 13 0 0 1 2 7 13 8 0 1 1 0 95
0 1 1 0 13 0 15 0 0 0 10 2 0 0 0 0 1
2 0 0 0 23 25 2 0 8 0 11 67 3 0 8 0
- 11 8 1 2 0 0 0 11 1 2 0 0 0 23 1 2 7
+ 11 8 1 2 0 0 0 23 1 2 0 0 0 11 1 2 7
7 8 0 1 2 0 7 100 0 1 3 0 0 0 0 11 82
1 0 0 0 20 1 3 99 0 1 1 0 0 95 1 1 0
- 0 73 83 2 0 0 0 0 19 2 0 0 0 8 1 2 0
- 0 8 0 1 1 8 29 0 31 1 0 0 8 1 2 0 13
- 100 0 1 2 5 13 0 0 1 2 5 13 0 0 1 2 7
- 13 0 0 17 2 5 13 0 0 1 2 5 13 0 0 18
- 1 0 7 0 16)))))
+ 0 73 83 2 0 0 8 0 1 2 0 0 0 0 19 2 0
+ 0 0 8 1 1 8 29 0 31 1 0 0 8 1 2 7 13
+ 0 0 1 2 0 13 100 0 1 2 5 13 0 0 1 2 5
+ 13 0 0 1 2 7 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 6eda32ee..e4a2353e 100644
--- a/src/algebra/strap/LIST.lsp
+++ b/src/algebra/strap/LIST.lsp
@@ -344,8 +344,8 @@
0 0 0 43 1 0 0 0 22 1 8 0 0 35 1 0 10
0 11 0 0 0 9 2 8 10 6 0 39 1 0 6 0 19
1 0 10 0 38 0 0 0 37 2 0 6 0 7 41 1 3
- 45 0 52 2 0 0 6 0 12 2 0 0 6 0 42 2 0
- 0 0 0 34 2 0 0 0 0 13 3 6 14 15 0 10
- 33 2 6 14 15 0 32 1 6 17 0 30 2 6 17
- 0 10 31)))))
+ 45 0 52 2 0 0 6 0 12 2 0 0 0 0 34 2 0
+ 0 6 0 42 2 0 0 0 0 13 3 6 14 15 0 10
+ 33 2 6 17 0 10 31 2 6 14 15 0 32 1 6
+ 17 0 30)))))
'|lookupIncomplete|))
diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp
index bd82e49c..1e1305b4 100644
--- a/src/algebra/strap/NNI.lsp
+++ b/src/algebra/strap/NNI.lsp
@@ -85,13 +85,14 @@
|NNI;sup;3$;1| |NNI;shift;$I$;2| (22 . -)
(|Union| $ '"failed") |NNI;subtractIfCan;2$U;3|
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- (|PositiveInteger|) (|NonNegativeInteger|) (|String|)
- (|OutputForm|) (|SingleInteger|))
+ (|PositiveInteger|) (|NonNegativeInteger|)
+ (|SingleInteger|) (|String|) (|OutputForm|))
'#(~= 28 |zero?| 34 |sup| 39 |subtractIfCan| 45 |shift| 51
|sample| 57 |rem| 61 |recip| 67 |random| 72 |quo| 77
|one?| 83 |min| 88 |max| 94 |latex| 100 |hash| 105 |gcd|
- 110 |exquo| 116 |divide| 122 |coerce| 128 |Zero| 133 |One|
- 137 >= 141 > 147 = 153 <= 159 < 165 + 171 ** 177 * 189)
+ 110 |exquo| 116 |divide| 122 |coerce| 128 |before?| 133
+ |Zero| 139 |One| 143 >= 147 > 153 = 159 <= 165 < 171 + 177
+ ** 183 * 195)
'(((|commutative| "*") . 0))
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0))
(CONS '#(NIL NIL NIL NIL NIL |Monoid&| |AbelianMonoid&|
@@ -105,20 +106,20 @@
(|AbelianMonoid|) (|OrderedSet|)
(|SemiGroup|) (|AbelianSemiGroup|)
(|SetCategory|) (|BasicType|)
- (|CoercibleTo| 21))
+ (|CoercibleTo| 22))
(|makeByteWordVec2| 22
'(0 0 0 6 0 5 0 7 2 5 8 0 0 9 0 8 0 10
0 8 0 11 2 5 0 0 0 14 2 0 8 0 0 1 1 0
8 0 1 2 0 0 0 0 12 2 0 15 0 0 16 2 0
0 0 5 13 0 0 0 1 2 0 0 0 0 1 1 0 15 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 22
+ 0 0 0 1 2 0 0 0 0 1 1 0 21 0 1 1 0 20
0 1 2 0 0 0 0 1 2 0 15 0 0 1 2 0 17 0
- 0 1 1 0 21 0 1 0 0 0 6 0 0 0 1 2 0 8
+ 0 1 1 0 22 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 0 0 0 1 2 0 0 0
- 18 1 2 0 0 0 19 1 2 0 0 0 0 1 2 0 0
- 19 0 1 2 0 0 18 0 1)))))
+ 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2 0 0 0 0
+ 1 2 0 0 0 18 1 2 0 0 0 19 1 2 0 0 0 0
+ 1 2 0 0 19 0 1 2 0 0 18 0 1)))))
'|lookupComplete|))
(MAKEPROP '|NonNegativeInteger| 'NILADIC T)
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index be37f024..7da2c093 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -961,9 +961,9 @@
|doubleFloatFormat| 537 |dot| 542 |div| 553
|differentiate| 559 |commaSeparate| 565 |coerce| 570
|center| 575 |bracket| 586 |brace| 596 |box| 606
- |blankSeparate| 611 |binomial| 616 |assign| 622 |and| 628
- SEGMENT 634 >= 645 > 651 = 657 <= 669 < 675 / 681 - 687 +
- 698 ** 704 * 710)
+ |blankSeparate| 611 |binomial| 616 |before?| 622 |assign|
+ 628 |and| 634 SEGMENT 640 >= 651 > 657 = 663 <= 675 < 681
+ / 687 - 693 + 704 ** 710 * 716)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0))
(CONS '#(|SetCategory&| |BasicType&| NIL)
@@ -986,36 +986,36 @@
0 0 142 3 0 0 0 0 0 143 1 0 0 0 141 1
0 20 0 33 2 0 0 0 0 73 1 0 0 0 115 2
0 0 0 0 130 1 0 0 57 62 2 0 0 0 57 80
- 2 0 0 20 20 56 1 0 0 0 127 2 0 0 0 0
- 128 1 0 0 0 46 2 0 0 0 20 43 2 0 0 0
+ 2 0 0 20 20 56 2 0 0 0 0 128 1 0 0 0
+ 127 1 0 0 0 46 2 0 0 0 20 43 2 0 0 0
0 98 2 0 0 0 0 133 1 0 0 0 116 2 0 0
0 0 99 3 0 0 0 0 0 146 1 0 0 0 144 2
- 0 0 0 0 145 1 0 9 0 10 2 0 0 0 47 123
- 1 0 0 0 119 2 0 0 0 0 76 2 0 0 0 0 75
- 2 0 0 0 57 111 2 0 0 0 0 114 1 0 0 57
- 60 1 0 0 57 72 1 0 0 0 71 2 0 0 0 0
- 124 1 0 0 0 117 2 0 0 0 0 129 1 0 0
- 24 25 1 0 0 22 23 1 0 0 7 30 1 0 0 20
- 21 2 0 0 0 0 102 1 0 0 0 103 1 0 9 7
+ 0 0 0 0 145 1 0 9 0 10 1 0 0 0 119 2
+ 0 0 0 47 123 2 0 0 0 0 76 2 0 0 0 0
+ 75 2 0 0 0 57 111 2 0 0 0 0 114 1 0 0
+ 57 60 1 0 0 57 72 1 0 0 0 71 2 0 0 0
+ 0 124 1 0 0 0 117 2 0 0 0 0 129 1 0 0
+ 7 30 1 0 0 24 25 1 0 0 20 21 1 0 0 22
+ 23 2 0 0 0 0 102 1 0 0 0 103 1 0 9 7
15 1 0 0 7 14 1 0 0 58 59 1 0 0 0 45
2 0 0 0 20 42 1 0 7 0 1 2 0 0 0 0 132
3 0 0 0 0 0 149 2 0 0 0 0 148 1 0 0 0
- 147 1 0 11 0 109 2 0 0 0 57 112 3 0 0
- 0 0 0 113 1 0 0 20 39 0 0 20 35 1 0
+ 147 1 0 11 0 109 3 0 0 0 0 0 113 2 0
+ 0 0 57 112 1 0 0 20 39 0 0 20 35 1 0
20 0 32 1 0 0 57 84 2 0 0 0 0 40 1 0
150 0 1 2 0 0 0 0 100 0 0 0 13 2 0 0
- 0 57 110 1 0 7 7 8 2 0 0 0 47 122 1 0
- 0 0 118 2 0 0 0 0 97 2 0 0 0 47 140 1
- 0 0 57 61 1 0 18 0 19 1 0 0 0 44 2 0
- 0 0 20 41 1 0 0 0 69 1 0 0 57 70 1 0
- 0 57 68 1 0 0 0 67 1 0 0 0 125 1 0 0
- 57 66 2 0 0 0 0 106 2 0 0 0 0 131 2 0
- 0 0 0 101 1 0 0 0 105 2 0 0 0 0 104 2
- 0 0 0 0 90 2 0 0 0 0 88 2 0 0 0 0 17
- 2 0 11 0 0 16 2 0 0 0 0 89 2 0 0 0 0
- 87 2 0 0 0 0 95 1 0 0 0 93 2 0 0 0 0
- 92 2 0 0 0 0 91 2 0 0 0 0 96 2 0 0 0
- 0 94)))))
+ 0 57 110 1 0 7 7 8 1 0 0 0 118 2 0 0
+ 0 47 122 2 0 0 0 0 97 2 0 0 0 47 140
+ 1 0 0 57 61 1 0 18 0 19 1 0 0 0 44 2
+ 0 0 0 20 41 1 0 0 0 69 1 0 0 57 70 1
+ 0 0 57 68 1 0 0 0 67 1 0 0 0 125 1 0
+ 0 57 66 2 0 0 0 0 106 2 0 11 0 0 1 2
+ 0 0 0 0 131 2 0 0 0 0 101 1 0 0 0 105
+ 2 0 0 0 0 104 2 0 0 0 0 90 2 0 0 0 0
+ 88 2 0 0 0 0 17 2 0 11 0 0 16 2 0 0 0
+ 0 89 2 0 0 0 0 87 2 0 0 0 0 95 1 0 0
+ 0 93 2 0 0 0 0 92 2 0 0 0 0 91 2 0 0
+ 0 0 96 2 0 0 0 0 94)))))
'|lookupComplete|))
(MAKEPROP '|OutputForm| 'NILADIC T)
diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp
index 4dc3184c..f39edf0a 100644
--- a/src/algebra/strap/PI.lsp
+++ b/src/algebra/strap/PI.lsp
@@ -45,8 +45,8 @@
(|PositiveInteger|) (|Union| $ '"failed")
(|SingleInteger|) (|String|) (|OutputForm|))
'#(~= 14 |sample| 20 |recip| 24 |one?| 29 |min| 34 |max| 40
- |latex| 46 |hash| 51 |gcd| 56 |coerce| 62 |One| 67 >= 71 >
- 77 = 83 <= 89 < 95 + 101 ** 107 * 119)
+ |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))
(CONS '#(NIL |Monoid&| |OrderedSet&| |SemiGroup&|
@@ -60,11 +60,11 @@
'(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 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 0 0 1 2 0 0
- 11 0 1)))))
+ 0 1 2 0 0 0 0 1 1 0 15 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
+ 0 0 1 2 0 0 11 0 1)))))
'|lookupComplete|))
(MAKEPROP '|PositiveInteger| 'NILADIC T)
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index a3d38ee1..b3ec9c35 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -559,16 +559,16 @@
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
|SINT;unitNormal;$R;57| (|Fraction| 5)
- (|Union| 94 '"failed") (|Union| $ '"failed") (|Float|)
- (|DoubleFloat|) (|Pattern| 5) (|PatternMatchResult| 5 $)
- (|InputForm|) (|Union| 5 '"failed") (|List| $)
+ (|Union| 94 '"failed") (|DoubleFloat|)
+ (|Union| $ '"failed") (|Float|) (|PatternMatchResult| 5 $)
+ (|Pattern| 5) (|InputForm|) (|Union| 5 '"failed")
+ (|List| $) (|Union| 103 '"failed")
(|Record| (|:| |coef| 103) (|:| |generator| $))
- (|Union| 103 '"failed")
+ (|Record| (|:| |coef1| $) (|:| |coef2| $))
+ (|Union| 106 '"failed")
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
- (|Record| (|:| |coef1| $) (|:| |coef2| $))
- (|Union| 107 '"failed") (|Factored| $)
- (|SparseUnivariatePolynomial| $))
+ (|Factored| $) (|SparseUnivariatePolynomial| $))
'#(~= 78 ~ 84 |zero?| 89 |xor| 94 |unitNormal| 100
|unitCanonical| 105 |unit?| 110 |symmetricRemainder| 115
|subtractIfCan| 121 |submod| 127 |squareFreePart| 134
@@ -587,10 +587,11 @@
|exquo| 426 |expressIdealMember| 432 |even?| 438
|euclideanSize| 443 |divide| 448 |differentiate| 454 |dec|
465 |copy| 470 |convert| 475 |coerce| 500 |characteristic|
- 520 |bit?| 524 |binomial| 530 |base| 536 |associates?| 540
- |addmod| 546 |abs| 553 |\\/| 558 |Zero| 564 |Or| 568 |One|
- 574 |OMwrite| 578 |Not| 602 D 607 |And| 618 >= 624 > 630 =
- 636 <= 642 < 648 |/\\| 654 - 660 + 671 ** 677 * 689)
+ 520 |bit?| 524 |binomial| 530 |before?| 536 |base| 542
+ |associates?| 546 |addmod| 552 |abs| 559 |\\/| 564 |Zero|
+ 570 |Or| 574 |One| 580 |OMwrite| 584 |Not| 608 D 613 |And|
+ 624 >= 630 > 636 = 642 <= 648 < 654 |/\\| 660 - 666 + 677
+ ** 683 * 695)
'((|noetherian| . 0) (|canonicalsClosed| . 0)
(|canonical| . 0) (|canonicalUnitNormal| . 0)
(|multiplicativeValuation| . 0) (|noZeroDivisors| . 0)
@@ -636,10 +637,10 @@
(|OrderedSet|) (|AbelianSemiGroup|)
(|SemiGroup|) (|Logic|) (|RealConstant|)
(|RetractableTo| 5) (|SetCategory|)
- (|OpenMath|) (|ConvertibleTo| 97)
- (|ConvertibleTo| 98)
+ (|OpenMath|) (|ConvertibleTo| 98)
+ (|ConvertibleTo| 96)
(|CombinatorialFunctionCategory|)
- (|ConvertibleTo| 99)
+ (|ConvertibleTo| 100)
(|ConvertibleTo| 101)
(|ConvertibleTo| 5) (|CoercibleFrom| $$)
(|CoercibleFrom| 5) (|BasicType|)
@@ -652,42 +653,43 @@
0 5 36 0 5 0 66 2 79 0 0 0 80 2 5 0 0
0 81 2 0 9 0 0 1 1 0 0 0 44 1 0 9 0
65 2 0 0 0 0 51 1 0 92 0 93 1 0 0 0 1
- 1 0 9 0 1 2 0 0 0 0 1 2 0 96 0 0 1 3
+ 1 0 9 0 1 2 0 0 0 0 1 2 0 97 0 0 1 3
0 0 0 0 0 76 1 0 0 0 1 1 0 109 0 1 2
0 9 0 0 1 0 0 56 78 1 0 5 0 1 2 0 0 0
0 73 0 0 0 1 1 0 102 0 1 1 0 5 0 1 2
- 0 0 0 0 59 1 0 30 31 32 2 0 85 31 86
- 87 1 0 96 0 1 1 0 95 0 1 1 0 9 0 1 1
+ 0 0 0 0 59 2 0 85 31 86 87 1 0 30 31
+ 32 1 0 97 0 1 1 0 95 0 1 1 0 9 0 1 1
0 94 0 1 1 0 0 0 91 0 0 0 90 2 0 0 0
- 0 58 1 0 104 103 1 1 0 9 0 1 3 0 0 0
+ 0 58 1 0 105 103 1 1 0 9 0 1 3 0 0 0
0 0 1 2 0 0 0 0 88 1 0 9 0 1 2 0 0 0
- 0 1 3 0 100 0 99 100 1 1 0 9 0 67 1 0
- 9 0 64 1 0 0 0 45 1 0 96 0 1 1 0 9 0
- 77 2 0 105 103 0 1 3 0 0 0 0 0 74 0 0
+ 0 1 3 0 99 0 100 99 1 1 0 9 0 67 1 0
+ 9 0 64 1 0 0 0 45 1 0 97 0 1 1 0 9 0
+ 77 2 0 104 103 0 1 3 0 0 0 0 0 74 0 0
0 42 2 0 0 0 0 69 0 0 0 41 2 0 0 0 0
- 68 1 0 0 0 1 1 0 79 0 83 1 0 0 0 72 1
- 0 0 103 1 2 0 0 0 0 1 1 0 14 0 1 2 0
+ 68 1 0 0 0 1 1 0 79 0 83 1 0 0 0 72 2
+ 0 0 0 0 1 1 0 0 103 1 1 0 14 0 1 2 0
0 0 0 1 0 0 0 1 1 0 0 79 82 1 0 0 0
- 52 1 0 70 0 71 2 0 110 110 110 1 1 0
- 0 103 1 2 0 0 0 0 62 1 0 0 0 1 1 0
- 109 0 1 2 0 106 0 0 1 3 0 108 0 0 0 1
- 2 0 96 0 0 1 2 0 105 103 0 1 1 0 9 0
+ 52 1 0 70 0 71 2 0 110 110 110 1 2 0
+ 0 0 0 62 1 0 0 103 1 1 0 0 0 1 1 0
+ 109 0 1 3 0 107 0 0 0 1 2 0 108 0 0 1
+ 2 0 97 0 0 1 2 0 104 103 0 1 1 0 9 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 53 1 0 0 0 1 1 0
- 97 0 1 1 0 98 0 1 1 0 99 0 1 1 0 101
+ 96 0 1 1 0 98 0 1 1 0 101 0 1 1 0 100
0 1 1 0 5 0 17 1 0 0 5 89 1 0 0 0 1 1
0 0 5 89 1 0 33 0 35 0 0 56 1 2 0 9 0
- 0 1 2 0 0 0 0 1 0 0 0 40 2 0 9 0 0 1
- 3 0 0 0 0 0 75 1 0 0 0 63 2 0 0 0 0
- 47 0 0 0 7 2 0 0 0 0 50 0 0 0 39 2 0
- 11 12 0 28 3 0 11 12 0 9 29 2 0 14 0
- 9 27 1 0 14 0 26 1 0 0 0 48 1 0 0 0 1
- 2 0 0 0 56 1 2 0 0 0 0 49 2 0 9 0 0 1
- 2 0 9 0 0 1 2 0 9 0 0 43 2 0 9 0 0 1
- 2 0 9 0 0 10 2 0 0 0 0 46 1 0 0 0 16
- 2 0 0 0 0 55 2 0 0 0 0 54 2 0 0 0 56
- 57 2 0 0 0 79 1 2 0 0 0 0 37 2 0 0 5
- 0 38 2 0 0 56 0 1 2 0 0 79 0 1)))))
+ 0 1 2 0 0 0 0 1 2 0 9 0 0 1 0 0 0 40
+ 2 0 9 0 0 1 3 0 0 0 0 0 75 1 0 0 0 63
+ 2 0 0 0 0 47 0 0 0 7 2 0 0 0 0 50 0 0
+ 0 39 2 0 11 12 0 28 3 0 11 12 0 9 29
+ 2 0 14 0 9 27 1 0 14 0 26 1 0 0 0 48
+ 1 0 0 0 1 2 0 0 0 56 1 2 0 0 0 0 49 2
+ 0 9 0 0 1 2 0 9 0 0 1 2 0 9 0 0 43 2
+ 0 9 0 0 1 2 0 9 0 0 10 2 0 0 0 0 46 2
+ 0 0 0 0 55 1 0 0 0 16 2 0 0 0 0 54 2
+ 0 0 0 56 57 2 0 0 0 79 1 2 0 0 0 0 37
+ 2 0 0 5 0 38 2 0 0 56 0 1 2 0 0 79 0
+ 1)))))
'|lookupComplete|))
(MAKEPROP '|SingleInteger| 'NILADIC T)
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 6e61215a..14835f6d 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -865,8 +865,9 @@
|scripts| 467 |scripted?| 472 |script| 477 |sample| 489
|resetNew| 493 |patternMatch| 497 |new| 511 |name| 520
|min| 525 |max| 531 |list| 537 |latex| 542 |hash| 547
- |elt| 552 |convert| 558 |coerce| 578 |argscript| 588
- |OMwrite| 594 >= 618 > 624 = 630 <= 636 < 642)
+ |elt| 552 |convert| 558 |coerce| 578 |before?| 588
+ |argscript| 594 |OMwrite| 600 >= 624 > 630 = 636 <= 642 <
+ 648)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0))
(CONS '#(|OrderedSet&| NIL NIL |SetCategory&|
@@ -914,16 +915,16 @@
64 2 0 0 0 57 62 1 0 14 0 103 1 0 100
0 109 1 0 22 0 23 2 0 0 0 59 61 2 0 0
0 100 101 0 0 0 163 0 0 24 136 3 0 77
- 0 74 77 78 3 0 70 0 67 70 71 0 0 0
- 122 1 0 0 0 131 1 0 0 0 102 2 0 0 0 0
- 1 2 0 0 0 0 1 1 0 94 0 138 1 0 14 0
- 114 1 0 140 0 1 2 0 0 0 57 63 1 0 74
- 0 80 1 0 67 0 82 1 0 25 0 49 1 0 46 0
- 48 1 0 0 14 50 1 0 53 0 55 2 0 0 0 57
- 65 3 0 24 26 0 22 37 2 0 14 0 22 35 2
- 0 24 26 0 36 1 0 14 0 34 2 0 22 0 0 1
- 2 0 22 0 0 1 2 0 22 0 0 51 2 0 22 0 0
- 1 2 0 22 0 0 52)))))
+ 0 74 77 78 3 0 70 0 67 70 71 1 0 0 0
+ 131 0 0 0 122 1 0 0 0 102 2 0 0 0 0 1
+ 2 0 0 0 0 1 1 0 94 0 138 1 0 14 0 114
+ 1 0 140 0 1 2 0 0 0 57 63 1 0 67 0 82
+ 1 0 74 0 80 1 0 25 0 49 1 0 46 0 48 1
+ 0 0 14 50 1 0 53 0 55 2 0 22 0 0 1 2
+ 0 0 0 57 65 2 0 24 26 0 36 3 0 24 26
+ 0 22 37 1 0 14 0 34 2 0 14 0 22 35 2
+ 0 22 0 0 1 2 0 22 0 0 1 2 0 22 0 0 51
+ 2 0 22 0 0 1 2 0 22 0 0 52)))))
'|lookupComplete|))
(MAKEPROP '|Symbol| 'NILADIC T)