Changeset 7864:25a5e79d10a7

Timestamp:

12/18/07 22:30:51 (5 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

3d plotting -- some work: (1) fast_float_function started; (2) improved documentation; (3) make line(...) 3d-aware.

Location:

sage

Files:

• calculus/calculus.py (modified) (7 diffs)
• plot/all.py (modified) (1 diff)
• plot/plot.py (modified) (4 diffs)
• plot/plot3d/all.py (modified) (1 diff)
• plot/plot3d/base.pyx (modified) (1 diff)
• plot/plot3d/plot3d.py (modified) (1 diff)
• plot/plot3d/shapes.pyx (modified) (3 diffs)
• plot/plot3d/shapes2.py (added)

sage/calculus/calculus.py

@@ -592 +592 @@
                     param = A[0]
                 f = lambda x: self(x)
+                #f = self.fast_float_function()
             else:
                 A = self.variables()
@@ -2767 +2768 @@
         return self.parent()(self._maxima_().partfrac(var))
 
-
-
+    ###################################################################
+    # Fast Evaluation
+    ###################################################################
+    def fast_float_function(self):
+        return self._fast_float_()
+
+    def _fast_float_(self):
+        return   lambda x: float(self(x))
+        
 
 class Symbolic_object(SymbolicExpression):
@@ -2910 +2918 @@
                 if isinstance(self._obj, int):
                     return True
+
+    def _fast_float_(self):
+        z = float(self)
+        return lambda x: z
 
     def _recursive_sub(self, kwds):
@@ -3730 +3742 @@
         return hash(self._name)
 
+    def _fast_float_(self):
+        return lambda x: x
+
     def _recursive_sub(self, kwds):
         # do the replacement if needed
@@ -4349 +4364 @@
         return float(f._approx_(float(g)))
 
+    def _fast_float_(self):
+        f = self._operands[0]._fast_float_()
+        g = self._operands[1]._fast_float_()
+        return lambda x: f(g(x))
+
     def __complex__(self):
         """
@@ -4739 +4759 @@
         return SymbolicComposition(self, SR(x))
 
+    def _fast_float_(self):
+        return math.sin
+
 sin = Function_sin()
 _syms['sin'] = sin
@@ -4761 +4784 @@
                 return math.cos(x)
         return SymbolicComposition(self, SR(x))
+
+    def _fast_float_(self):
+        return math.cos
 
    

sage/plot/all.py

@@ -9 +9 @@
 from animate import Animation as animate
 
-from plot3dmatplotlib import (Graphics3d, point3d, line3d, plot3d)
+# This needs to be deprecated.  It's crap and pointless. 
+#from plot3dmatplotlib import (Graphics3d, point3d, line3d, plot3d)
 
 from plot3dsoya_wrap import plot3dsoya

sage/plot/plot.py

@@ -1471 +1471 @@
         return to_float_list(xdata), to_float_list(ydata)
 
+    def _graphic3d(self, *args, **kwds):
+        """
+        Return 3d version of this graphics primitive.
+
+        We call this if the user tries to create a graphic but gives
+        points (etc) in 3-space instead of in the plane.
+        """
+        raise NotImplementedError, "3d plotting of this primitive not yet implemented"
+
 class GraphicPrimitiveFactory_arrow(GraphicPrimitiveFactory):
     def __call__(self, minpoint, maxpoint, **kwds):
@@ -1612 +1621 @@
         done = False
         if not isinstance(points, (list,tuple)) or \
-           (isinstance(points,(list,tuple)) and len(points) == 2):
+           (isinstance(points,(list,tuple)) and len(points) <= 3 and not
+            isinstance(points[0], (list,tuple))):
             try:
-                xdata = [float(points[0])]
-                ydata = [float(points[1])]
-                done = True
+                points = [[float(z) for z in points]]
             except TypeError:
                 pass
@@ -1625 +1633 @@
                 ydata = []
                 for z in points:
+                    if len(z) == 3:
+                        return self._graphic3d()(points, coerce=coerce, **kwds)
                     xdata.append(float(z[0]))
                     ydata.append(float(z[1]))
             else:
-                xdata = [z[0] for z in points]
-                ydata = [z[1] for z in points]
+                for z in points:
+                    if len(z) == 3:
+                        return self._graphic3d()(points, coerce=coerce, **kwds)
+                    xdata.append(z[0])
+                    ydata.append(z[1])
 
         return self._from_xdata_ydata(xdata, ydata, True, options=options)
@@ -1947 +1960 @@
             pass
         return g
+
+    def _graphic3d(self):
+        from sage.plot.plot3d.shapes2 import line3d
+        return line3d
 
 # unique line instance

sage/plot/plot3d/all.py

@@ -1 @@
-from shapes import Box, ColorCube, Cone, Cylinder, Line, Arrow, Sphere, Torus, Text as Text3D
+from shapes import Box, ColorCube, Cone, Cylinder, Arrow, Sphere, Torus, Text as Text3D
 from parametric_surface import ParametricSurface, MobiusStrip
 from plot3d import plot3d, axes as axes3d

sage/plot/plot3d/base.pyx

@@ -216 +216 @@
         """
         INPUT:
+            viewer -- string (default: 'jmol') which viewing system to use.
+                      'jmol': an embedded non-OpenGL 3d java applet
+                      'tachyon': an embedded ray tracer 
+                      'java3d': a popup OpenGL 3d java applet
+            filename -- string (default: 'shape'); file to save the image to
+            verbosity -- display information about rendering the figure
             figsize -- (default: 4); x or pair [x,y] for numbers, e.g., [4,4]; controls
-                       the size of the output figure
-            
+                       the size of the output figure.  E.g., with jmol the number of
+                       pixels in each direction is 100 times figsize[0].
+            **kwds -- other options, which make sense for particular rendering engines           
         """
         if not isinstance(figsize, (list,tuple)):

sage/plot/plot3d/plot3d.py

@@ -68 +68 @@
     """
     # Check if f has a fast float evaluation
-    try:
-        f = f.fast_float_function()
-    except AttributeError:
-        # Nope -- no prob.
-        pass
+    #try:
+    #    f = f.fast_float_function()
+    #except AttributeError:
+    #    # Nope -- no prob.
+    #    pass
     
     if texture is None:

sage/plot/plot3d/shapes.pyx

@@ -180 +180 @@
             
 
-def Line(start, end, radius, **kwds):
+def LineSegment(start, end, thickness=1, radius=None, **kwds):
     """
-    Create a cylindar from start to end with radius radius.
+    Create a line segment, which is drawn as a cylinder from start to
+    end with radius radius.
     
     EXAMPLES: 
-        sage: from sage.plot.plot3d.shapes import Line, Sphere
+        sage: from sage.plot.plot3d.shapes import LineSegment, Sphere
         sage: P = (0,0,0.1)
         sage: Q = (0.5,0.6,0.7)
         sage: S = Sphere(.2, color='red').translate(P) + \
                   Sphere(.2, color='blue').translate(Q) + \
-                  Line(P, Q, .05, color='black')
+                  LineSegment(P, Q, .05, color='black')
         sage: S.show()
         sage: S = Sphere(.1, color='red').translate(P) + \
                   Sphere(.1, color='blue').translate(Q) + \
-                  Line(P, Q, .15, color='black')
+                  LineSegment(P, Q, .15, color='black')
         sage: S.show()
         
@@ -200 +201 @@
         -- Robert Bradshaw
     """
+    if radius is None:
+        radius = thickness/50.0
     start = vector(RDF, start, sparse=False)
     end = vector(RDF, end, sparse=False)
@@ -212 +215 @@
         theta = -acos(diff[2]/height)
         return cyl.rotate(axis, theta).translate(start)
-        
+
 def Arrow(start, end, radius, head_radius=None, head_len=None, **kwds):
     if head_radius == None: