Changeset 611 for inundation/ga/storm_surge/pyvolution/quad.py

Timestamp:

Nov 22, 2004, 4:50:04 PM (20 years ago)

Author:

duncan

Message:

Optimised the least_squares algorithm for building A matrix

File:

• inundation/ga/storm_surge/pyvolution/quad.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/quad.py

@@ -81 +81 @@
             for child in self:
                 if child.contains(x,y):
-                    branch.append(self)
+                    brothers = list(self.children)
+                    brothers.remove(child)
+                    branch.append(brothers)
                     points, branch = child.search_branch(x,y, branch)
         else:
@@ -98 +100 @@
             for child in self:
                 if child.contains(x,y):
-                    branch.append(self)
+                    brothers = list(self.children)
+                    brothers.remove(child)
+                    branch.append(brothers)
                     points, branch = child.search_branch(x,y, branch)
                     
@@ -114 +118 @@
             points = []
         else:
-            larger_cell = self.branch.pop()
-            #print "larger_cell ", larger_cell.show() # Get_tree()
-            for child in larger_cell:
-                #This means it will also go down the branch known to be bad.
-                #So, if things are too slow, this could be speed up
-                points += child.retrieve()
+            three_cells = self.branch.pop()
+            for cell in three_cells:
+                #print "cell ", cell.show() 
+                points += cell.retrieve()
         return points