diff options
| author | dos-reis <gdr@axiomatics.org> | 2013-05-16 20:17:37 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2013-05-16 20:17:37 +0000 |
| commit | 1b0bb495c53cbd98069caeb30089c5ff778aceb3 (patch) | |
| tree | c855466ba24bdcc1dde24db340c0407d963bce73 /src/algebra/tree.spad.pamphlet | |
| parent | 0520bd59f6b9d9294a73cc88a1fa34a32678d7e5 (diff) | |
| download | open-axiom-1b0bb495c53cbd98069caeb30089c5ff778aceb3.tar.gz | |
* algebra/aggcat.spad.pamphlet (FiniteAggregate): Temporarily
include attribute finiteAggregate.
(StackAggregate): Extend category FiniteAggregate instead of
attribute finiteAggregate.
(QueueAggregate): Likewise.
(PriorityQueueAggregate): Likewise.
(FiniteSetAggregate): Likewise.
* algebra/lmdict.spad.pamphlet (ListMultiDictionary): Likewise.
* algebra/matcat.spad.pamphlet (MatrixCategory): Likewise.
* algebra/mset.spad.pamphlet (Multiset): Likewise.
* algebra/newdata.spad.pamphlet (SplittingTree): Likewise.
* algebra/polset.spad.pamphlet (PolynomialSetCategory): Likewise.
* algebra/tree.spad.pamphlet (Tree): Likewise.
(BinaryTreeCategory): Likewise.
* algebra/triset.spad.pamphlet (TriangularSetCategory): Likewise.
* algebra/vector.spad.pamphlet (DirectProductCategory): Likewise.
Diffstat (limited to 'src/algebra/tree.spad.pamphlet')
| -rw-r--r-- | src/algebra/tree.spad.pamphlet | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/algebra/tree.spad.pamphlet b/src/algebra/tree.spad.pamphlet index 403f7351..1352bd35 100644 --- a/src/algebra/tree.spad.pamphlet +++ b/src/algebra/tree.spad.pamphlet @@ -30,8 +30,7 @@ import List ++ Each tree is either empty or else is a {\it node} consisting of a value and ++ a list of (sub)trees. Tree(S: SetCategory): T==C where - T== RecursiveAggregate(S) with - finiteAggregate + T== Join(RecursiveAggregate S,FiniteAggregate S) with shallowlyMutable tree: (S,List %) -> % ++ tree(nd,ls) creates a tree with value nd, and children @@ -329,11 +328,9 @@ Tree(S: SetCategory): T==C where ++ Description: \spadtype{BinaryTreeCategory(S)} is the category of ++ binary trees: a tree which is either empty or else is a \spadfun{node} consisting ++ of a value and a \spadfun{left} and \spadfun{right}, both binary trees. -BinaryTreeCategory(S: SetCategory): Category == BinaryRecursiveAggregate(S) with +BinaryTreeCategory(S: SetCategory): Category == Join(BinaryRecursiveAggregate S,FiniteAggregate S) with shallowlyMutable ++ Binary trees have updateable components - finiteAggregate - ++ Binary trees have a finite number of components node: (%,S,%) -> % ++ node(left,v,right) creates a binary tree with value \spad{v}, a binary ++ tree \spad{left}, and a binary tree \spad{right}. |