Skip to content

Commit efb19f9

Browse files
committed
Refactor structure and validation in embed_complex.py
1 parent ffdd97b commit efb19f9

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

src/ect/embed_complex.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ def add_cell(
205205
# convert vertex names to indices for storage
206206
cell_indices = tuple(self._node_to_index[v] for v in cell_vertices)
207207

208-
# always validate structural requirements
209208
cell_coords = (
210209
self._coord_matrix[list(cell_indices)]
211210
if self._coord_matrix is not None
@@ -214,24 +213,33 @@ def add_cell(
214213
all_coords = self._coord_matrix
215214
all_indices = list(range(len(self._node_list)))
216215

217-
# Always check structural rules (vertex count, dimension validity)
216+
# check structural rules (vertex count, dimension validity)
218217
structural_result = self._validator.validate_cell(
219-
cell_coords, all_coords, list(cell_indices), all_indices, dim, check_geometric=False
218+
cell_coords,
219+
all_coords,
220+
list(cell_indices),
221+
all_indices,
222+
dim,
223+
check_geometric=False,
220224
)
221225
if not structural_result.is_valid:
222226
raise ValueError(structural_result.message)
223227

224-
# Optionally check geometric rules (embedding properties)
228+
# check geometric rules (embedding properties)
225229
if check:
226230
geometric_result = self._validator.validate_cell(
227-
cell_coords, all_coords, list(cell_indices), all_indices, dim, check_geometric=True
231+
cell_coords,
232+
all_coords,
233+
list(cell_indices),
234+
all_indices,
235+
dim,
236+
check_geometric=True,
228237
)
229238
if not geometric_result.is_valid:
230239
raise ValueError(geometric_result.message)
231240

232-
# update graph structure and store cell
241+
# update graph structure
233242
if dim == 1:
234-
# also add to networkx graph structure
235243
self.add_edge(cell_vertices[0], cell_vertices[1])
236244

237245
self.cells[dim].append(cell_indices)

0 commit comments

Comments
 (0)