Skip to content

Commit d5ee51f

Browse files
committed
fix python tests
1 parent 18cb427 commit d5ee51f

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

bindings/python/tests/test-py-brep.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,7 @@ def check_a1(verbose):
224224
"[Test] model model_A1_valid should have 13494 component meshes issues (pairs of component meshes triangles intersecting)."
225225
)
226226

227-
228-
def check_a1_valid(verbose):
229-
test_dir = os.path.dirname(__file__)
230-
data_dir = os.path.abspath(os.path.join(test_dir, "../../../tests/data"))
231-
model_brep = opengeode.load_brep(data_dir + "/model_A1_valid.og_brep")
227+
def inspect_model_A1(model_brep,verbose):
232228
brep_inspector = inspector.BRepInspector(model_brep)
233229
result = brep_inspector.inspect_brep()
234230
if brep_inspector.brep_topology_is_valid():
@@ -248,11 +244,13 @@ def check_a1_valid(verbose):
248244
"[Test] model model_A1_valid should have 13494 component meshes issues (pairs of component meshes triangles intersecting)."
249245
)
250246

251-
252-
def check_model_mss(verbose):
247+
def check_a1_valid(verbose):
253248
test_dir = os.path.dirname(__file__)
254249
data_dir = os.path.abspath(os.path.join(test_dir, "../../../tests/data"))
255-
model_brep = opengeode.load_brep(data_dir + "/mss.og_brep")
250+
model_brep = opengeode.load_brep(data_dir + "/model_A1_valid.og_brep")
251+
inspect_model_A1(model_brep,verbose)
252+
253+
def inspect_model_mss(model_brep,verbose):
256254
brep_inspector = inspector.BRepInspector(model_brep)
257255
result = brep_inspector.inspect_brep()
258256
if brep_inspector.brep_topology_is_valid():
@@ -270,11 +268,13 @@ def check_model_mss(verbose):
270268
if nb_component_meshes_issues != 0:
271269
raise ValueError("[Test] model mss should have no component meshes issues.")
272270

273-
274-
def check_model_D(verbose):
271+
def check_model_mss(verbose):
275272
test_dir = os.path.dirname(__file__)
276273
data_dir = os.path.abspath(os.path.join(test_dir, "../../../tests/data"))
277-
model_brep = opengeode.load_brep(data_dir + "/model_D.og_brep")
274+
model_brep = opengeode.load_brep(data_dir + "/mss.og_brep")
275+
inspect_model_mss(model_brep,verbose)
276+
277+
def inspect_model_D(model_brep,verbose):
278278
brep_inspector = inspector.BRepInspector(model_brep)
279279
result = brep_inspector.inspect_brep()
280280

@@ -292,7 +292,13 @@ def check_model_D(verbose):
292292
)
293293
if nb_component_meshes_issues != 0:
294294
raise ValueError("[Test] model_D should have no component meshes issues.")
295+
295296

297+
def check_model_D(verbose):
298+
test_dir = os.path.dirname(__file__)
299+
data_dir = os.path.abspath(os.path.join(test_dir, "../../../tests/data"))
300+
model_brep = opengeode.load_brep(data_dir + "/model_D.og_brep")
301+
inspect_model_D(model_brep,verbose)
296302

297303
if __name__ == "__main__":
298304
inspector.InspectorInspectorLibrary.initialize()

src/geode/inspector/brep_inspector.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,4 @@ namespace geode
6363
} );
6464
return result;
6565
}
66-
6766
} // namespace geode

src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ namespace geode
177177
for( const auto& surface : model_.surfaces() )
178178
{
179179
const auto& mesh = surface.mesh();
180-
if( !mesh.are_edges_enabled() )
180+
if( !mesh.are_edges_enabled()
181+
&& !enabled_edges_surfaces_.contains( surface.id() ) )
181182
{
182183
result.emplace_back( surface.id() );
183184
enabled_edges_surfaces_.emplace( surface.id() );

0 commit comments

Comments
 (0)