From 10112561c30ba05194b4d3b8cae34b610487e740 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 13 Jun 2010 19:01:38 +0000 Subject: * 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. --- src/algebra/puiseux.spad.pamphlet | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/algebra/puiseux.spad.pamphlet') 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 -- cgit v1.2.3