Fix #2: Clean up duplicate imports and paste blocks in solver_core.py

itt_solver/solver_core.py

@@ -1,8 +1,11 @@
 import numpy as np
+from collections import Counter, deque
+
 
 def initialize_potential(grid):
     return np.array(grid, dtype=float)
 
+
 def discrete_gradient(phi):
     gx = np.zeros_like(phi)
     gy = np.zeros_like(phi)
@@ -11,13 +14,16 @@ def discrete_gradient(phi):
     mag = np.sqrt(gx**2 + gy**2)
     return gx, gy, mag
 
+
 def dirichlet_energy(phi):
     _, _, mag = discrete_gradient(phi)
     return np.sum(mag**2)
 
+
 def sigma_l1(phi_current, phi_target):
     return np.sum(np.abs(phi_target - phi_current))
 
+
 def tile_transform(phi_in, out_shape):
     h_in, w_in = phi_in.shape
     h_out, w_out = out_shape
@@ -26,27 +32,21 @@ def tile_transform(phi_in, out_shape):
         for j in range(w_out):
             out[i, j] = phi_in[i % h_in, j % w_in]
     return out
-# paste into itt_solver/solver_core.py replacing old fill_enclosed
-import numpy as np
-from collections import Counter
-from collections import deque
 
-import numpy as _np
-from collections import Counter, deque
 
 def fill_enclosed(phi, boundary_mask=None):
     """
     Fill zero regions that are fully enclosed by non-zero boundary.
     Returns a new array with enclosed holes filled with modal neighbor color.
     """
-    arr = _np.array(phi, dtype=int)
+    arr = np.array(phi, dtype=int)
     h, w = arr.shape
     if boundary_mask is None:
         boundary = (arr != 0)
     else:
-        boundary = _np.array(boundary_mask, dtype=bool)
+        boundary = np.array(boundary_mask, dtype=bool)
 
-    visited = _np.zeros((h, w), dtype=bool)
+    visited = np.zeros((h, w), dtype=bool)
     filled = arr.copy()
 
     def flood(start_r, start_c):
@@ -107,6 +107,7 @@ class Transform:
     def __repr__(self):
         return f"<Transform {self.name}>"
 
+
 def beam_minimize(phi_in, phi_target, atomic_library, beam_width=4, max_depth=4, lock_coeff=0.1):
     identity = Transform(lambda p: p, "Id")
     beam = [(identity, phi_in, 0.0)]