diff options
Diffstat (limited to 'src/algebra')
-rw-r--r-- | src/algebra/Makefile.am | 16 | ||||
-rw-r--r-- | src/algebra/Makefile.in | 16 | ||||
-rw-r--r-- | src/algebra/exposed.lsp.pamphlet | 1 | ||||
-rw-r--r-- | src/algebra/vector.spad.pamphlet | 33 |
4 files changed, 18 insertions, 48 deletions
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index 979b4314..2505b85a 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -744,10 +744,8 @@ strap-1/LIST.$(FASLEXT): strap-1/KOERCE.$(FASLEXT) \ strap-1/SETCAT.$(FASLEXT) strap-1/KONVERT.$(FASLEXT) \ strap-1/LSAGG.$(FASLEXT) -strap-1/VECTOR.$(FASLEXT): strap-1/IVECTOR.$(FASLEXT) - -strap-1/IVECTOR.$(FASLEXT): strap-1/VECTCAT.$(FASLEXT) \ - strap-1/IARRAY1.$(FASLEXT) strap-0/MATRIX.$(FASLEXT) +strap-1/VECTOR.$(FASLEXT): strap-1/VECTCAT.$(FASLEXT) \ + strap-1/ARRAY1.$(FASLEXT) strap-1/IARRAY1.$(FASLEXT): strap-1/A1AGG.$(FASLEXT) \ strap-0/PRIMARR.$(FASLEXT) @@ -1060,10 +1058,8 @@ strap-2/IDPAG.$(FASLEXT): strap-2/ABELGRP.$(FASLEXT) \ strap-2/IDPAM.$(FASLEXT): strap-2/ABELMON.$(FASLEXT) \ strap-2/IDPC.$(FASLEXT) strap-2/IDPO.$(FASLEXT) -strap-2/VECTOR.$(FASLEXT): strap-2/IVECTOR.$(FASLEXT) - -strap-2/IVECTOR.$(FASLEXT): strap-2/VECTCAT.$(FASLEXT) \ - strap-2/IARRAY1.$(FASLEXT) +strap-2/VECTOR.$(FASLEXT): strap-2/VECTCAT.$(FASLEXT) \ + strap-2/ARRAY1.$(FASLEXT) strap-2/IARRAY1.$(FASLEXT): strap-2/A1AGG.$(FASLEXT) \ strap-2/PRIMARR.$(FASLEXT) @@ -1742,7 +1738,7 @@ $(OUT)/SQMATRIX.$(FASLEXT): $(OUT)/SMATCAT.$(FASLEXT) \ $(OUT)/SMATCAT.$(FASLEXT): $(OUT)/RMATCAT.$(FASLEXT) $(OUT)/RMATCAT.$(FASLEXT): $(OUT)/DIRPROD.$(FASLEXT) $(OUT)/DIRPROD.$(FASLEXT): $(OUT)/DIRPCAT.$(FASLEXT) -$(OUT)/DIRPCAT.$(FASLEXT): $(OUT)/VSPACE.$(FASLEXT) $(OUT)/IVECTOR.$(FASLEXT) +$(OUT)/DIRPCAT.$(FASLEXT): $(OUT)/VSPACE.$(FASLEXT) $(OUT)/MATRIX.$(FASLEXT): $(OUT)/MATCAT.$(FASLEXT) $(OUT)/BTAGG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/PATLRES.$(FASLEXT): $(OUT)/PATRES.$(FASLEXT) @@ -1776,7 +1772,7 @@ oa_algebra_layer_10 = \ VSPACE- XPOLYC XPR BTAGG BTAGG- \ FUNDESC XPBWPOLY SMATCAT SMATCAT- \ RMATRIX RMATCAT RMATCAT- DIRPROD \ - DIRPCAT DIRPCAT- IVECTOR MATRIX \ + DIRPCAT DIRPCAT- MATRIX \ MATCAT MATCAT- IARRAY2 FFIELDC FFIELDC- diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 3594cecf..efab0a51 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -916,7 +916,7 @@ oa_algebra_layer_10 = \ VSPACE- XPOLYC XPR BTAGG BTAGG- \ FUNDESC XPBWPOLY SMATCAT SMATCAT- \ RMATRIX RMATCAT RMATCAT- DIRPROD \ - DIRPCAT DIRPCAT- IVECTOR MATRIX \ + DIRPCAT DIRPCAT- MATRIX \ MATCAT MATCAT- IARRAY2 FFIELDC FFIELDC- oa_algebra_layer_10_nrlibs = \ @@ -2234,10 +2234,8 @@ strap-1/LIST.$(FASLEXT): strap-1/KOERCE.$(FASLEXT) \ strap-1/SETCAT.$(FASLEXT) strap-1/KONVERT.$(FASLEXT) \ strap-1/LSAGG.$(FASLEXT) -strap-1/VECTOR.$(FASLEXT): strap-1/IVECTOR.$(FASLEXT) - -strap-1/IVECTOR.$(FASLEXT): strap-1/VECTCAT.$(FASLEXT) \ - strap-1/IARRAY1.$(FASLEXT) strap-0/MATRIX.$(FASLEXT) +strap-1/VECTOR.$(FASLEXT): strap-1/VECTCAT.$(FASLEXT) \ + strap-1/ARRAY1.$(FASLEXT) strap-1/IARRAY1.$(FASLEXT): strap-1/A1AGG.$(FASLEXT) \ strap-0/PRIMARR.$(FASLEXT) @@ -2547,10 +2545,8 @@ strap-2/IDPAG.$(FASLEXT): strap-2/ABELGRP.$(FASLEXT) \ strap-2/IDPAM.$(FASLEXT): strap-2/ABELMON.$(FASLEXT) \ strap-2/IDPC.$(FASLEXT) strap-2/IDPO.$(FASLEXT) -strap-2/VECTOR.$(FASLEXT): strap-2/IVECTOR.$(FASLEXT) - -strap-2/IVECTOR.$(FASLEXT): strap-2/VECTCAT.$(FASLEXT) \ - strap-2/IARRAY1.$(FASLEXT) +strap-2/VECTOR.$(FASLEXT): strap-2/VECTCAT.$(FASLEXT) \ + strap-2/ARRAY1.$(FASLEXT) strap-2/IARRAY1.$(FASLEXT): strap-2/A1AGG.$(FASLEXT) \ strap-2/PRIMARR.$(FASLEXT) @@ -2908,7 +2904,7 @@ $(OUT)/SQMATRIX.$(FASLEXT): $(OUT)/SMATCAT.$(FASLEXT) \ $(OUT)/SMATCAT.$(FASLEXT): $(OUT)/RMATCAT.$(FASLEXT) $(OUT)/RMATCAT.$(FASLEXT): $(OUT)/DIRPROD.$(FASLEXT) $(OUT)/DIRPROD.$(FASLEXT): $(OUT)/DIRPCAT.$(FASLEXT) -$(OUT)/DIRPCAT.$(FASLEXT): $(OUT)/VSPACE.$(FASLEXT) $(OUT)/IVECTOR.$(FASLEXT) +$(OUT)/DIRPCAT.$(FASLEXT): $(OUT)/VSPACE.$(FASLEXT) $(OUT)/MATRIX.$(FASLEXT): $(OUT)/MATCAT.$(FASLEXT) $(OUT)/BTAGG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/PATLRES.$(FASLEXT): $(OUT)/PATRES.$(FASLEXT) diff --git a/src/algebra/exposed.lsp.pamphlet b/src/algebra/exposed.lsp.pamphlet index e124fd63..45b55a9f 100644 --- a/src/algebra/exposed.lsp.pamphlet +++ b/src/algebra/exposed.lsp.pamphlet @@ -823,7 +823,6 @@ (|IndexedExponents| . INDE) (|IndexedFlexibleArray| . IFARRAY) (|IndexedOneDimensionalArray| . IARRAY1) - (|IndexedVector| . IVECTOR) (|InnerAlgFactor| . IALGFACT) (|InnerAlgebraicNumber| . IAN) (|InnerCommonDenominator| . ICDEN) diff --git a/src/algebra/vector.spad.pamphlet b/src/algebra/vector.spad.pamphlet index caca4c30..4bd83302 100644 --- a/src/algebra/vector.spad.pamphlet +++ b/src/algebra/vector.spad.pamphlet @@ -16,7 +16,7 @@ ++ Date Created: ++ Date Last Updated: ++ Basic Functions: -++ Related Constructors: DirectProductCategory, Vector, IndexedVector +++ Related Constructors: DirectProductCategory, Vector ++ Also See: ++ AMS Classifications: ++ Keywords: @@ -103,26 +103,7 @@ VectorCategory(R:Type): Category == OneDimensionalArrayAggregate R with sqrt(dot(p,p)) @ -\section{domain IVECTOR IndexedVector} -<<domain IVECTOR IndexedVector>>= -)abbrev domain IVECTOR IndexedVector -++ Author: -++ Date Created: -++ Date Last Updated: -++ Basic Functions: -++ Related Constructors: Vector, DirectProduct -++ Also See: -++ AMS Classifications: -++ Keywords: -++ References: -++ Description: -++ This type represents vector like objects with varying lengths -++ and a user-specified initial index. - -IndexedVector(R:Type, mn:Integer): - VectorCategory R == IndexedOneDimensionalArray(R, mn) - -@ + \section{domain VECTOR Vector} <<domain VECTOR Vector>>= )abbrev domain VECTOR Vector @@ -130,7 +111,7 @@ IndexedVector(R:Type, mn:Integer): ++ Date Created: ++ Date Last Updated: ++ Basic Functions: -++ Related Constructors: IndexedVector, DirectProduct +++ Related Constructors: DirectProduct ++ Also See: ++ AMS Classifications: ++ Keywords: @@ -140,11 +121,10 @@ IndexedVector(R:Type, mn:Integer): ++ and indexed by a finite segment of integers starting at 1. Vector(R:Type): Exports == Implementation where - Exports ==> VectorCategory R with + Exports == VectorCategory R with vector: List R -> % ++ vector(l) converts the list l to a vector. - Implementation ==> - IndexedVector(R, 1) add + Implementation == OneDimensionalArray R add vector l == construct l -- We want maxIndex to be inlined. Ideally, the definition should -- read @@ -306,7 +286,7 @@ DirectProductCategory(dim:NonNegativeInteger, R:Type): Category == ++ Date Created: ++ Date Last Updated: ++ Basic Functions: -++ Related Constructors: Vector, IndexedVector +++ Related Constructors: Vector ++ Also See: OrderedDirectProduct ++ AMS Classifications: ++ Keywords: @@ -619,7 +599,6 @@ LinearForm(K,B): Public == Private where <<license>> <<category VECTCAT VectorCategory>> -<<domain IVECTOR IndexedVector>> <<domain VECTOR Vector>> <<package VECTOR2 VectorFunctions2>> <<category DIRPCAT DirectProductCategory>> |