aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/puiseux.spad.pamphlet
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-06-13 19:01:38 +0000
committerdos-reis <gdr@axiomatics.org>2010-06-13 19:01:38 +0000
commit10112561c30ba05194b4d3b8cae34b610487e740 (patch)
tree529be672e50d4af6f4840725023d48bf2488c73d /src/algebra/puiseux.spad.pamphlet
parent90a4fe6666a5db6d12e71e924c1486522a2ccdd1 (diff)
downloadopen-axiom-10112561c30ba05194b4d3b8cae34b610487e740.tar.gz
* algebra/laurent.spad.pamphlet
(UnivariateLaurentSeriesConstructor) [termsToOutputForm]: Tidy. * algebra/mts.spad.pamphlet (SparseMultivariateTaylorSeries) [coerce]: Likewise. * algebra/padic.spad.pamphlet (PAdicIntegerCategory) [coerce]: Likewise. * algebra/pscat.spad.pamphlet (UnivariateTaylorSeriesCategory)[coerce]: Likewise. * algebra/puiseux.spad.pamphlet (UnivariatePuiseuxSeries) [termsToOutputForm]: Likewise.
Diffstat (limited to 'src/algebra/puiseux.spad.pamphlet')
-rw-r--r--src/algebra/puiseux.spad.pamphlet10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/algebra/puiseux.spad.pamphlet b/src/algebra/puiseux.spad.pamphlet
index a38a3301..fc5321ec 100644
--- a/src/algebra/puiseux.spad.pamphlet
+++ b/src/algebra/puiseux.spad.pamphlet
@@ -535,17 +535,21 @@ UnivariatePuiseuxSeries(Coef,var,cen): Exports == Implementation where
termsToOutputForm(m,rat,uu,xxx) ==
l : L OUT := empty()
empty? uu => 0 :: OUT
- n : NNI; count : NNI := _$streamCount$Lisp
- for n in 0..count while not empty? uu repeat
+ count : NNI := _$streamCount$Lisp
+ n : NNI := 0
+ while n <= count and not empty? uu repeat
if frst(uu) ~= 0 then
l := concat(termOutput((n :: I) * rat + m,frst uu,xxx),l)
uu := rst uu
+ n := n + 1
if showAll?() then
- for n in (count + 1).. while explicitEntries? uu and _
+ n := count + 1
+ while explicitEntries? uu and _
not eq?(uu,rst uu) repeat
if frst(uu) ~= 0 then
l := concat(termOutput((n :: I) * rat + m,frst uu,xxx),l)
uu := rst uu
+ n := n + 1
l :=
explicitlyEmpty? uu => l
eq?(uu,rst uu) and frst uu = 0 => l