aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/Makefile.am2
-rw-r--r--src/algebra/Makefile.in2
-rw-r--r--src/algebra/exposed.lsp.pamphlet1
-rw-r--r--src/algebra/matfuns.spad.pamphlet14
-rw-r--r--src/algebra/matrix.spad.pamphlet74
5 files changed, 10 insertions, 83 deletions
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am
index 340aab63..ed6f127b 100644
--- a/src/algebra/Makefile.am
+++ b/src/algebra/Makefile.am
@@ -1817,7 +1817,7 @@ oa_algebra_layer_11_objects = \
$(addprefix $(OUT)/, \
$(addsuffix .$(FASLEXT),$(oa_algebra_layer_11)))
oa_algebra_layer_12 = \
- ULSCAT BITS DIRPROD2 IMATRIX \
+ ULSCAT BITS DIRPROD2 \
LPOLY LSMP LSMP1 MATCAT2 TRIMAT \
SYSTEM HOSTNAME PORTNUM
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 9e523fb7..fbf8cc9c 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -950,7 +950,7 @@ oa_algebra_layer_11_objects = \
$(addsuffix .$(FASLEXT),$(oa_algebra_layer_11)))
oa_algebra_layer_12 = \
- ULSCAT BITS DIRPROD2 IMATRIX \
+ ULSCAT BITS DIRPROD2 \
LPOLY LSMP LSMP1 MATCAT2 TRIMAT \
SYSTEM HOSTNAME PORTNUM
diff --git a/src/algebra/exposed.lsp.pamphlet b/src/algebra/exposed.lsp.pamphlet
index 85f460f4..e20f1fa1 100644
--- a/src/algebra/exposed.lsp.pamphlet
+++ b/src/algebra/exposed.lsp.pamphlet
@@ -822,7 +822,6 @@
(|IndexedDirectProductOrderedAbelianMonoidSup| . IDPOAMS)
(|IndexedExponents| . INDE)
(|IndexedFlexibleArray| . IFARRAY)
- (|IndexedMatrix| . IMATRIX)
(|IndexedOneDimensionalArray| . IARRAY1)
(|IndexedTwoDimensionalArray| . IARRAY2)
(|IndexedVector| . IVECTOR)
diff --git a/src/algebra/matfuns.spad.pamphlet b/src/algebra/matfuns.spad.pamphlet
index 1fdf3cc9..cba5b7f5 100644
--- a/src/algebra/matfuns.spad.pamphlet
+++ b/src/algebra/matfuns.spad.pamphlet
@@ -16,8 +16,7 @@
++ Date Created: 13 November 1989
++ Date Last Updated: September 1993
++ Basic Operations:
-++ Related Domains: IndexedMatrix(R,minRow,minCol), Matrix(R),
-++ RectangularMatrix(n,m,R), SquareMatrix(n,R)
+++ Related Domains: Matrix(R), RectangularMatrix(n,m,R), SquareMatrix(n,R)
++ Also See:
++ AMS Classifications:
++ Keywords: matrix, canonical forms, linear algebra
@@ -243,8 +242,7 @@ InnerMatrixLinearAlgebraFunctions(R,Row,Col,M):_
++ Date Created: 21 November 1989
++ Date Last Updated: 21 March 1994
++ Basic Operations:
-++ Related Domains: IndexedMatrix(R,minRow,minCol), Matrix(R),
-++ RectangularMatrix(n,m,R), SquareMatrix(n,R)
+++ Related Domains: Matrix(R), RectangularMatrix(n,m,R), SquareMatrix(n,R)
++ Also See:
++ AMS Classifications:
++ Keywords:
@@ -310,8 +308,7 @@ MatrixCategoryFunctions2(R1,Row1,Col1,M1,R2,Row2,Col2,M2):_
++ Date Created: 21 November 1989
++ Date Last Updated: 12 June 1991
++ Basic Operations:
-++ Related Domains: IndexedMatrix(R,minRow,minCol), Matrix(R),
-++ RectangularMatrix(n,m,R), SquareMatrix(n,R)
+++ Related Domains: Matrix(R), RectangularMatrix(n,m,R), SquareMatrix(n,R)
++ Also See:
++ AMS Classifications:
++ Keywords:
@@ -370,7 +367,7 @@ RectangularMatrixCategoryFunctions2(m,n,R1,Row1,Col1,M1,R2,Row2,Col2,M2):_
++ Date Created: 22 November 1989
++ Date Last Updated: 22 November 1989
++ Basic Operations:
-++ Related Domains: IndexedMatrix(R,minRow,minCol), Matrix(R), RectangularMatrix(n,m,R), SquareMatrix(n,R)
+++ Related Domains: Matrix(R), RectangularMatrix(n,m,R), SquareMatrix(n,R)
++ Also See:
++ AMS Classifications:
++ Keywords: matrix, inverse, integral domain
@@ -430,8 +427,7 @@ InnerMatrixQuotientFieldFunctions(R,Row,Col,M,QF,Row2,Col2,M2):_
++ Date Created: 13 November 1989
++ Date Last Updated: December 1992
++ Basic Operations:
-++ Related Domains: IndexedMatrix(R,minRow,minCol), Matrix(R),
-++ RectangularMatrix(n,m,R), SquareMatrix(n,R)
+++ Related Domains: Matrix(R), RectangularMatrix(n,m,R), SquareMatrix(n,R)
++ Also See:
++ AMS Classifications:
++ Keywords: matrix, canonical forms, linear algebra
diff --git a/src/algebra/matrix.spad.pamphlet b/src/algebra/matrix.spad.pamphlet
index 04bbb1fe..8d9242e5 100644
--- a/src/algebra/matrix.spad.pamphlet
+++ b/src/algebra/matrix.spad.pamphlet
@@ -9,74 +9,7 @@
\eject
\tableofcontents
\eject
-\section{domain IMATRIX IndexedMatrix}
-<<domain IMATRIX IndexedMatrix>>=
-)abbrev domain IMATRIX IndexedMatrix
-++ Author: Grabmeier, Gschnitzer, Williamson
-++ Date Created: 1987
-++ Date Last Updated: July 1990
-++ Basic Operations:
-++ Related Domains: Matrix, RectangularMatrix, SquareMatrix,
-++ StorageEfficientMatrixOperations
-++ Also See:
-++ AMS Classifications:
-++ Keywords: matrix, linear algebra
-++ Examples:
-++ References:
-++ Description:
-++ An \spad{IndexedMatrix} is a matrix where the minimal row and column
-++ indices are parameters of the type. The domains Row and Col
-++ are both IndexedVectors.
-++ The index of the 'first' row may be obtained by calling the
-++ function \spadfun{minRowIndex}. The index of the 'first' column may
-++ be obtained by calling the function \spadfun{minColIndex}. The index of
-++ the first element of a 'Row' is the same as the index of the
-++ first column in a matrix and vice versa.
-IndexedMatrix(R,mnRow,mnCol): Exports == Implementation where
- R : Ring
- mnRow, mnCol : Integer
- Row ==> IndexedVector(R,mnCol)
- Col ==> IndexedVector(R,mnRow)
- MATLIN ==> MatrixLinearAlgebraFunctions(R,Row,Col,$)
-
- Exports ==> MatrixCategory(R,Row,Col)
-
- Implementation ==>
- InnerIndexedTwoDimensionalArray(R,mnRow,mnCol,Row,Col) add
-
- swapRows!(x,i1,i2) ==
- (i1 < minRowIndex(x)) or (i1 > maxRowIndex(x)) or _
- (i2 < minRowIndex(x)) or (i2 > maxRowIndex(x)) =>
- error "swapRows!: index out of range"
- i1 = i2 => x
- minRow := minRowIndex x
- xx := x pretend PrimitiveArray(PrimitiveArray(R))
- n1 := i1 - minRow; n2 := i2 - minRow
- row1 := qelt(xx,n1)
- qsetelt!(xx,n1,qelt(xx,n2))
- qsetelt!(xx,n2,row1)
- xx pretend $
-
- if R has commutative("*") then
-
- determinant x == determinant(x)$MATLIN
- minordet x == minordet(x)$MATLIN
-
- if R has EuclideanDomain then
-
- rowEchelon x == rowEchelon(x)$MATLIN
-
- if R has IntegralDomain then
-
- rank x == rank(x)$MATLIN
- nullity x == nullity(x)$MATLIN
- nullSpace x == nullSpace(x)$MATLIN
-
- if R has Field then
-
- inverse x == inverse(x)$MATLIN
-@
\section{domain MATRIX Matrix}
<<domain MATRIX Matrix>>=
)abbrev domain MATRIX Matrix
@@ -84,7 +17,7 @@ IndexedMatrix(R,mnRow,mnCol): Exports == Implementation where
++ Date Created: 1987
++ Date Last Updated: July 1990
++ Basic Operations:
-++ Related Domains: IndexedMatrix, RectangularMatrix, SquareMatrix
+++ Related Domains: RectangularMatrix, SquareMatrix
++ Also See:
++ AMS Classifications:
++ Keywords: matrix, linear algebra
@@ -259,7 +192,7 @@ Matrix(R): Exports == Implementation where
++ Date Created: 1987
++ Date Last Updated: July 1990
++ Basic Operations:
-++ Related Domains: IndexedMatrix, Matrix, SquareMatrix
+++ Related Domains: Matrix, SquareMatrix
++ Also See:
++ AMS Classifications:
++ Keywords: matrix, linear algebra
@@ -346,7 +279,7 @@ RectangularMatrix(m,n,R): Exports == Implementation where
++ Date Created: 1987
++ Date Last Updated: July 1990
++ Basic Operations:
-++ Related Domains: IndexedMatrix, Matrix, RectangularMatrix
+++ Related Domains: Matrix, RectangularMatrix
++ Also See:
++ AMS Classifications:
++ Keywords: matrix, linear algebra
@@ -520,7 +453,6 @@ SquareMatrix(ndim,R): Exports == Implementation where
<<*>>=
<<license>>
-<<domain IMATRIX IndexedMatrix>>
<<domain MATRIX Matrix>>
<<domain RMATRIX RectangularMatrix>>
<<domain SQMATRIX SquareMatrix>>