mjo: replace xrange() with range() for python-3.x compatibility.

[sage.d.git] / mjo / interpolation.py

diff --git a/mjo/interpolation.py b/mjo/interpolation.py
index d3b406a56d0b9c50fbb1ffd48b4ff454ee5b6a03..25fb11f75f7944e678ba37fb422d9e9b7d70881a 100644 (file)
--- a/mjo/interpolation.py
+++ b/mjo/interpolation.py
@@ -18,7 +18,7 @@ def lagrange_denominator(k, xs):
     The product of all xs[j] with j != k.
 
     """
-    return product( xs[k] - xs[j] for j in xrange(len(xs)) if j != k )
+    return product( xs[k] - xs[j] for j in range(len(xs)) if j != k )
 
 
 def lagrange_coefficient(k, x, xs):
@@ -96,8 +96,8 @@ def lagrange_polynomial(x, xs, ys):
         True
 
     """
-    ls = [ lagrange_coefficient(k, x, xs) for k in xrange(len(xs)) ]
-    return sum( ys[k] * ls[k] for k in xrange(len(xs)) )
+    ls = [ lagrange_coefficient(k, x, xs) for k in range(len(xs)) ]
+    return sum( ys[k] * ls[k] for k in range(len(xs)) )
 
 
 
@@ -160,7 +160,7 @@ def divided_difference_coefficients(xs):
         [1/2/pi^2, -1/pi^2, 1/2/pi^2]
 
     """
-    return [ ~lagrange_denominator(k, xs) for k in xrange(len(xs)) ]
+    return [ ~lagrange_denominator(k, xs) for k in range(len(xs)) ]
 
 
 def divided_difference(xs, ys):
@@ -248,7 +248,7 @@ def newton_polynomial(x, xs, ys):
 
     """
     return sum( divided_difference(xs[:k+1], ys[:k+1])*lagrange_psi(x, xs[:k])
-                for k in xrange(len(xs)) )
+                for k in range(len(xs)) )
 
 
 def hermite_coefficient(k, x, xs):
@@ -337,10 +337,10 @@ def hermite_interpolant(x, xs, ys, y_primes):
 
     """
     s1 = sum( ys[k] * hermite_coefficient(k, x, xs)
-               for k in xrange(len(xs)) )
+               for k in range(len(xs)) )
 
     s2 = sum( y_primes[k] * hermite_deriv_coefficient(k, x, xs)
-               for k in xrange(len(xs)) )
+               for k in range(len(xs)) )
 
     return (s1 + s2)