diff options
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/Makefile.am | 6 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 6 | ||||
| -rw-r--r-- | src/algebra/array2.spad.pamphlet | 6 | ||||
| -rw-r--r-- | src/algebra/sortpak.spad.pamphlet | 3 |
4 files changed, 9 insertions, 12 deletions
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index 49801808..4c27b514 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -264,7 +264,7 @@ strap-0/VECTCAT.$(FASLEXT): strap-0/A1AGG.$(FASLEXT) \ strap-0/ABELMON.$(FASLEXT) strap-0/RING.$(FASLEXT) \ strap-0/MONOID.$(FASLEXT) strap-0/ABELGRP.$(FASLEXT) -strap-0/ARR2CAT.$(FASLEXT): strap-0/HOAGG.$(FASLEXT) +strap-0/ARR2CAT.$(FASLEXT): strap-0/FINAGG.$(FASLEXT) strap-0/MATCAT.$(FASLEXT): strap-0/ARR2CAT.$(FASLEXT) \ strap-0/EUCDOM.$(FASLEXT) strap-0/INTDOM.$(FASLEXT) \ @@ -605,7 +605,7 @@ strap-1/QFCAT.$(FASLEXT): strap-1/FIELD.$(FASLEXT) \ strap-1/OPERCAT.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \ strap-0/OUTFORM.$(FASLEXT) strap-0/BOOLEAN.$(FASLEXT) -strap-1/ARR2CAT.$(FASLEXT): strap-1/HOAGG.$(FASLEXT) +strap-1/ARR2CAT.$(FASLEXT): strap-1/FINAGG.$(FASLEXT) strap-1/BTAGG.$(FASLEXT): strap-1/ORDSET.$(FASLEXT) \ strap-1/BOOLE.$(FASLEXT) strap-1/LOGIC.$(FASLEXT) \ @@ -986,7 +986,7 @@ strap-2/UPOLYC.$(FASLEXT): strap-2/POLYCAT.$(FASLEXT) \ strap-2/FIELD.$(FASLEXT) strap-2/ALGEBRA.$(FASLEXT) -strap-2/ARR2CAT.$(FASLEXT): strap-2/HOAGG.$(FASLEXT) +strap-2/ARR2CAT.$(FASLEXT): strap-2/FINAGG.$(FASLEXT) strap-2/FSAGG.$(FASLEXT): strap-2/KDAGG.$(FASLEXT) \ strap-2/SETAGG.$(FASLEXT) strap-2/FINAGG.$(FASLEXT) strap-2/ALAGG.$(FASLEXT): strap-2/TBAGG.$(FASLEXT) strap-2/LSAGG.$(FASLEXT) diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index c098271f..766ace73 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -1754,7 +1754,7 @@ strap-0/VECTCAT.$(FASLEXT): strap-0/A1AGG.$(FASLEXT) \ strap-0/ABELMON.$(FASLEXT) strap-0/RING.$(FASLEXT) \ strap-0/MONOID.$(FASLEXT) strap-0/ABELGRP.$(FASLEXT) -strap-0/ARR2CAT.$(FASLEXT): strap-0/HOAGG.$(FASLEXT) +strap-0/ARR2CAT.$(FASLEXT): strap-0/FINAGG.$(FASLEXT) strap-0/MATCAT.$(FASLEXT): strap-0/ARR2CAT.$(FASLEXT) \ strap-0/EUCDOM.$(FASLEXT) strap-0/INTDOM.$(FASLEXT) \ @@ -2095,7 +2095,7 @@ strap-1/QFCAT.$(FASLEXT): strap-1/FIELD.$(FASLEXT) \ strap-1/OPERCAT.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \ strap-0/OUTFORM.$(FASLEXT) strap-0/BOOLEAN.$(FASLEXT) -strap-1/ARR2CAT.$(FASLEXT): strap-1/HOAGG.$(FASLEXT) +strap-1/ARR2CAT.$(FASLEXT): strap-1/FINAGG.$(FASLEXT) strap-1/BTAGG.$(FASLEXT): strap-1/ORDSET.$(FASLEXT) \ strap-1/BOOLE.$(FASLEXT) strap-1/LOGIC.$(FASLEXT) \ @@ -2473,7 +2473,7 @@ strap-2/UPOLYC.$(FASLEXT): strap-2/POLYCAT.$(FASLEXT) \ strap-2/COMRING.$(FASLEXT) strap-2/INTDOM.$(FASLEXT) \ strap-2/FIELD.$(FASLEXT) strap-2/ALGEBRA.$(FASLEXT) -strap-2/ARR2CAT.$(FASLEXT): strap-2/HOAGG.$(FASLEXT) +strap-2/ARR2CAT.$(FASLEXT): strap-2/FINAGG.$(FASLEXT) strap-2/FSAGG.$(FASLEXT): strap-2/KDAGG.$(FASLEXT) \ strap-2/SETAGG.$(FASLEXT) strap-2/FINAGG.$(FASLEXT) strap-2/ALAGG.$(FASLEXT): strap-2/TBAGG.$(FASLEXT) strap-2/LSAGG.$(FASLEXT) diff --git a/src/algebra/array2.spad.pamphlet b/src/algebra/array2.spad.pamphlet index 44e5ad29..217d9cad 100644 --- a/src/algebra/array2.spad.pamphlet +++ b/src/algebra/array2.spad.pamphlet @@ -15,7 +15,7 @@ ++ Two dimensional array categories and domains ++ Author: ++ Date Created: 27 October 1989 -++ Date Last Updated: 27 June 1990 +++ Date Last Updated: May 16, 2013 ++ Keywords: array, data structure ++ Examples: ++ References: @@ -32,11 +32,9 @@ TwoDimensionalArrayCategory(R,Row,Col): Category == Definition where R : Type Row : FiniteLinearAggregate R Col : FiniteLinearAggregate R - Definition == HomogeneousAggregate(R) with + Definition == FiniteAggregate R with shallowlyMutable ++ one may destructively alter arrays - finiteAggregate - ++ two-dimensional arrays are finite --% Array creation new: (NonNegativeInteger,NonNegativeInteger,R) -> % ++ new(m,n,r) is an m-by-n array all of whose entries are r diff --git a/src/algebra/sortpak.spad.pamphlet b/src/algebra/sortpak.spad.pamphlet index 747e8eec..f9823221 100644 --- a/src/algebra/sortpak.spad.pamphlet +++ b/src/algebra/sortpak.spad.pamphlet @@ -16,8 +16,7 @@ ++ This package exports sorting algorithnms SortPackage(S,A) : Exports == Implementation where S: Type - A: IndexedAggregate(Integer,S) - with (finiteAggregate; shallowlyMutable) + A: Join(IndexedAggregate(Integer,S),FiniteAggregate S) with shallowlyMutable Exports == with bubbleSort!: (A,(S,S) -> Boolean) -> A |