From f50462616a6319727efb50c267a105166f5275e8 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 25 Apr 2010 23:44:14 +0000 Subject: * algebra/aggcat.spad.pamphlet: Tidy. --- src/algebra/aggcat.spad.pamphlet | 19 +++++++++---------- src/algebra/strap/ILIST.lsp | 4 ++-- src/algebra/strap/ISTRING.lsp | 4 ++-- src/algebra/strap/LIST.lsp | 2 +- src/algebra/strap/VECTOR.lsp | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) (limited to 'src/algebra') diff --git a/src/algebra/aggcat.spad.pamphlet b/src/algebra/aggcat.spad.pamphlet index 8b01b3c8..d0d0db69 100644 --- a/src/algebra/aggcat.spad.pamphlet +++ b/src/algebra/aggcat.spad.pamphlet @@ -872,9 +872,9 @@ KeyedDictionary(Key:SetCategory, Entry:SetCategory): Category == import Type import SetCategory )abbrev category ELTAB Eltable -++ Author: Michael Monagan; revised by Manuel Bronstein and Manuel Bronstein +++ Author: Michael Monagan; revised by Manuel Bronstein ++ Date Created: August 87 through August 88 -++ Date Last Updated: April 1991 +++ Date Last Updated: April 25, 2010 ++ Basic Operations: ++ Related Constructors: ++ Also See: @@ -882,14 +882,15 @@ import SetCategory ++ Keywords: ++ References: ++ Description: -++ An eltable over domains D and I is a structure which can be viewed -++ as a function from D to I. +++ An eltable over domains \spad{S} and \spad{T} is a structure which +++ can be viewed as a function from \spad{S} to \spad{T}. ++ Examples of eltable structures range from data structures, e.g. those ++ of type \spadtype{List}, to algebraic structures, e.g. \spadtype{Polynomial}. -Eltable(S:SetCategory, Index:Type): Category == with - elt : (%, S) -> Index - ++ elt(u,i) (also written: u . i) returns the element of u indexed by i. - ++ Error: if i is not an index of u. +Eltable(S: Type, T: Type): Category == Type with + elt : (%, S) -> T + ++ \spad{elt(u,s)} (also written: \spad{u.s}) returns the value + ++ of \spad{u} at \spad{s}. + ++ Error: if \spad{u} is not defined at \spad{s}. @ @@ -915,8 +916,6 @@ import SetCategory ++ as mapping 0 to 1, 1 to 7 and 2 to 4. In general, an aggregate ++ can map members of a domain {\em Dom} to an image domain {\em Im}. EltableAggregate(Dom:SetCategory, Im:Type): Category == --- This is separated from Eltable --- and series won't have to support qelt's and setelt's. Eltable(Dom, Im) with elt : (%, Dom, Im) -> Im ++ elt(u, x, y) applies u to x if x is in the domain of u, diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index fc9c8183..056e79c8 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -628,8 +628,8 @@ (|HomogeneousAggregate| 6) (|OrderedSet|) (|Aggregate|) (|EltableAggregate| 30 6) (|Evalable| 6) - (|SetCategory|) (|Type|) - (|Eltable| 30 6) (|InnerEvalable| 6 6) + (|SetCategory|) (|Eltable| 30 6) + (|Type|) (|InnerEvalable| 6 6) (|CoercibleTo| 36) (|ConvertibleTo| 81) (|BasicType|)) (|makeByteWordVec2| 84 diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp index b2fb52c3..12d4a5cb 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -962,8 +962,8 @@ (|HomogeneousAggregate| 8) (|OrderedSet|) (|Aggregate|) (|EltableAggregate| 11 8) (|Evalable| 8) - (|SetCategory|) (|Type|) - (|Eltable| 11 8) (|InnerEvalable| 8 8) + (|SetCategory|) (|Eltable| 11 8) + (|Type|) (|InnerEvalable| 8 8) (|CoercibleTo| 29) (|ConvertibleTo| 95) (|BasicType|)) (|makeByteWordVec2| 100 diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp index cd156bad..b043b4af 100644 --- a/src/algebra/strap/LIST.lsp +++ b/src/algebra/strap/LIST.lsp @@ -342,7 +342,7 @@ (|HomogeneousAggregate| 6) (|OrderedSet|) (|Aggregate|) (|EltableAggregate| 7 6) (|Evalable| 6) - (|SetCategory|) (|Type|) (|Eltable| 7 6) + (|SetCategory|) (|Eltable| 7 6) (|Type|) (|InnerEvalable| 6 6) (|CoercibleTo| 45) (|ConvertibleTo| 46) (|BasicType|) (|OpenMath|)) diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp index e6ac08f8..2bb16105 100644 --- a/src/algebra/strap/VECTOR.lsp +++ b/src/algebra/strap/VECTOR.lsp @@ -136,7 +136,7 @@ (|HomogeneousAggregate| 6) (|OrderedSet|) (|Aggregate|) (|EltableAggregate| 7 6) (|Evalable| 6) - (|SetCategory|) (|Type|) (|Eltable| 7 6) + (|SetCategory|) (|Eltable| 7 6) (|Type|) (|InnerEvalable| 6 6) (|CoercibleTo| 13) (|ConvertibleTo| 14) (|BasicType|)) (|makeByteWordVec2| 20 -- cgit v1.2.3