* algebra/catdef.spad.pamphlet (DifferentialExtension): Now

	extends DifferentialSpaceExtension.

4 files changed, 13 insertions, 38 deletions

diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index d35fbbb8..efcfdf48 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -525,10 +525,11 @@ $(OUT)/PROPFRML.$(FASLEXT): $(OUT)/KERNEL.$(FASLEXT)
 $(OUT)/KTVLOGIC.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) $(OUT)/BYTE.$(FASLEXT)
 $(OUT)/PROPFUN1.$(FASLEXT): $(OUT)/PROPFRML.$(FASLEXT)
 $(OUT)/PROPFUN2.$(FASLEXT): $(OUT)/PROPFRML.$(FASLEXT)
+$(OUT)/DIFEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT)
 
 axiom_algebra_layer_6 = \
   PROPFRML PROPFUN1 AUTOMOR  CARTEN2 CHARPOL  COMPLEX2 \
-  DIFEXT   DIFEXT-  ES1      ES2     GRMOD    GRMOD-   \
+  DIFEXT            ES1      ES2     GRMOD    GRMOD-   \
   HYPCAT   HYPCAT-           MODRING NASRING  NASRING- \
   SORTPAK  ZMOD     PROPFUN2                           \
   KTVLOGIC                   BYTE    SYSINT   SYSNNI
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 0c64e0c3..a52c8977 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -509,10 +509,11 @@ $(OUT)/PROPFRML.$(FASLEXT): $(OUT)/KERNEL.$(FASLEXT)
 $(OUT)/KTVLOGIC.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) $(OUT)/BYTE.$(FASLEXT)
 $(OUT)/PROPFUN1.$(FASLEXT): $(OUT)/PROPFRML.$(FASLEXT)
 $(OUT)/PROPFUN2.$(FASLEXT): $(OUT)/PROPFRML.$(FASLEXT)
+$(OUT)/DIFEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT)
 
 axiom_algebra_layer_6 = \
   PROPFRML PROPFUN1 AUTOMOR  CARTEN2 CHARPOL  COMPLEX2 \
-  DIFEXT   DIFEXT-  ES1      ES2     GRMOD    GRMOD-   \
+  DIFEXT            ES1      ES2     GRMOD    GRMOD-   \
   HYPCAT   HYPCAT-           MODRING NASRING  NASRING- \
   SORTPAK  ZMOD     PROPFUN2                           \
   KTVLOGIC                   BYTE    SYSINT   SYSNNI
diff --git a/src/algebra/catdef.spad.pamphlet b/src/algebra/catdef.spad.pamphlet
index bad221b9..49ada95e 100644
--- a/src/algebra/catdef.spad.pamphlet
+++ b/src/algebra/catdef.spad.pamphlet
@@ -516,37 +516,11 @@ DifferentialModule(R: CommutativeRing): Category ==
 ++ Differential extensions of a ring R.
 ++ Given a differentiation on R, extend it to a differentiation on %.
 
-DifferentialExtension(R:Ring): Category == Ring with
-    --operations
-    differentiate: (%, R -> R) -> %
-       ++ differentiate(x, deriv) differentiates x extending
-       ++ the derivation deriv on R.
-    differentiate: (%, R -> R, NonNegativeInteger) -> %
-       ++ differentiate(x, deriv, n) differentiate x n times
-       ++ using a derivation which extends deriv on R.
-    D: (%, R -> R) -> %
-       ++ D(x, deriv) differentiates x extending
-       ++ the derivation deriv on R.
-    D: (%, R -> R, NonNegativeInteger) -> %
-       ++ D(x, deriv, n) differentiate x n times
-       ++ using a derivation which extends deriv on R.
+DifferentialExtension(R:Ring): Category ==
+  Join(Ring,DifferentialSpaceExtension R) with
     if R has DifferentialRing then DifferentialRing
     if R has PartialDifferentialRing(Symbol) then
              PartialDifferentialRing(Symbol)
-  add
-    differentiate(x:%, derivation: R -> R, n:NonNegativeInteger):% ==
-      for i in 1..n repeat x := differentiate(x, derivation)
-      x
-    D(x:%, derivation: R -> R) == differentiate(x, derivation)
-    D(x:%, derivation: R -> R, n:NonNegativeInteger) ==
-            differentiate(x, derivation, n)
-
-    if R has DifferentialRing then
-      differentiate x == differentiate(x, differentiate$R)
-
-    if R has PartialDifferentialRing Symbol then
-      differentiate(x:%, v:Symbol):% ==
-        differentiate(x, differentiate(#1, v)$R)
 
 @
 
diff --git a/src/algebra/strap/QFCAT-.lsp b/src/algebra/strap/QFCAT-.lsp
index bc8aab46..3dfe5c3e 100644
--- a/src/algebra/strap/QFCAT-.lsp
+++ b/src/algebra/strap/QFCAT-.lsp
@@ -457,10 +457,9 @@
              (343 . |minColIndex|) (348 . +) (354 . |maxColIndex|)
              (359 . |subMatrix|) (|Vector| 7) (368 . |column|)
              (|Record| (|:| |mat| 23) (|:| |vec| 111)) (|Vector| $)
-             |QFCAT-;reducedSystem;MVR;27| (|Union| 86 '"failed")
-             (|Matrix| 67) (|Vector| 67)
-             (|Record| (|:| |mat| 117) (|:| |vec| 118)) (|List| 56)
-             (|List| 29) (|OutputForm|))
+             |QFCAT-;reducedSystem;MVR;27| (|List| 56) (|List| 29)
+             (|Union| 86 '"failed") (|Matrix| 67) (|Vector| 67)
+             (|Record| (|:| |mat| 119) (|:| |vec| 120)) (|OutputForm|))
           '#(|retractIfCan| 374 |retract| 384 |reducedSystem| 394
              |random| 405 |patternMatch| 409 |numerator| 423 |nextItem|
              428 |map| 433 |init| 439 |fractionPart| 443
@@ -497,11 +496,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 75 0 68
-                                  75 76 3 0 84 0 77 84 85 1 0 0 0 10 1
+                                  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
                                   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 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
+                                  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
                                   86 91 0 0 29 31 2 0 49 0 0 51)))))
           '|lookupComplete|))