aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog6
-rw-r--r--src/algebra/lodop.spad.pamphlet16
-rw-r--r--src/algebra/sex.spad.pamphlet3
3 files changed, 16 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 06e5a89f..f1944965 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
2008-11-23 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * algebra/lodop.spad.pamphlet (OrdinaryDifferentialRing): Tidy.
+ * algebra/sex.spad.pamphlet (SExpressionCategory): Fix breakage
+ from last commit.
+
+2008-11-23 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* algebra/seg.spad.pamphlet (SegmentCategory): Extend
ConvertibleFrom S.
* algebra/newpoint.spad.pamphlet (PointCategory): Extend
diff --git a/src/algebra/lodop.spad.pamphlet b/src/algebra/lodop.spad.pamphlet
index c126e54d..a2a8d35a 100644
--- a/src/algebra/lodop.spad.pamphlet
+++ b/src/algebra/lodop.spad.pamphlet
@@ -217,19 +217,19 @@ OrdinaryDifferentialRing(Kernels,R,var): DRcategory == DRcapsule where
Kernels:SetCategory
R: PartialDifferentialRing(Kernels)
var : Kernels
- DRcategory == Join(BiModule($,$), DifferentialRing, HomotopicTo R) with
+ DRcategory == Join(BiModule(%,%), DifferentialRing, HomotopicTo R) with
if R has Field then Field
DRcapsule == R add
n: Integer
- Rep := R
- coerce(u:R):$ == u::Rep::$
- coerce(p:$):R == p::Rep::R
- differentiate p == differentiate(p, var)
+ Rep == R
+ coerce(u: R): % == per u
+ coerce(p: %): R == rep p
+ differentiate p == per differentiate(rep p, var)
if R has Field then
- p / q == ((p::R) /$R (q::R))::$
- p ** n == ((p::R) **$R n)::$
- inv(p) == (inv(p::R)$R)::$
+ p / q == per(rep(p) / rep(q))
+ p ** n == per(rep(p) ** n)
+ inv(p) == per inv rep p
@
\section{domain DPMO DirectProductModule}
diff --git a/src/algebra/sex.spad.pamphlet b/src/algebra/sex.spad.pamphlet
index 0508df35..f5776682 100644
--- a/src/algebra/sex.spad.pamphlet
+++ b/src/algebra/sex.spad.pamphlet
@@ -29,7 +29,8 @@ SExpressionCategory(Str, Sym, Int, Flt, Expr): Category == Decl where
Decl == Join(SetCategory,ConvertibleFrom Str, ConvertibleFrom Sym,_
ConvertibleFrom Int, ConvertibleFrom Flt,_
- ConvertibleFrom Flt, ConvertibleFrom List %) with
+ ConvertibleFrom Flt, ConvertibleFrom Expr,_
+ ConvertibleFrom List %) with
eq: (%,%) -> Boolean
++ eq(s, t) is true if EQ(s,t) is true in Lisp.
null?: % -> Boolean