aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/Makefile.in10
-rw-r--r--src/algebra/Makefile.pamphlet10
-rw-r--r--src/algebra/catdef.spad.pamphlet11
-rw-r--r--src/algebra/strap/DFLOAT.lsp18
-rw-r--r--src/algebra/strap/DIFRING.lsp9
-rw-r--r--src/algebra/strap/INT.lsp25
-rw-r--r--src/algebra/strap/SINT.lsp21
7 files changed, 47 insertions, 57 deletions
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 28826e1b..8d53e502 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -186,7 +186,7 @@ axiom_algebra_bootstrap = \
ABELGRP ABELGRP- ABELMON ABELMON- \
ABELSG ABELSG- ALAGG BOOLEAN \
CABMON CHAR CLAGG CLAGG- \
- COMRING DFLOAT DIFRING DIFRING- \
+ COMRING DFLOAT DIFRING \
DIVRING DIVRING- ENTIRER \
EUCDOM EUCDOM- FFIELDC \
FFIELDC- FPS FPS- GCDDOM \
@@ -259,11 +259,12 @@ $(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)/DIFFDOM.$(FASLEXT)
+ $(OUT)/DIFFSPC.$(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)/DIFFDOM-.$(FASLEXT)
+$(OUT)/ISTRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) \
+ $(OUT)/DIFFSPC-.$(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)
@@ -419,11 +420,12 @@ $(OUT)/PROPERTY.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT)
$(OUT)/BINDING.$(FASLEXT): $(OUT)/PROPERTY.$(FASLEXT)
$(OUT)/OPERCAT.$(FASLEXT): $(OUT)/ARITY.$(FASLEXT)
$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
+$(OUT)/DIFRING.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT)
axiom_algebra_layer_1 = \
ABELGRP ABELGRP- ABELMON ABELMON- FORTCAT ITUPLE \
CABMON MONOID MONOID- RING RING- COMRING \
- DIFRING DIFRING- ENTIRER INTDOM INTDOM- OINTDOM \
+ DIFRING ENTIRER INTDOM INTDOM- OINTDOM \
GCDDOM GCDDOM- UFD UFD- ES ES- \
PATAB PPCURVE PSCURVE CACHSET RESLATC REF \
IDENT BINDING ALIST BOOLEAN PRIMARR \
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 0019edc1..c5618b5a 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -135,7 +135,7 @@ axiom_algebra_bootstrap = \
ABELGRP ABELGRP- ABELMON ABELMON- \
ABELSG ABELSG- ALAGG BOOLEAN \
CABMON CHAR CLAGG CLAGG- \
- COMRING DFLOAT DIFRING DIFRING- \
+ COMRING DFLOAT DIFRING \
DIVRING DIVRING- ENTIRER \
EUCDOM EUCDOM- FFIELDC \
FFIELDC- FPS FPS- GCDDOM \
@@ -213,11 +213,12 @@ $(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)/DIFFDOM.$(FASLEXT)
+ $(OUT)/DIFFSPC.$(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)/DIFFDOM-.$(FASLEXT)
+$(OUT)/ISTRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) \
+ $(OUT)/DIFFSPC-.$(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)
@@ -378,11 +379,12 @@ $(OUT)/PROPERTY.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT)
$(OUT)/BINDING.$(FASLEXT): $(OUT)/PROPERTY.$(FASLEXT)
$(OUT)/OPERCAT.$(FASLEXT): $(OUT)/ARITY.$(FASLEXT)
$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
+$(OUT)/DIFRING.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT)
axiom_algebra_layer_1 = \
ABELGRP ABELGRP- ABELMON ABELMON- FORTCAT ITUPLE \
CABMON MONOID MONOID- RING RING- COMRING \
- DIFRING DIFRING- ENTIRER INTDOM INTDOM- OINTDOM \
+ DIFRING ENTIRER INTDOM INTDOM- OINTDOM \
GCDDOM GCDDOM- UFD UFD- ES ES- \
PATAB PPCURVE PSCURVE CACHSET RESLATC REF \
IDENT BINDING ALIST BOOLEAN PRIMARR \
diff --git a/src/algebra/catdef.spad.pamphlet b/src/algebra/catdef.spad.pamphlet
index 815e4d43..ddd378dc 100644
--- a/src/algebra/catdef.spad.pamphlet
+++ b/src/algebra/catdef.spad.pamphlet
@@ -428,16 +428,7 @@ DifferentialSpace(): Category == DifferentialDomain % with
++ \spad{differentiate(x+y) = differentiate(x)+differentiate(y)}
++ \spad{differentiate(x*y) = x*differentiate(y) + differentiate(x)*y}
-DifferentialRing(): Category == Join(Ring,DifferentialDomain %) with
- differentiate: (%, NonNegativeInteger) -> %
- ++ differentiate(x, n) returns the n-th derivative of x.
- D: (%, NonNegativeInteger) -> %
- ++ D(x, n) returns the n-th derivative of x.
- add
- differentiate(r, n) ==
- for i in 1..n repeat r := differentiate r
- r
- D(r,n) == differentiate(r,n)
+DifferentialRing(): Category == Join(Ring,DifferentialSpace)
@
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp
index 4cb323b5..33acb279 100644
--- a/src/algebra/strap/DFLOAT.lsp
+++ b/src/algebra/strap/DFLOAT.lsp
@@ -1004,18 +1004,17 @@
(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))
(CONS '#(|FloatingPointSystem&| |RealNumberSystem&|
|Field&| |EuclideanDomain&| NIL
|UniqueFactorizationDomain&| |GcdDomain&|
|DivisionRing&| |IntegralDomain&| |Algebra&|
- |Algebra&| |DifferentialRing&| 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
+ |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&|
+ |DifferentialSpace&| NIL |OrderedSet&| NIL NIL
+ NIL NIL |AbelianSemiGroup&| |SemiGroup&| NIL
|TranscendentalFunctionCategory&|
|DifferentialDomain&| |RetractableTo&|
|RetractableTo&| NIL |SetCategory&| NIL
@@ -1048,6 +1047,7 @@
(|OrderedAbelianSemiGroup|)
(|LinearSet| 114) (|LinearSet| $$)
(|AbelianMonoid|) (|Monoid|)
+ (|DifferentialSpace|)
(|PatternMatchable| 111) (|OrderedSet|)
(|LeftLinearSet| 114)
(|RightLinearSet| 114)
@@ -1129,7 +1129,7 @@
0 0 83 1 0 0 0 92 1 0 0 0 80 1 0 0 0
119 0 0 0 23 0 0 0 43 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 107 1 0 0 0 1 2 0 0 0 115
+ 20 1 0 0 0 107 2 0 0 0 115 1 1 0 0 0
1 2 0 0 0 0 109 2 0 19 0 0 56 2 0 19
0 0 54 2 0 19 0 0 64 2 0 19 0 0 55 2
0 19 0 0 53 2 0 0 0 26 65 2 0 0 0 0
diff --git a/src/algebra/strap/DIFRING.lsp b/src/algebra/strap/DIFRING.lsp
index 8777af26..b0e48f64 100644
--- a/src/algebra/strap/DIFRING.lsp
+++ b/src/algebra/strap/DIFRING.lsp
@@ -4,14 +4,7 @@
(DEFPARAMETER |DifferentialRing;AL| 'NIL)
(DEFUN |DifferentialRing;| ()
- (LET ((#0=#:G1397
- (|Join| (|Ring|) (|DifferentialDomain| '$)
- (|mkCategory| '|domain|
- '(((|differentiate|
- ($ $ (|NonNegativeInteger|)))
- T)
- ((D ($ $ (|NonNegativeInteger|))) T))
- NIL '((|NonNegativeInteger|)) NIL))))
+ (LET ((#0=#:G1397 (|Join| (|Ring|) (|DifferentialSpace|))))
(|setShellEntry| #0# 0 '(|DifferentialRing|))
#0#))
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index e6b040eb..4c687c93 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -635,19 +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 0 0 0 0))
(CONS '#(|IntegerNumberSystem&| |EuclideanDomain&|
|UniqueFactorizationDomain&| NIL NIL
|GcdDomain&| |IntegralDomain&| |Algebra&| NIL
- |DifferentialRing&| |OrderedRing&| NIL NIL
- |Module&| NIL NIL |Ring&| NIL NIL NIL NIL NIL
- NIL |AbelianGroup&| NIL NIL NIL 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 NIL |RetractableTo&|
- |DifferentialDomain&| |SetCategory&| NIL NIL
- NIL NIL NIL NIL NIL NIL NIL NIL NIL
- |BasicType&| NIL)
+ |DifferentialSpace&| |OrderedSet&| NIL NIL
+ |AbelianSemiGroup&| |SemiGroup&| NIL NIL
+ |RetractableTo&| |DifferentialDomain&|
+ |SetCategory&| NIL NIL NIL NIL NIL NIL NIL NIL
+ NIL NIL NIL |BasicType&| NIL)
(CONS '#((|IntegerNumberSystem|)
(|EuclideanDomain|)
(|UniqueFactorizationDomain|)
@@ -671,7 +671,8 @@
(|OrderedAbelianSemiGroup|)
(|LinearSet| $$) (|AbelianMonoid|)
(|Monoid|) (|StepThrough|)
- (|PatternMatchable| 17) (|OrderedSet|)
+ (|PatternMatchable| 17)
+ (|DifferentialSpace|) (|OrderedSet|)
(|LeftLinearSet| $$)
(|RightLinearSet| $$)
(|AbelianSemiGroup|) (|SemiGroup|)
@@ -723,7 +724,7 @@
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
+ 0 1 2 0 88 0 0 89 2 0 0 0 7 1 1 0 0 0
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
@@ -732,7 +733,7 @@
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
+ 14 0 26 2 0 0 0 7 1 1 0 0 0 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
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index c86638ab..7233de50 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -639,17 +639,17 @@
(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))
(CONS '#(|IntegerNumberSystem&| |EuclideanDomain&|
|UniqueFactorizationDomain&| NIL NIL
|GcdDomain&| |IntegralDomain&| |Algebra&| NIL
- |DifferentialRing&| |OrderedRing&| NIL NIL
- |Module&| NIL NIL |Ring&| NIL NIL NIL NIL NIL
- NIL |AbelianGroup&| NIL NIL NIL NIL 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&| NIL NIL
- |RetractableTo&| |DifferentialDomain&|
+ |DifferentialSpace&| |OrderedSet&| NIL NIL
+ |AbelianSemiGroup&| |SemiGroup&| NIL |Logic&|
+ NIL NIL |RetractableTo&| |DifferentialDomain&|
|SetCategory&| NIL NIL NIL NIL NIL NIL NIL NIL
NIL NIL |BasicType&| NIL)
(CONS '#((|IntegerNumberSystem|)
@@ -675,7 +675,8 @@
(|OrderedAbelianSemiGroup|)
(|LinearSet| $$) (|AbelianMonoid|)
(|Monoid|) (|Finite|) (|StepThrough|)
- (|PatternMatchable| 5) (|OrderedSet|)
+ (|PatternMatchable| 5)
+ (|DifferentialSpace|) (|OrderedSet|)
(|LeftLinearSet| $$)
(|RightLinearSet| $$)
(|AbelianSemiGroup|) (|SemiGroup|)
@@ -721,7 +722,7 @@
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 2 0 65 0 0 66 2 0 0 0 61 1 1 0 0 0
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
@@ -731,7 +732,7 @@
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 48 2 0 0 0 61 1 1 0 0 0 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 1 0 0 0 16 2 0 0 0 0 60 2 0 0
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 00:25:55 +0000