Ticket #3952: trac_3952.patch

a/sage/calculus/calculus.py

@@ -3888 +3888 @@
-
-    def _fast_float_(self, *vars):
-        """
+        Returns an object which provides fast floating point evaluation of 
+        self.
+
+        See sage.ext.fast_eval? for more information.
+
-        EXAMPLES: 
-            sage: x,y,z = var('x,y,z')
-            sage: f = 1 + sin(x)/x + sqrt(z^2+y^2)/cosh(x)
@@ -4060 +4065 @@
-                    return True
-
-    def _fast_float_(self, *vars):
+        """
+        Returns an object which provides fast floating point evaluation of 
+        self.
+
+        See sage.ext.fast_eval? for more information.
+
+        EXAMPLES:
+            sage: f = SR(2)._fast_float_()
+            sage: f(3)
+            2.0
+        """
-        return fast_float.fast_float_constant(float(self))
-
-    def _recursive_sub(self, kwds):
@@ -4673 +4689 @@
-
-    def _fast_float_(self, *vars):
-        """
+        Returns an object which provides fast floating point evaluation of 
+        self.
+
+        See sage.ext.fast_eval? for more information.
+
-        EXAMPLES: 
-            sage: x,y = var('x,y')
-            sage: f = x*x-y
-            sage: ff = f._fast_float_('x','y')
-            sage: ff(2,3)
-            1.0
-
+
+
+
+
+
+
+
+
+
+
-        fops = [op._fast_float_(*vars) for op in self._operands]
-        return self._operator(*fops)
-
@@ -5191 +5221 @@
-            2.0
-            sage: sqrt(2)._fast_float_()(2)
-            1.4142135623730951
-
+
+
+
+
+
+
+
+
+
-        if self._name in vars:
-            return fast_float.fast_float_arg(list(vars).index(self._name))
-        svars = [repr(x) for x in vars]
-        if self._name in svars:
-            return fast_float.fast_float_arg(list(svars).index(self._name))
+
-        try:
-            return fast_float.fast_float_constant(float(self))
-        except TypeError:
@@ -5591 +5630 @@
-        return self._expr._maxima_init_()
-        
-    def _fast_float_(self, *vars):
+        """
+        EXAMPLES:
+            sage: a = var('a')
+            sage: g(x) = sin(x) + 2
+            sage: f = g._fast_float_()
+            sage: f(0)
+            2.0
+        """
+        if vars == ():
+            vars = self.arguments()
-        return self._expr._fast_float_(*vars)
-
-    def __float__(self):
@@ -6038 +6087 @@
-        return float(f._approx_(float(g)))
-
-    def _fast_float_(self, *vars):
+        """
+        Returns an object which provides fast floating point evaluation of 
+        self.
+
+        See sage.ext.fast_eval? for more information.
+
+        EXAMPLES:
+            sage: f = sqrt(x)._fast_float_('x')
+            sage: f(2)
+            1.41421356237309...
+            sage: y = var('y')
+            sage: f = sqrt(x+y)._fast_float_('x', 'y')
+            sage: f(1,1)
+            1.41421356237309...
+
+            sage: f = sqrt(x+2*y)._fast_float_()
+            sage: f(2,0)
+            1.41421356237309...
+            sage: f(0,1)
+            1.41421356237309...
+  
+        """
+        if vars == ():
+            vars = self.arguments()
+
-        f = self._operands[0]
-        g = self._operands[1]._fast_float_(*vars)
-        try:
@@ -6568 +6642 @@
-                return math.sin(x)
-        return SymbolicComposition(self, SR(x))
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return math.sin
-
-sin = Function_sin()
@@ -6594 +6682 @@
-                return math.cos(x)
-        return SymbolicComposition(self, SR(x))
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return math.cos
-
-   

a/sage/plot/animate.py

@@ -61 +61 @@
-
-    TESTS:
-    This illustrates ticket \#2066 is fixed (setting axes ranges when an endpoint is 0):
-plot(sin, -1,1)
+[plot(sin, -1,1)]
-        0    
-    """
-    def __init__(self, v, 

a/sage/plot/plot.py

@@ -116 +116 @@
-    sage: g.show(dpi=200, axes=False)
-
-Another graph:
-
-
-
+
+
+
+
-    ...
-    sage: P.show(ymin=-pi,ymax=pi)
-
@@ -148 +149 @@
-    sage: g1 + g2    # show their sum
-
-An illustration of integration:
-lambda x: 
+
-    sage: P = line([(2,0),(2,f(2))], rgbcolor=(0,0,0))
-    sage: P += line([(8,0),(8,f(8))], rgbcolor=(0,0,0))
-    sage: P += polygon([(2,0),(2,f(2))] + [(x, f(x)) for x in [2,2.1,..,8]] + [(8,0),(2,0)],  rgbcolor=(0.8,0.8,0.8))
@@ -1299 +1300 @@
-            ...     gridlinesstyle=dict(color="blue", linestyle=":"))
-
-        Change the style of the horizontal or vertical grid lines separately.
-lambda x:
+
-            sage: p.show(gridlines=True, \
-            ...     hgridlinesstyle=dict(color="orange", linewidth=1.0), \
-            ...     vgridlinesstyle=dict(color="blue", linestyle=":"))
@@ -1322 +1323 @@
-            ...    gridlinesstyle=dict(marker='x',rgbcolor="black"))
-
-        Grid lines can be added to contour plots.
-lambda x,y: 
+
-            sage: c = contour_plot(f, (-4, 4), (-4, 4), plot_points=100)
-            sage: c.show(gridlines=True, gridlinesstyle={'linestyle':':','linewidth':1, 'rgbcolor':'red'})
-
@@ -2848 +2849 @@
-    EXAMPLES:
-
-    Here we plot a simple function of two variables:
-f = lambda x,y: cos(x^2 + y^2
-f
+x,y = var('x,y'
+cos(x^2+y^2)
-         
-        
-    Here we change the ranges and add some options:
-
-
+
-        
-
-    An even more complicated plot.
-
-
+
-
-    Some elliptic curves, but with symbolic endpoints.  In the first
-    example, the plot is rotated 90 degrees because we switch the
-    variables x,y. 
-        sage: x, y = var('x,y')
-        sage: contour_plot(y^2 + 1 - x^3 - x, (y,-pi,pi), (x,-pi,pi))
-        sage: contour_plot(lambda x,y: y^2 + 1 - x^3 - x, (y,-pi,pi), (x,-pi,pi))
-        sage: contour_plot(y^2 + 1 - x^3 - x, (-pi,pi), (-pi,pi))
-
-
-    We can play with the contour levels.
-lambda x,y: 
+
-        sage: contour_plot(f, (-2, 2), (-2, 2))
-        sage: contour_plot(f, (-2, 2), (-2, 2), contours=2)
-        sage: contour_plot(f, (-2, 2), (-2, 2), contours=(0.1, 1.0, 1.2, 1.4), cmap='hsv')
@@ -3157 +3154 @@
-
-
-    TESTS:
-lambda x,y: 
+
-        sage: p.xmin()
-        10.0
-        sage: p.ymin()
@@ -3435 +3432 @@
-    We plot with randomize=False, which makes the initial sample 
-    points evenly spaced (hence always the same).  Adaptive plotting 
-    might insert other points, however, unless plot_division=0. 
-lambda x: 
+
-        sage: list(p[0])
-        [(0.0, 1.0), (1.0, 1.0), (2.0, 1.0), (3.0, 1.0)]
-
@@ -3545 +3542 @@
-
-    options.update(kwds)
-
+    if not is_fast_float(funcs):
+        funcs =  fast_float(funcs)
+
-    #parametric_plot will be a list or tuple of two functions (f,g)
-    #and will plotted as (f(x), g(x)) for all x in the given range
-    if parametric:
-
-
-
-
-
-
-
-
+
-    #or we have only a single function to be plotted:
-    else:
-        f = funcs
@@ -3702 +3695 @@
-        tmax -- end value of t
-        other options -- passed to plot.
-
-
-a 2d parametric plot
+S
+some 2d parametric plots
-        sage: t = var('t')
-        sage: parametric_plot( (sin(t), sin(2*t)), 0, 2*pi, rgbcolor=hue(0.6) )
+        sage: parametric_plot((1, t), 0, 4)
+        sage: parametric_plot((t, t^2), -4, 4)
-
-    We draw a 3d parametric plot:
-        sage: parametric_plot3d( (5*cos(x), 5*sin(x), x), (-12, 12), plot_points=150, color="red")
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return plot(funcs, tmin, tmax, parametric=True, **kwargs)            
-
-def polar_plot(funcs, xmin, xmax, **kwargs):
@@ -3719 +3743 @@
-
-    EXAMPLES:
-    Here is a blue 8-leaved petal:
-lambda x:
+
-
-    A red figure-8:
-lambda x:
+
-
-    A green limacon of Pascal:
-lambda x:
+
-        
-    """
-    return plot(funcs, xmin, xmax, polar=True, **kwargs)

a/sage/structure/sage_object.pyx

@@ -91 +91 @@
-        if hasattr(self, '_repr_'):
-            return self._repr_()
-        return str(type(self))
-
-    def plot(self, *args, **kwds):
-        import sage.plot.plot
-        if len(args) == 0 and len(kwds) == 0:
-            return sage.plot.plot.text(repr(self), (0,0))
-        else:
-            try:
-                return sage.plot.plot.text(repr(self), *args, **kwds)
-            except TypeError:
-                return sage.plot.plot.text(repr(self), (0,0))                
-
-    def __hash__(self):
-        return hash(self.__repr__())