diff options
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/Makefile.am | 2 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 2 | ||||
| -rw-r--r-- | src/algebra/array2.spad.pamphlet | 34 | ||||
| -rw-r--r-- | src/algebra/exposed.lsp.pamphlet | 1 | ||||
| -rw-r--r-- | src/algebra/matrix.spad.pamphlet | 8 |
5 files changed, 11 insertions, 36 deletions
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index ed6f127b..8f239367 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -1799,7 +1799,7 @@ oa_algebra_layer_11 = \ ASTACK COMBINAT POINT PTCAT \ CSTTOOLS FARRAY \ FLALG GALUTIL HEAP \ - IARRAY2 IFARRAY INTCAT INTHEORY \ + IFARRAY INTCAT INTHEORY \ IRREDFFX LFCAT LODOCAT LODOCAT- \ MATSTOR \ ORESUP OREPCTO OREUP PLOT3D \ diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index fbf8cc9c..28f8236b 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -931,7 +931,7 @@ oa_algebra_layer_11 = \ ASTACK COMBINAT POINT PTCAT \ CSTTOOLS FARRAY \ FLALG GALUTIL HEAP \ - IARRAY2 IFARRAY INTCAT INTHEORY \ + IFARRAY INTCAT INTHEORY \ IRREDFFX LFCAT LODOCAT LODOCAT- \ MATSTOR \ ORESUP OREPCTO OREUP PLOT3D \ diff --git a/src/algebra/array2.spad.pamphlet b/src/algebra/array2.spad.pamphlet index 17fd3a3f..3d87394e 100644 --- a/src/algebra/array2.spad.pamphlet +++ b/src/algebra/array2.spad.pamphlet @@ -262,12 +262,11 @@ TwoDimensionalArrayCategory(R,Row,Col): Category == Definition where \section{domain IIARRAY2 InnerIndexedTwoDimensionalArray} <<domain IIARRAY2 InnerIndexedTwoDimensionalArray>>= )abbrev domain IIARRAY2 InnerIndexedTwoDimensionalArray -InnerIndexedTwoDimensionalArray(R,mnRow,mnCol,Row,Col):_ +InnerIndexedTwoDimensionalArray(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. R : Type - mnRow, mnCol : Integer Row : FiniteLinearAggregate R Col : FiniteLinearAggregate R @@ -294,10 +293,10 @@ InnerIndexedTwoDimensionalArray(R,mnRow,mnCol,Row,Col):_ --% Size inquiries - minRowIndex m == mnRow - minColIndex m == mnCol - maxRowIndex m == nrows m + mnRow - 1 - maxColIndex m == ncols m + mnCol - 1 + minRowIndex m == 1 + minColIndex m == 1 + maxRowIndex m == nrows m + maxColIndex m == ncols m nrows m == # rep m ncols m == empty? m => 0 @@ -339,27 +338,7 @@ InnerIndexedTwoDimensionalArray(R,mnRow,mnCol,Row,Col):_ concat(s, "\end{array} \right]")$String @ -\section{domain IARRAY2 IndexedTwoDimensionalArray} -<<domain IARRAY2 IndexedTwoDimensionalArray>>= -)abbrev domain IARRAY2 IndexedTwoDimensionalArray -IndexedTwoDimensionalArray(R,mnRow,mnCol):Exports == Implementation where - ++ An IndexedTwoDimensionalArray is a 2-dimensional array where - ++ the minimal row and column indices are parameters of the type. - ++ Rows and columns are returned as IndexedOneDimensionalArray's with - ++ minimal indices matching those of the IndexedTwoDimensionalArray. - ++ The index of the 'first' row may be obtained by calling the - ++ function 'minRowIndex'. The index of the 'first' column may - ++ be obtained by calling the function 'minColIndex'. The index of - ++ the first element of a 'Row' is the same as the index of the - ++ first column in an array and vice versa. - R : Type - mnRow, mnCol : Integer - macro Row == IndexedOneDimensionalArray(R,mnCol) - macro Col == IndexedOneDimensionalArray(R,mnRow) - Exports == TwoDimensionalArrayCategory(R,Row,Col) - Implementation == InnerIndexedTwoDimensionalArray(R,mnRow,mnCol,Row,Col) -@ \section{domain ARRAY2 TwoDimensionalArray} <<domain ARRAY2 TwoDimensionalArray>>= )abbrev domain ARRAY2 TwoDimensionalArray @@ -372,7 +351,7 @@ TwoDimensionalArray(R):Exports == Implementation where Exports == TwoDimensionalArrayCategory(R,Row,Col) with shallowlyMutable ++ One may destructively alter TwoDimensionalArray's. - Implementation == InnerIndexedTwoDimensionalArray(R,1,1,Row,Col) + Implementation == InnerIndexedTwoDimensionalArray(R,Row,Col) @ \section{License} @@ -413,7 +392,6 @@ TwoDimensionalArray(R):Exports == Implementation where <<category ARR2CAT TwoDimensionalArrayCategory>> <<domain IIARRAY2 InnerIndexedTwoDimensionalArray>> -<<domain IARRAY2 IndexedTwoDimensionalArray>> <<domain ARRAY2 TwoDimensionalArray>> @ \eject diff --git a/src/algebra/exposed.lsp.pamphlet b/src/algebra/exposed.lsp.pamphlet index e20f1fa1..6664ba90 100644 --- a/src/algebra/exposed.lsp.pamphlet +++ b/src/algebra/exposed.lsp.pamphlet @@ -823,7 +823,6 @@ (|IndexedExponents| . INDE) (|IndexedFlexibleArray| . IFARRAY) (|IndexedOneDimensionalArray| . IARRAY1) - (|IndexedTwoDimensionalArray| . IARRAY2) (|IndexedVector| . IVECTOR) (|InnerAlgFactor| . IALGFACT) (|InnerAlgebraicNumber| . IAN) diff --git a/src/algebra/matrix.spad.pamphlet b/src/algebra/matrix.spad.pamphlet index 8d9242e5..1f0abdaf 100644 --- a/src/algebra/matrix.spad.pamphlet +++ b/src/algebra/matrix.spad.pamphlet @@ -30,8 +30,6 @@ Matrix(R): Exports == Implementation where R : Ring Row ==> Vector R Col ==> Vector R - mnRow ==> 1 - mnCol ==> 1 MATLIN ==> MatrixLinearAlgebraFunctions(R,Row,Col,$) MATSTOR ==> StorageEfficientMatrixOperations(R) @@ -60,7 +58,7 @@ Matrix(R): Exports == Implementation where -- ++ vector of vectors Implementation ==> - InnerIndexedTwoDimensionalArray(R,mnRow,mnCol,Row,Col) add + InnerIndexedTwoDimensionalArray(R,Row,Col) add minr ==> minRowIndex maxr ==> maxRowIndex minc ==> minColIndex @@ -68,8 +66,8 @@ Matrix(R): Exports == Implementation where mini ==> minIndex maxi ==> maxIndex - minRowIndex x == mnRow - minColIndex x == mnCol + minRowIndex x == 1 + minColIndex x == 1 swapRows!(x,i1,i2) == (i1 < minRowIndex(x)) or (i1 > maxRowIndex(x)) or _ |