Changeset 970

Timestamp:

Feb 28, 2005, 4:53:26 PM (20 years ago)

Author:

duncan

Message:

update

Location:

inundation/ga/storm_surge/alpha_shape

Files:

• alpha_shape.py (modified) (6 diffs)
• test_alpha_shape.py (modified) (1 diff)

inundation/ga/storm_surge/alpha_shape/alpha_shape.py

@@ -454 +454 @@
         Given the edges in bdry, find the largest exterior components.
         """
+
+        print "running _remove_holes \n"
+        
         def findroot(i):
             if vptr[i] < 0:
@@ -497 +500 @@
                     else:
                         if vptr[rvl] > vptr[rvr]:
+                            vptr[rvr] += vptr[rvl]
                             vptr[rvl] = rvr
-                            vptr[rvr] += vptr[rvl]
                         else:
+                            vptr[rvl] += vptr[rvr]
                             vptr[rvr] = rvl
-                            vptr[rvl] += vptr[rvr]
                 #print "vptr: ", vptr, "\n"
 
@@ -513 +516 @@
         littleind = [k for k in range(len(vptr)) if (vptr[k]<0 and vptr[k]>-cutoff)] 
         if littleind:
-            littlecomp = [k for k in range(len(vptr)) if findroot(k) in littlecomp]
+            littlecomp = [k for k in range(len(vptr)) if findroot(k) in littleind]
             vdiscard = [verts[k] for k in littlecomp] 
             newbdry = [e for e in bdry if not((e[0] in vdiscard) or (e[1] in vdiscard))]
@@ -527 +530 @@
         Given edges in bdry, test for acute-angle indents and remove them.
         """
+
+        print "running _smooth_indents \n"
+        
         # first find triangles not in alpha-shape
         def tri_rad_gta(k):
@@ -575 +581 @@
                     bdry.append(edga)       
         
-        newbdry = bdry
-        return newbdry
+        return bdry
 
     def _expand_pinch(self,bdry):
         """
-        Given edges in bdry, test for vertices with more than 4 incident edges.
+        Given edges in bdry, test for vertices with more than 2 incident edges.
         Expand by adding back in associated triangles... 
         """
+        print "running _expand_pinch \n"
 
         #verts = self._vertices_from_edges(bdry)
@@ -600 +606 @@
 
         # find exterior triangles that have a vertex in probv
-
-        bdrytri = []
+        probtri = []
         for ind in extrind:
-            bvct = 0
             for j in [0,1,2]:
-                if self.deltri[ind][j] in probv:
-                    bvct +=1
-            if bvct>0:
-                bdrytri.append(ind)
-
-        #print "boundary triangles ", bdrytri
-
-
-                
-        newbdry = bdry
-        return newbdry
+                if (self.deltri[ind][j] in probv):
+                    tr = (ind,j)
+                    if probtri.count(tr)==0:
+                        probtri.append(tr)
+
+        # print "problem boundary triangle indices ", probtri
+
+        # "add in" the problem triangles
+        for t in probtri:
+            tri = self.deltri[t[0]] 
+            opeda = ( tri[(t[1]+1)%3], tri[(t[1]+2)%3] )
+            opedb = ( tri[(t[1]+2)%3], tri[(t[1]+1)%3] )
+            # oped is the edge opposite the problem vertex
+            # if oped is in bdry  remove it and the other triangle edges
+            # otherwise add oped to the bdry and remove the other triangle edges
+
+            if opeda in bdry:
+                bdry.remove(opeda)
+            elif opedb in bdry:
+                bdry.remove(opedb)
+            else:
+                bdry.append(opeda)
+
+            if (tri[t[1]], tri[(t[1]+1)%3]) in bdry:
+                bdry.remove((tri[t[1]], tri[(t[1]+1)%3]))
+            if (tri[(t[1]+1)%3], tri[t[1]]) in bdry:
+                bdry.remove((tri[(t[1]+1)%3], tri[t[1]]))
+            if (tri[t[1]], tri[(t[1]+2)%3]) in bdry:
+                bdry.remove((tri[t[1]], tri[(t[1]+2)%3]))
+            if (tri[(t[1]+2)%3], tri[t[1]]) in bdry:
+                bdry.remove((tri[(t[1]+2)%3], tri[t[1]]))
+              
+        return bdry
    
 #-------------------------------------------------------------

inundation/ga/storm_surge/alpha_shape/test_alpha_shape.py

@@ -128 +128 @@
         result = alpha.get_boundary()
         #print "result",result
-        result [(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6), (6, 0)]
+        answer = [(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6), (6, 0)]
         assert allclose(answer, result) 
         pass