Changeset 1227

Timestamp:

Apr 14, 2005, 3:48:25 PM (20 years ago)

Author:

duncan

Message:

from vanessa

File:

• inundation/ga/storm_surge/alpha_shape/alpha_shape.py (modified) (2 diffs)

inundation/ga/storm_surge/alpha_shape/alpha_shape.py

@@ -428 +428 @@
 
         #initialise vptr and eptr to negative number outside range 
-        EMPTY = -max(verts) - len(bdry)
+        EMPTY = -max(verts)-len(verts)
         vptr = [EMPTY for k in range(len(verts))]
-        eptr = [EMPTY for k in range(len(bdry))]
         #print "vptr init: ", vptr, "\n"
 
@@ -447 +446 @@
                         vptr[vl] = -2
                         vptr[vr] = vl
-                        #eprt[i] = vl
                     else:
                         vptr[vl] = rvr
-                        vptr[rvr] -= 1
+                        vptr[rvr] = vptr[rvr]-1
                 else:
                     if (vptr[vr]==EMPTY):
                         vptr[vr] = rvl
-                        vptr[rvl] -= 1
+                        vptr[rvl] = vptr[rvl]-1
                     else:
                         if vptr[rvl] > vptr[rvr]:
-                            vptr[rvr] += vptr[rvl]
+                            vptr[rvr] = vptr[rvr] + vptr[rvl]
                             vptr[rvl] = rvr
+                            vptr[vl] = rvr
                         else:
-                            vptr[rvl] += vptr[rvr]
+                            vptr[rvl] = vptr[rvl] + vptr[rvr]
                             vptr[rvr] = rvl
+                            vptr[vr] = rvl 
                 #print "vptr: ", vptr, "\n"
 
         # end edge loop
 
-        #print "vertex component tree: ", vptr, "\n"
-
+        # print "vertex component tree: ", [-v for v in vptr if v<0], "\n"
+        # print "largest component has: ", -min(vptr), " points. \n"
         # discard the edges in the little components
         # (i.e. those components with less than 'small' fraction of bdry points)
         cutoff = round(small*len(verts))
+        # print "cutoff component size is ", cutoff, "\n"
+        largest_component = -min(vptr)
+        if cutoff > largest_component:
+            cutoff = round((1-small)*largest_component)
+        
         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 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))]
+            newbdry = [e for e in bdry if not((e[0] in vdiscard) and (e[1] in vdiscard))]
             # remove boundary triangles that touch discarded components
             newbt = []