diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 6 | ||||
| -rw-r--r-- | src/algebra/Makefile.pamphlet | 6 | ||||
| -rw-r--r-- | src/algebra/array1.spad.pamphlet | 4 | ||||
| -rw-r--r-- | src/algebra/newpoint.spad.pamphlet | 5 |
5 files changed, 14 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f9347929..17c18134 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2009-04-26 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * algebra/newpoint.spad.pamphlet (point$Point): Call vector$Vector. + * algebra/array1.spad.pamphlet (fill!$PrimitiveArray): Use builtin + operation. + 2009-04-25 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/strap/PRIMARR.lsp: Remove. diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index ab0c6056..29b333fe 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -393,7 +393,7 @@ $(OUT)/PATAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/BOOLEAN.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) $(OUT)/ES.$(FASLEXT): $(OUT)/PRIMARR.$(FASLEXT) $(OUT)/VECTCAT.$(FASLEXT): $(OUT)/RADCAT.$(FASLEXT) - +$(OUT)/IARRAY1.$(FASLEXT): $(OUT)/PRIMARR.$(FASLEXT) axiom_algebra_layer_1 = \ ABELGRP ABELGRP- ABELMON ABELMON- FORTCAT ITUPLE \ @@ -404,7 +404,7 @@ axiom_algebra_layer_1 = \ IDENT SEGCAT BINDING ALIST BOOLEAN PRIMARR \ ORDRING ORDRING- FEVALAB FEVALAB- \ OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD \ - FIELD FIELD- VECTCAT VECTCAT- + FIELD FIELD- VECTCAT VECTCAT- IARRAY1 axiom_algebra_layer_1_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_1)) @@ -566,7 +566,7 @@ axiom_algebra_layer_11 = \ APPLYORE ARRAY1 ARRAY12 ARRAY2 \ ASTACK COMBINAT \ CSTTOOLS D01FCFA E04MBFA FARRAY \ - FLALG GALUTIL HEAP IARRAY1 \ + FLALG GALUTIL HEAP \ IARRAY2 IFARRAY INTCAT INTHEORY \ IRREDFFX LFCAT LODOCAT LODOCAT- \ LWORD MATCAT MATCAT- MATSTOR \ diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 61d0c004..f677bcaa 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -352,7 +352,7 @@ $(OUT)/PATAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/BOOLEAN.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) $(OUT)/ES.$(FASLEXT): $(OUT)/PRIMARR.$(FASLEXT) $(OUT)/VECTCAT.$(FASLEXT): $(OUT)/RADCAT.$(FASLEXT) - +$(OUT)/IARRAY1.$(FASLEXT): $(OUT)/PRIMARR.$(FASLEXT) axiom_algebra_layer_1 = \ ABELGRP ABELGRP- ABELMON ABELMON- FORTCAT ITUPLE \ @@ -363,7 +363,7 @@ axiom_algebra_layer_1 = \ IDENT SEGCAT BINDING ALIST BOOLEAN PRIMARR \ ORDRING ORDRING- FEVALAB FEVALAB- \ OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD \ - FIELD FIELD- VECTCAT VECTCAT- + FIELD FIELD- VECTCAT VECTCAT- IARRAY1 axiom_algebra_layer_1_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_1)) @@ -578,7 +578,7 @@ axiom_algebra_layer_11 = \ APPLYORE ARRAY1 ARRAY12 ARRAY2 \ ASTACK COMBINAT \ CSTTOOLS D01FCFA E04MBFA FARRAY \ - FLALG GALUTIL HEAP IARRAY1 \ + FLALG GALUTIL HEAP \ IARRAY2 IFARRAY INTCAT INTHEORY \ IRREDFFX LFCAT LODOCAT LODOCAT- \ LWORD MATCAT MATCAT- MATSTOR \ diff --git a/src/algebra/array1.spad.pamphlet b/src/algebra/array1.spad.pamphlet index 03916478..7fe6df24 100644 --- a/src/algebra/array1.spad.pamphlet +++ b/src/algebra/array1.spad.pamphlet @@ -40,9 +40,7 @@ PrimitiveArray(S:Type): OneDimensionalArrayAggregate S == add setSimpleArrayEntry(x,i,s)$Lisp fill!(x, s) == - for i in 0..maxIndexOfSimpleArray(x)$Lisp repeat - setSimpleArrayEntry(x, i, s)$Lisp - x + FILL(x,s)$Foreign(Builtin) @ diff --git a/src/algebra/newpoint.spad.pamphlet b/src/algebra/newpoint.spad.pamphlet index b6479605..9c739e1d 100644 --- a/src/algebra/newpoint.spad.pamphlet +++ b/src/algebra/newpoint.spad.pamphlet @@ -56,10 +56,7 @@ Point(R:Ring) : Exports == Implementation where PI ==> PositiveInteger point(l:List R):% == - pt := new(#l,R) - for x in l for i in minIndex(pt).. repeat - pt.i := x - pt + per vector l dimension p == (# p)::PI -- Vector returns NonNegativeInteger...? convert(l:List R):% == point(l) cross(p0, p1) == |