Changeset 710

Timestamp:

Dec 15, 2004, 9:37:45 AM (20 years ago)

Author:

duncan

Message:

vanessa working on edge intervals array based

File:

• inundation/ga/storm_surge/alpha_shape/alpha_shape.py (modified) (1 diff)

inundation/ga/storm_surge/alpha_shape/alpha_shape.py

@@ -231 +231 @@
         return
 
- 
+    def _edge_intervals_array_based(self):
+        # THIS DOESN'T WORK YET 
+
+        # for each edge, find triples
+        # (length/2, min_adj_triradius, max_adj_triradius) if unattached
+        # (min_adj_triradius, min_adj_triradius, max_adj_triradius) if attached.
+
+        edges = []
+        edgenbrs = []
+        edgeinterval = []
+
+        x = self.points[:,0]
+        y = self.points[:,1]
+        ind0 = [self.deltri[j][0] for j in range(len(self.deltri))]
+        ind1 = [self.deltri[j][1] for j in range(len(self.deltri))]
+        ind2 = [self.deltri[j][2] for j in range(len(self.deltri))]
+
+        x0 = array([ x[j] for j in ind1 ])
+        y0 = array([ y[j] for j in ind1 ])
+        x1 = array([ x[j] for j in ind2 ])
+        y1 = array([ y[j] for j in ind2 ])
+        x2 = array([ x[j] for j in ind3 ])
+        y2 = array([ y[j] for j in ind3 ])
+
+        dx0 = x1-x2
+        dx1 = x2-x0
+        dx2 = x0-x1
+        dy0 = y1-y2
+        dy1 = y2-y0
+        dy2 = y0-y1
+
+        elen0 = sqrt(dx0*dx0 + dy0*dy0)
+        elen1 = sqrt(dx1*dx1 + dy1*dy1)
+        elen2 = sqrt(dx2*dx2 + dy2*dy2)
+
+        anglesgn0 = -dx1*dx2-dy1*dy2
+        anglesgn1 = -dx2*dx0-dy2*dy0
+        anglesgn2 = -dx0*dx1-dy0*dy1
+
+        # not sure how to convert the rest of the algorithm.... 
+        
+        for t in range(len(self.deltri)):
+            tri = self.deltri[t]
+            trinbr = self.deltrinbr[t]
+                          
+            for i in [0,1,2]:
+                j = (i+1)%3
+                k = (i+2)%3
+                if trinbr[i]==-1:
+                    edges.append((tri[j], tri[k]))
+                    edgenbrs.append((t, -1))
+                    edgeinterval.append([0.5*elen[i], self.triradius[t], INF])
+                elif (tri[j]<tri[k]):
+                    edges.append((tri[j], tri[k]))
+                    edgenbrs.append((t, trinbr[i]))
+                    edgeinterval.append([0.5*elen[i],\
+                                         min(self.triradius[t],self.triradius[trinbr[i]]),\
+                                             max(self.triradius[t],self.triradius[trinbr[i]]) ])
+                else:
+                    continue
+                #if angle[i]>pi/2:
+                if anglesign[i] < 0: 
+                    edgeinterval[-1][0] = edgeinterval[-1][1]
+                    
+        self.edge = edges
+        self.edgenbr = edgenbrs
+        self.edgeinterval = edgeinterval
+        #print "edges: ",edges, "\n"
+        #print "edge nbrs:", edgenbrs ,"\n"
+        #print "edge intervals: ",edgeinterval , "\n" 
+
+
     def _edge_intervals(self):
         # for each edge, find triples