diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-13 16:37:27 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-13 16:37:27 +0000 |
| commit | 701073966d9aba091a99aa3cbef48fe3df226dfe (patch) | |
| tree | ed595066e9e5e307fa4b86c9eb3852145965ac3f /src/algebra/array1.spad.pamphlet | |
| parent | 9a4759f38f13d4bf79133846eb5fd2aff58b2235 (diff) | |
| download | open-axiom-701073966d9aba091a99aa3cbef48fe3df226dfe.tar.gz | |
* algebra/array1.spad.pamphlet (IndexedFlexibleArray) [merge!]: Tidy.
* algebra/intfact.spad.pamphlet (IntegerRoots) [perfectNthRoot]:
Likewise.
* algebra/numode.spad.pamphlet
(NumericalOrdinaryDifferentialEquations) [rf4a]: Likewise.
* algebra/solvelin.spad.pamphlet (LinearSystemMatrixPackage)
[aSolution]: Likewise.
Diffstat (limited to 'src/algebra/array1.spad.pamphlet')
| -rw-r--r-- | src/algebra/array1.spad.pamphlet | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/algebra/array1.spad.pamphlet b/src/algebra/array1.spad.pamphlet index d159b942..3f93b26f 100644 --- a/src/algebra/array1.spad.pamphlet +++ b/src/algebra/array1.spad.pamphlet @@ -305,11 +305,14 @@ IndexedFlexibleArray(S:Type, mn: Integer): Exports == Implementation where m := #a; n := #b; growAdding(a, n, b) for i in m-1..0 by -1 for j in m+n-1.. by -1 repeat a.f.j := a.f.i i := n; j := 0 - k : Integer - for k in 0.. while i < n+m and j < n repeat + k : Integer := 0 + while i < n+m and j < n repeat if g(a.f.i,b.f.j) then (a.f.k := a.f.i; i := i+1) else (a.f.k := b.f.j; j := j+1) - for k in k.. for j in j..n-1 repeat a.f.k := b.f.j + k := k + 1 + for j' in j..n-1 repeat + a.f.k := b.f.j' + k := k + 1 a select!(g:(S->Boolean), a:%) == |