Changeset 5992:3fb0eb667e02

Timestamp:

08/28/07 23:59:26 (6 years ago)

Author:

Robert Bradshaw <robertwb@…>

Branch:

default

Message:

fix bug in Line command, IndexFaceSet?.edges()

Location:

sage/plot/plot3d

Files:

• index_face_set.pxd (modified) (1 diff)
• index_face_set.pyx (modified) (3 diffs)
• parametric_surface.pyx (modified) (3 diffs)
• point_c.pxi (modified) (1 diff)
• shapes.pyx (modified) (1 diff)

sage/plot/plot3d/index_face_set.pxd

@@ -14 +14 @@
     cdef face_c* _faces
 
+
 cdef class FaceIter:
     cdef Py_ssize_t i
     cdef IndexFaceSet set
-    
+
+cdef class EdgeIter:
+    cdef Py_ssize_t i, j
+    cdef object seen
+    cdef IndexFaceSet set
 
 cdef class VertexIter:

sage/plot/plot3d/index_face_set.pyx

@@ -37 +37 @@
 include "../../ext/python_list.pxi"
 include "../../ext/python_string.pxi"
+
+include "point_c.pxi"
 
 
@@ -239 +241 @@
         cdef Py_ssize_t i, j
         return [[points[self._faces[i].vertices[j]] for j from 0 <= j < self._faces[i].n] for i from 0 <= i < self.fcount]
-        
+    
+    def edges(self):
+        return EdgeIter(self)
+        
+    def edge_list(self):
+        # For consistancy
+        return list(self.edges())
+                
     def vertices(self):
         """
@@ -397 +406 @@
             self.i += 1
             return face
+
+cdef class EdgeIter:
+    def __init__(self, face_set):
+        self.set = face_set
+        if not self.set.enclosed:
+            raise TypeError, "Must be closed to use the simple iterator."
+        self.i = 0
+        self.j = 0
+        self.seen = {}
+    def __iter__(self):
+        return self
+    def __next__(self):
+        cdef point_c P, Q
+        cdef face_c face = self.set._faces[self.i]
+        while self.i < self.set.fcount:
+            if self.j == face.n:
+                self.i += 1
+                self.j = 0
+                if self.i < self.set.fcount:
+                    face = self.set._faces[self.i]
+            else:
+                if self.j == 0:
+                    P = self.set.vs[face.vertices[face.n-1]]
+                else:
+                    P = self.set.vs[face.vertices[self.j-1]]
+                Q = self.set.vs[face.vertices[self.j]]
+                self.j += 1
+                if self.set.enclosed: # Every edge appears exactly twice, once in each orientation.
+                    if point_c_cmp(P, Q) < 0:
+                        return ((P.x, P.y, P.z), (Q.x, Q.y, Q.z))
+                else:
+                    if point_c_cmp(P, Q) > 0:
+                        P,Q = Q,P
+                    edge = ((P.x, P.y, P.z), (Q.x, Q.y, Q.z))
+                    if not edge in self.seen:
+                        self.seen[edge] = edge
+                        return edge
+        raise StopIteration
+
         
 cdef class VertexIter:

sage/plot/plot3d/parametric_surface.pyx

@@ -59 +59 @@
 
 cdef inline bint smash_edge(point_c* vs, face_c* f, int a, int b):
-    if point_c_cmp(vs[f.vertices[a]], vs[f.vertices[b]]):
+    if point_c_eq(vs[f.vertices[a]], vs[f.vertices[b]]):
         f.vertices[b] = f.vertices[a]
         f.n = 3
@@ -185 +185 @@
             first = &self._faces[j]
             last  = &self._faces[(n-1)*m+j]
-            if point_c_cmp(self.vs[first.vertices[0]], self.vs[last.vertices[3]]):
+            if point_c_eq(self.vs[first.vertices[0]], self.vs[last.vertices[3]]):
                 last.vertices[3] = first.vertices[0]
             elif first.vertices[0] != first.vertices[1] or last.vertices[3] != last.vertices[2]:
                 enclosed = 0
-            if point_c_cmp(self.vs[first.vertices[1]], self.vs[last.vertices[2]]):
+            if point_c_eq(self.vs[first.vertices[1]], self.vs[last.vertices[2]]):
                 last.vertices[2] = first.vertices[1]
             elif first.vertices[0] != first.vertices[1] or last.vertices[3] != last.vertices[2]:
@@ -197 +197 @@
             first = &self._faces[i*m]
             last  = &self._faces[i*m + m-1]
-            if point_c_cmp(self.vs[first.vertices[0]], self.vs[last.vertices[1]]):
+            if point_c_eq(self.vs[first.vertices[0]], self.vs[last.vertices[1]]):
                 last.vertices[1] = first.vertices[0]
             elif first.vertices[0] != first.vertices[3] or last.vertices[1] != last.vertices[2]:
                 enclosed = 0
-            if point_c_cmp(self.vs[first.vertices[3]], self.vs[last.vertices[2]]):
+            if point_c_eq(self.vs[first.vertices[3]], self.vs[last.vertices[2]]):
                 last.vertices[2] = first.vertices[3]
             elif first.vertices[0] != first.vertices[3] or last.vertices[1] != last.vertices[2]:

sage/plot/plot3d/point_c.pxi

@@ -24 +24 @@
     res.x, res.y, res.z = P[0], P[1], P[2]
 
-cdef inline bint point_c_cmp(point_c P, point_c Q):
+cdef inline bint point_c_eq(point_c P, point_c Q):
     return P.x == Q.x and P.y == Q.y and P.z == Q.z
+    
+cdef inline int point_c_cmp(point_c P, point_c Q):
+    """
+    Lexographic order
+    """
+    if P.x == Q.x:
+        if P.y == Q.y:
+            if P.z == Q.z:
+                return 0
+            elif P.z < Q.z:
+                return -1
+            else:
+                return 1
+        elif P.y < Q.y:
+            return -1
+        else:
+            return 1
+    elif P.x < Q.x:
+        return -1
+    else:
+        return 1
+
     
 cdef inline void point_c_add(point_c* res, point_c P, point_c Q):

sage/plot/plot3d/shapes.pyx

@@ -191 +191 @@
     axis = zaxis.cross_product(diff)
     if axis == 0:
-        return cyl
+        return cyl.translate(start)
     else:
         theta = -acos(diff[2]/height)