new gridf almost working

[imago.git] / new_geometry.py

diff --git a/new_geometry.py b/new_geometry.py
index 148430b..ab62210 100644 (file)
--- a/new_geometry.py
+++ b/new_geometry.py
@@ -39,11 +39,17 @@ def fill(l1, l2, lh, n):
         if n == 2:
             return [nl, nr]
         elif n == 8:
         if n == 2:
             return [nl, nr]
         elif n == 8:

-            return (fill(l1, nl, lh, 2) +
+            return (fill(l1, nl, 
+                         (intersection(l1, lh),
+                          intersection(nl, lh)), 2) +

                     [nl] +
                     [nl] +

-                    fill(nl, nr, lh, 2) +
+                    fill(nl, nr, 
+                         (intersection(nl, lh),
+                          intersection(nr, lh)), 2) +

                     [nr] +
                     [nr] +

-                    fill(nr, l2, lh, 2))
+                    fill(nr, l2, 
+                         (intersection(nr, lh),
+                          intersection(l2, lh)), 2))

         
 def expand_right(grid, middle):
     return expand(grid[-2], grid[-1], 
         
 def expand_right(grid, middle):
     return expand(grid[-2], grid[-1],