diff options
Diffstat (limited to 'src/algebra')
-rw-r--r-- | src/algebra/Makefile.am | 12 | ||||
-rw-r--r-- | src/algebra/Makefile.in | 12 | ||||
-rw-r--r-- | src/algebra/array2.spad.pamphlet | 12 | ||||
-rw-r--r-- | src/algebra/exposed.lsp.pamphlet | 2 | ||||
-rw-r--r-- | src/algebra/matrix.spad.pamphlet | 3 |
5 files changed, 20 insertions, 21 deletions
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index 8f239367..0bd4dfc6 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -736,9 +736,9 @@ strap-1/PAIR.$(FASLEXT): strap-1/KOERCE.$(FASLEXT) \ strap-1/SETCAT.$(FASLEXT) strap-0/OUTFORM.$(FASLEXT) strap-1/MATRIX.$(FASLEXT): strap-1/MATCAT.$(FASLEXT) \ - strap-1/IIARRAY2.$(FASLEXT) + strap-1/IARRAY2.$(FASLEXT) -strap-1/IIARRAY2.$(FASLEXT): strap-1/ARR2CAT.$(FASLEXT) \ +strap-1/IARRAY2.$(FASLEXT): strap-1/ARR2CAT.$(FASLEXT) \ strap-1/PRIMARR.$(FASLEXT) strap-1/STRING.$(FASLEXT) strap-1/PRIMARR.$(FASLEXT): strap-1/A1AGG.$(FASLEXT) @@ -1077,9 +1077,9 @@ strap-2/PAIR.$(FASLEXT): strap-2/KOERCE.$(FASLEXT) \ strap-2/SETCAT.$(FASLEXT) strap-0/OUTFORM.$(FASLEXT) strap-2/MATRIX.$(FASLEXT): strap-2/MATCAT.$(FASLEXT) \ - strap-2/IIARRAY2.$(FASLEXT) + strap-2/IARRAY2.$(FASLEXT) -strap-2/IIARRAY2.$(FASLEXT): strap-2/ARR2CAT.$(FASLEXT) \ +strap-2/IARRAY2.$(FASLEXT): strap-2/ARR2CAT.$(FASLEXT) \ strap-2/PRIMARR.$(FASLEXT) strap-1/STRING.$(FASLEXT) strap-2/INFORM.$(FASLEXT): strap-2/SEXCAT.$(FASLEXT) \ @@ -1741,7 +1741,7 @@ $(OUT)/XPBWPOLY.$(FASLEXT): $(OUT)/XPOLYC.$(FASLEXT) \ $(OUT)/PENDTREE.$(FASLEXT): $(OUT)/TREE.$(FASLEXT) $(OUT)/QFORM.$(FASLEXT): $(OUT)/SQMATRIX.$(FASLEXT) $(OUT)/SQMATRIX.$(FASLEXT): $(OUT)/SMATCAT.$(FASLEXT) \ - $(OUT)/MATRIX.$(FASLEXT) $(OUT)/IIARRAY2.$(FASLEXT) + $(OUT)/MATRIX.$(FASLEXT) $(OUT)/IARRAY2.$(FASLEXT) $(OUT)/SMATCAT.$(FASLEXT): $(OUT)/RMATCAT.$(FASLEXT) $(OUT)/RMATCAT.$(FASLEXT): $(OUT)/DIRPROD.$(FASLEXT) $(OUT)/DIRPROD.$(FASLEXT): $(OUT)/DIRPCAT.$(FASLEXT) @@ -1780,7 +1780,7 @@ oa_algebra_layer_10 = \ FUNDESC XPBWPOLY SMATCAT SMATCAT- \ RMATRIX RMATCAT RMATCAT- DIRPROD \ DIRPCAT DIRPCAT- IVECTOR MATRIX \ - MATCAT MATCAT- IIARRAY2 FFIELDC FFIELDC- + MATCAT MATCAT- IARRAY2 FFIELDC FFIELDC- oa_algebra_layer_10_nrlibs = \ diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 28f8236b..d42b3b54 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -917,7 +917,7 @@ oa_algebra_layer_10 = \ FUNDESC XPBWPOLY SMATCAT SMATCAT- \ RMATRIX RMATCAT RMATCAT- DIRPROD \ DIRPCAT DIRPCAT- IVECTOR MATRIX \ - MATCAT MATCAT- IIARRAY2 FFIELDC FFIELDC- + MATCAT MATCAT- IARRAY2 FFIELDC FFIELDC- oa_algebra_layer_10_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_10)) @@ -2226,9 +2226,9 @@ strap-1/PAIR.$(FASLEXT): strap-1/KOERCE.$(FASLEXT) \ strap-1/SETCAT.$(FASLEXT) strap-0/OUTFORM.$(FASLEXT) strap-1/MATRIX.$(FASLEXT): strap-1/MATCAT.$(FASLEXT) \ - strap-1/IIARRAY2.$(FASLEXT) + strap-1/IARRAY2.$(FASLEXT) -strap-1/IIARRAY2.$(FASLEXT): strap-1/ARR2CAT.$(FASLEXT) \ +strap-1/IARRAY2.$(FASLEXT): strap-1/ARR2CAT.$(FASLEXT) \ strap-1/PRIMARR.$(FASLEXT) strap-1/STRING.$(FASLEXT) strap-1/PRIMARR.$(FASLEXT): strap-1/A1AGG.$(FASLEXT) @@ -2564,9 +2564,9 @@ strap-2/PAIR.$(FASLEXT): strap-2/KOERCE.$(FASLEXT) \ strap-2/SETCAT.$(FASLEXT) strap-0/OUTFORM.$(FASLEXT) strap-2/MATRIX.$(FASLEXT): strap-2/MATCAT.$(FASLEXT) \ - strap-2/IIARRAY2.$(FASLEXT) + strap-2/IARRAY2.$(FASLEXT) -strap-2/IIARRAY2.$(FASLEXT): strap-2/ARR2CAT.$(FASLEXT) \ +strap-2/IARRAY2.$(FASLEXT): strap-2/ARR2CAT.$(FASLEXT) \ strap-2/PRIMARR.$(FASLEXT) strap-1/STRING.$(FASLEXT) strap-2/INFORM.$(FASLEXT): strap-2/SEXCAT.$(FASLEXT) \ @@ -2907,7 +2907,7 @@ $(OUT)/XPBWPOLY.$(FASLEXT): $(OUT)/XPOLYC.$(FASLEXT) \ $(OUT)/PENDTREE.$(FASLEXT): $(OUT)/TREE.$(FASLEXT) $(OUT)/QFORM.$(FASLEXT): $(OUT)/SQMATRIX.$(FASLEXT) $(OUT)/SQMATRIX.$(FASLEXT): $(OUT)/SMATCAT.$(FASLEXT) \ - $(OUT)/MATRIX.$(FASLEXT) $(OUT)/IIARRAY2.$(FASLEXT) + $(OUT)/MATRIX.$(FASLEXT) $(OUT)/IARRAY2.$(FASLEXT) $(OUT)/SMATCAT.$(FASLEXT): $(OUT)/RMATCAT.$(FASLEXT) $(OUT)/RMATCAT.$(FASLEXT): $(OUT)/DIRPROD.$(FASLEXT) $(OUT)/DIRPROD.$(FASLEXT): $(OUT)/DIRPCAT.$(FASLEXT) diff --git a/src/algebra/array2.spad.pamphlet b/src/algebra/array2.spad.pamphlet index 3d87394e..0c9ff532 100644 --- a/src/algebra/array2.spad.pamphlet +++ b/src/algebra/array2.spad.pamphlet @@ -259,10 +259,10 @@ TwoDimensionalArrayCategory(R,Row,Col): Category == Definition where matrix l @ -\section{domain IIARRAY2 InnerIndexedTwoDimensionalArray} -<<domain IIARRAY2 InnerIndexedTwoDimensionalArray>>= -)abbrev domain IIARRAY2 InnerIndexedTwoDimensionalArray -InnerIndexedTwoDimensionalArray(R,Row,Col):_ +\section{domain IARRAY2 InnerTwoDimensionalArray} +<<domain IARRAY2 InnerTwoDimensionalArray>>= +)abbrev domain IARRAY2 InnerTwoDimensionalArray +InnerTwoDimensionalArray(R,Row,Col):_ Exports == Implementation where ++ This is an internal type which provides an implementation of ++ 2-dimensional arrays as PrimitiveArray's of PrimitiveArray's. @@ -351,7 +351,7 @@ TwoDimensionalArray(R):Exports == Implementation where Exports == TwoDimensionalArrayCategory(R,Row,Col) with shallowlyMutable ++ One may destructively alter TwoDimensionalArray's. - Implementation == InnerIndexedTwoDimensionalArray(R,Row,Col) + Implementation == InnerTwoDimensionalArray(R,Row,Col) @ \section{License} @@ -391,7 +391,7 @@ TwoDimensionalArray(R):Exports == Implementation where <<license>> <<category ARR2CAT TwoDimensionalArrayCategory>> -<<domain IIARRAY2 InnerIndexedTwoDimensionalArray>> +<<domain IARRAY2 InnerTwoDimensionalArray>> <<domain ARRAY2 TwoDimensionalArray>> @ \eject diff --git a/src/algebra/exposed.lsp.pamphlet b/src/algebra/exposed.lsp.pamphlet index 6664ba90..e124fd63 100644 --- a/src/algebra/exposed.lsp.pamphlet +++ b/src/algebra/exposed.lsp.pamphlet @@ -829,7 +829,7 @@ (|InnerCommonDenominator| . ICDEN) (|InnerFiniteField| . IFF) (|InnerFreeAbelianMonoid| . IFAMON) - (|InnerIndexedTwoDimensionalArray| . IIARRAY2) + (|InnerTwoDimensionalArray| . IARRAY2) (|InnerMatrixLinearAlgebraFunctions| . IMATLIN) (|InnerMatrixQuotientFieldFunctions| . IMATQF) (|InnerModularGcd| . INMODGCD) diff --git a/src/algebra/matrix.spad.pamphlet b/src/algebra/matrix.spad.pamphlet index 1f0abdaf..595a9b6a 100644 --- a/src/algebra/matrix.spad.pamphlet +++ b/src/algebra/matrix.spad.pamphlet @@ -57,8 +57,7 @@ Matrix(R): Exports == Implementation where -- ++ \spad{vectorOfVectors(m)} returns the rows of the matrix m as a -- ++ vector of vectors - Implementation ==> - InnerIndexedTwoDimensionalArray(R,Row,Col) add + Implementation == InnerTwoDimensionalArray(R,Row,Col) add minr ==> minRowIndex maxr ==> maxRowIndex minc ==> minColIndex |