numpy downgrade

Author: petrasvestartas

docs/examples/example_booleans_with_face_source.py

@@ -7,6 +7,7 @@
 from compas_viewer import Viewer
 
 from compas_cgal.booleans import boolean_chain_with_face_source
+from compas_cgal.booleans import split_by_source
 
 
 # =============================================================================
@@ -52,15 +53,16 @@ def cylinder_along(axis, radius=0.8):
     exact=False,
 )
 
-mesh = Mesh.from_vertices_and_faces(V, F)
-
 # =============================================================================
 # Color the output by source mesh:
 #   mesh_id == 0  -> cube     (red)
 #   mesh_id == 1  -> sphere   (blue)        — rounded corners/edges
 #   mesh_id == 2  -> cyl_x    (green)       — X-axis through-hole walls
 #   mesh_id == 3  -> cyl_y    (yellow)      — Y-axis through-hole walls
 #   mesh_id == 4  -> cyl_z    (magenta)     — Z-axis through-hole walls
+#
+# Two equivalent visualization paths are shown below. Pick whichever fits
+# your downstream code; the C++ output is identical in both cases.
 # =============================================================================
 
 palette = {
@@ -71,12 +73,36 @@ def cylinder_along(axis, radius=0.8):
     4: Color(0.80, 0.40, 0.85),
 }
 
+# Option A — single connected mesh + per-face color dict (keeps shared
+# vertices intact at source boundaries; best for further processing).
+mesh = Mesh.from_vertices_and_faces(V, F)
 facecolor = {fkey: palette[mesh_id] for fkey, (mesh_id, _) in zip(mesh.faces(), S.tolist())}
 
+# Option B — split into one mesh per source via split_by_source. Each
+# submesh is independent (boundary vertices are duplicated across submeshes)
+# and gets its own scene object with a single color. Convenient for viewers
+# that prefer one material/layer per object.
+submeshes = {
+    mesh_id: Mesh.from_vertices_and_faces(Vs, Fs)
+    for mesh_id, (Vs, Fs) in split_by_source(V, F, S).items()
+}
+
 # =============================================================================
-# Visualize
+# Visualize — toggle USE_SPLIT to compare the two paths.
 # =============================================================================
 
+USE_SPLIT = True
+
 viewer = Viewer()
-viewer.scene.add(mesh, facecolor=facecolor, lineswidth=1, show_points=False, show_lines=True)
+if USE_SPLIT:
+    for mesh_id, submesh in submeshes.items():
+        viewer.scene.add(
+            submesh,
+            facecolor=palette[mesh_id],
+            lineswidth=1,
+            show_points=False,
+            show_lines=True,
+        )
+else:
+    viewer.scene.add(mesh, facecolor=facecolor, lineswidth=1, show_points=False, show_lines=True)
 viewer.show()

pyproject.toml

@@ -82,8 +82,8 @@ CMAKE_POLICY_DEFAULT_CMP0135 = "NEW"
 [tool.cibuildwheel]
 # build = ["cp38-*", "cp39-*", "cp31?-*"] # Build for specific Python versions.
 build-verbosity = 3
-test-requires = ["numpy>=2.4", "compas>=2.15,<3", "pytest", "build"]
-test-command = "pip install 'numpy>=2.4' 'compas>=2.15,<3' && pip list && pytest {project}/tests"
+test-requires = ["numpy>=1.24", "compas>=2.15,<3", "pytest", "build"]
+test-command = "pip install 'numpy>=1.24' 'compas>=2.15,<3' && pip list && pytest {project}/tests"
 build-frontend = "pip"
 manylinux-x86_64-image = "manylinux_2_28"
 skip = ["*_i686", "*-musllinux_*", "*-win32", "pp*"]

src/compas_cgal/booleans.py

@@ -440,6 +440,40 @@ def boolean_chain_with_face_source(
     return _booleans.boolean_chain_with_face_source(V_flat, F_flat, v_counts, f_counts, op_codes)
 
 
+def split_by_source(
+    V: np.ndarray,
+    F: np.ndarray,
+    S: np.ndarray,
+) -> dict[int, tuple[np.ndarray, np.ndarray]]:
+    """Split a face-source-tagged boolean result into one mesh per source.
+
+    Given ``(V, F, S)`` from :func:`boolean_chain_with_face_source`, returns a
+    dict mapping each ``mesh_id`` present in ``S[:, 0]`` to its own
+    ``(V_sub, F_sub)`` pair. ``V_sub`` contains only the vertices referenced
+    by that submesh's faces and ``F_sub`` is reindexed accordingly.
+
+    Note: vertices on the boundary between two source regions are duplicated
+    across the resulting submeshes (each submesh gets its own copy), so the
+    submeshes are no longer connected at cut boundaries. The original ``(V,
+    F, S)`` remains the canonical output — use this helper only when a
+    per-source mesh layout is convenient (e.g. assigning a single colour or
+    material to a viewer scene object).
+    """
+    V = np.asarray(V)
+    F = np.asarray(F)
+    S = np.asarray(S)
+
+    out: dict[int, tuple[np.ndarray, np.ndarray]] = {}
+    for mesh_id in np.unique(S[:, 0]):
+        face_mask = S[:, 0] == mesh_id
+        F_sub = F[face_mask]
+        used = np.unique(F_sub.reshape(-1))
+        remap = np.full(V.shape[0], -1, dtype=np.int64)
+        remap[used] = np.arange(used.shape[0])
+        out[int(mesh_id)] = (V[used], remap[F_sub].astype(F.dtype))
+    return out
+
+
 def boolean_difference_mesh_meshes(A: VerticesFaces, Bs: Iterable[VerticesFaces]) -> VerticesFacesNumpy:
     """Subtract many meshes from A in a single corefinement.