Changeset 8038:b49f4a637a6f

Timestamp:

01/09/08 15:27:02 (5 years ago)

Author:

Bobby Moretti <bobmoretti@…>

Branch:

default

Message:

Fixed plot.py so all doctests passed

File:

• sage/plot/plot.py (modified) (4 diffs)

sage/plot/plot.py

@@ -2320 +2320 @@
         1
         sage: len(P[0])  # how many points were computed
-        201
+        200i
         sage: P          # render
         
@@ -2430 +2430 @@
             G = Graphics()
             for i in range(0, len(funcs)):
-                G += plot(funcs[i], xmin=xmin, xmax=xmax, polar=polar, **kwds)
+                G += plot(funcs[i], (xmin, xmax), polar=polar, **kwds)
             return G
 
@@ -2437 +2437 @@
 
         exceptions = 0; msg=''
-        for i in range(plot_points+1):
+        for i in range(plot_points):
             xi = xmin + i*delta
             if i < plot_points:
@@ -3046 +3046 @@
     else:
         raise ValueError, "parametric value range must be a list of 2 or 3-tuple."
+
+    a = float(a)
+    b = float(b)
     if plot_points == 2:
         return var, [a, b]
     else:
-        rng = float_range(a,b, float(b-a)/(plot_points))
-        rng.append(float(b))
-        return var, rng
-
-def float_range(a, b, step):
-    """
-    Returns the
-    """
-    (a,b,step) = (float(a),float(b),float(step))
-    v = [a]
-    w = a + step
-    while w < b:
-        v.append(w)
-        w += step
-    if w <= b:
-        v.append(b)
-    return v
+        step = (b-a)/float(plot_points)
+        values = [a + step*i for i in xrange(plot_points)]
+        # want to make sure that we plot exactly as many points as requested
+#         rng.append(b)
+        return var, values
+
+# def float_range(a, b, step):
+#     """
+#     Returns a list of floating point numbers from a to b with the
+#     given step
+#     """
+#     (a,b,step) = (float(a),float(b),float(step))
+#     v = [a]
+#     w = a + step
+#     while w < b:
+#         v.append(w)
+#         w += step
+#     if w < b:
+#         v.append(b)
+#     return v