Skip to content

Commit 5bdf9e1

Browse files
BenPinetBenPinet
committed
fix python
1 parent e4a357a commit 5bdf9e1

File tree

5 files changed

+49
-41
lines changed

5 files changed

+49
-41
lines changed

‎bindings/python/src/inspector/topology/brep_topology.hpp‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ namespace geode
4141
.def_readwrite( "unique_vertices_linked_to_multiple_corners",
4242
&BRepCornersTopologyInspectionResult::
4343
unique_vertices_linked_to_multiple_corners )
44-
.def_readwrite(
45-
"unique_vertices_linked_to_multiple_internals_corner",
46-
&BRepCornersTopologyInspectionResult::
47-
unique_vertices_linked_to_multiple_internals_corner )
4844
.def_readwrite(
4945
"unique_vertices_linked_to_not_internal_nor_boundary_corner",
5046
&BRepCornersTopologyInspectionResult::
@@ -64,18 +60,10 @@ namespace geode
6460
.def_readwrite( "lines_not_linked_to_a_unique_vertex",
6561
&BRepLinesTopologyInspectionResult::
6662
lines_not_linked_to_a_unique_vertex )
67-
.def_readwrite(
68-
"unique_vertices_linked_to_not_internal_nor_boundary_line",
69-
&BRepLinesTopologyInspectionResult::
70-
unique_vertices_linked_to_not_internal_nor_boundary_line )
7163
.def_readwrite(
7264
"unique_vertices_linked_to_a_line_with_invalid_embeddings",
7365
&BRepLinesTopologyInspectionResult::
7466
unique_vertices_linked_to_a_line_with_invalid_embeddings )
75-
.def_readwrite(
76-
"unique_vertices_linked_to_a_single_and_invalid_line",
77-
&BRepLinesTopologyInspectionResult::
78-
unique_vertices_linked_to_a_single_and_invalid_line )
7967
.def_readwrite( "unique_vertices_linked_to_several_lines_but_not_"
8068
"linked_to_a_corner",
8169
&BRepLinesTopologyInspectionResult::
@@ -92,18 +80,10 @@ namespace geode
9280
.def_readwrite( "surfaces_not_linked_to_a_unique_vertex",
9381
&BRepSurfacesTopologyInspectionResult::
9482
surfaces_not_linked_to_a_unique_vertex )
95-
.def_readwrite( "unique_vertices_linked_to_surface_with_wrong_"
96-
"relationship_with_blocks",
97-
&BRepSurfacesTopologyInspectionResult::
98-
unique_vertices_linked_to_surface_with_wrong_relationship_with_blocks )
9983
.def_readwrite(
10084
"unique_vertices_linked_to_a_surface_with_invalid_embbedings",
10185
&BRepSurfacesTopologyInspectionResult::
10286
unique_vertices_linked_to_a_surface_with_invalid_embbedings )
103-
.def_readwrite(
104-
"unique_vertices_linked_to_a_single_and_invalid_surface",
105-
&BRepSurfacesTopologyInspectionResult::
106-
unique_vertices_linked_to_a_single_and_invalid_surface )
10787
.def_readwrite(
10888
"unique_vertices_linked_to_several_and_invalid_surfaces",
10989
&BRepSurfacesTopologyInspectionResult::
@@ -119,8 +99,8 @@ namespace geode
11999
pybind11::class_< BRepBlocksTopologyInspectionResult >(
120100
module, "BRepBlocksTopologyInspectionResult" )
121101
.def( pybind11::init<>() )
122-
.def_readwrite( "blocks_not_meshed",
123-
&BRepBlocksTopologyInspectionResult::blocks_not_meshed )
102+
.def_readwrite( "some_blocks_not_meshed",
103+
&BRepBlocksTopologyInspectionResult::some_blocks_not_meshed )
124104
.def_readwrite( "blocks_not_linked_to_a_unique_vertex",
125105
&BRepBlocksTopologyInspectionResult::
126106
blocks_not_linked_to_a_unique_vertex )
@@ -131,6 +111,31 @@ namespace geode
131111
.def_readwrite( "unique_vertices_with_incorrect_block_cmvs_count",
132112
&BRepBlocksTopologyInspectionResult::
133113
unique_vertices_with_incorrect_block_cmvs_count )
114+
.def_readwrite(
115+
"unique_vertices_linked_to_not_internal_nor_boundary_line",
116+
&BRepBlocksTopologyInspectionResult::
117+
unique_vertices_linked_to_not_internal_nor_boundary_line )
118+
.def_readwrite(
119+
"unique_vertices_linked_to_a_single_and_invalid_line",
120+
&BRepBlocksTopologyInspectionResult::
121+
unique_vertices_linked_to_a_single_and_invalid_line )
122+
.def_readwrite( "unique_vertices_linked_to_surface_with_wrong_"
123+
"relationship_with_blocks",
124+
&BRepBlocksTopologyInspectionResult::
125+
unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks )
126+
.def_readwrite(
127+
"unique_vertices_linked_to_a_single_and_invalid_surface",
128+
&BRepBlocksTopologyInspectionResult::
129+
unique_vertices_linked_to_a_single_and_invalid_surface )
130+
.def_readwrite( "unique_vertex_linked_to_multiple_invalid_surfaces",
131+
&BRepBlocksTopologyInspectionResult::
132+
unique_vertex_linked_to_multiple_invalid_surfaces )
133+
.def_readwrite( "blocks_with_not_closed_boundary_surfaces",
134+
&BRepBlocksTopologyInspectionResult::
135+
blocks_with_not_closed_boundary_surfaces )
136+
.def_readwrite( "model_boundaries_dont_form_a_closed_surface",
137+
&BRepBlocksTopologyInspectionResult::
138+
model_boundaries_dont_form_a_closed_surface )
134139
.def( "string", &BRepBlocksTopologyInspectionResult::string )
135140
.def( "inspection_type",
136141
&BRepBlocksTopologyInspectionResult::inspection_type );

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ def corners_topological_validity(result, verbose):
3838
nb_issues += result.corners_not_meshed.nb_issues()
3939
nb_issues += result.unique_vertices_liked_to_not_boundary_line_corner.nb_issues()
4040
nb_issues += result.unique_vertices_linked_to_multiple_corners.nb_issues()
41-
nb_issues += result.unique_vertices_linked_to_multiple_internals_corner.nb_issues()
4241
nb_issues += (
4342
result.unique_vertices_linked_to_not_internal_nor_boundary_corner.nb_issues()
4443
)
@@ -56,10 +55,6 @@ def lines_topological_validity(result, verbose):
5655
nb_issues += (
5756
result.unique_vertices_linked_to_a_line_with_invalid_embeddings.nb_issues()
5857
)
59-
nb_issues += result.unique_vertices_linked_to_a_single_and_invalid_line.nb_issues()
60-
nb_issues += (
61-
result.unique_vertices_linked_to_not_internal_nor_boundary_line.nb_issues()
62-
)
6358
nb_issues += (
6459
result.unique_vertices_linked_to_several_lines_but_not_linked_to_a_corner.nb_issues()
6560
)
@@ -77,16 +72,9 @@ def surfaces_topological_validity(result, verbose):
7772
nb_issues += (
7873
result.unique_vertices_linked_to_a_line_but_is_not_on_a_surface_border.nb_issues()
7974
)
80-
nb_issues += (
81-
result.unique_vertices_linked_to_a_single_and_invalid_surface.nb_issues()
82-
)
83-
nb_issues += (
84-
result.unique_vertices_linked_to_surface_with_wrong_relationship_with_blocks.nb_issues()
85-
)
8675
nb_issues += (
8776
result.unique_vertices_linked_to_several_and_invalid_surfaces.nb_issues()
8877
)
89-
9078
print("BRep Surfaces Topology check: ", nb_issues, " issues.")
9179
if verbose:
9280
print(result.string(), "\n")
@@ -97,11 +85,26 @@ def blocks_topological_validity(result, verbose):
9785
nb_issues = 0
9886
for issue in result.blocks_not_linked_to_a_unique_vertex.issues_map():
9987
nb_issues += issue[1].nb_issues()
100-
nb_issues += result.blocks_not_meshed.nb_issues()
88+
nb_issues += result.some_blocks_not_meshed.nb_issues()
10189
nb_issues += (
10290
result.unique_vertices_part_of_two_blocks_and_no_boundary_surface.nb_issues()
10391
)
10492
nb_issues += result.unique_vertices_with_incorrect_block_cmvs_count.nb_issues()
93+
nb_issues += result.unique_vertices_linked_to_a_single_and_invalid_line.nb_issues()
94+
nb_issues += (
95+
result.unique_vertices_linked_to_not_internal_nor_boundary_line.nb_issues()
96+
)
97+
nb_issues += (
98+
result.unique_vertices_linked_to_a_single_and_invalid_surface.nb_issues()
99+
)
100+
nb_issues += (
101+
result.unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks.nb_issues()
102+
)
103+
nb_issues += (
104+
result.unique_vertices_linked_to_several_and_invalid_surfaces.nb_issues()
105+
)
106+
nb_issues += result.model_boundaries_dont_form_a_closed_surface.nb_issues()
107+
nb_issues += result.blocks_with_not_closed_boundary_surfaces.nb_issues()
105108
print("BRep Blocks Topology check: ", nb_issues, " issues.")
106109
if verbose:
107110
print(result.string(), "\n")

‎include/geode/inspector/topology/brep_blocks_topology.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ namespace geode
7575
"nor internal status."
7676
};
7777
InspectionIssues< index_t >
78-
unique_vertices_linked_to_surface_with_wrong_relationship_with_blocks{
78+
unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks{
7979
"Indices of unique vertices linked to Surface without boundary "
8080
"nor internal status."
8181
};

‎src/geode/inspector/topology/brep_blocks_topology.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ namespace geode
382382
+ unique_vertices_linked_to_a_single_and_invalid_line.nb_issues()
383383
+ unique_vertices_linked_to_not_internal_nor_boundary_line
384384
.nb_issues()
385-
+ unique_vertices_linked_to_surface_with_wrong_relationship_with_blocks
385+
+ unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks
386386
.nb_issues()
387387
+ unique_vertices_linked_to_a_single_and_invalid_surface
388388
.nb_issues()
@@ -441,12 +441,12 @@ namespace geode
441441
.string(),
442442
"\n" );
443443
}
444-
if( unique_vertices_linked_to_surface_with_wrong_relationship_with_blocks
444+
if( unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks
445445
.nb_issues()
446446
!= 0 )
447447
{
448448
absl::StrAppend( &message,
449-
unique_vertices_linked_to_surface_with_wrong_relationship_with_blocks
449+
unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks
450450
.string(),
451451
"\n" );
452452
}
@@ -1210,7 +1210,7 @@ namespace geode
12101210
unique_vertex_id, not_boundary_surfaces ) )
12111211
{
12121212
result
1213-
.unique_vertices_linked_to_surface_with_wrong_relationship_with_blocks
1213+
.unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks
12141214
.add_issue( unique_vertex_id, problem_message.value() );
12151215
}
12161216
if( const auto problem_message =

‎tests/inspector/test-brep.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ geode::index_t blocks_topological_validity(
130130
.nb_issues();
131131
nb_issues +=
132132
result
133-
.unique_vertices_linked_to_surface_with_wrong_relationship_with_blocks
133+
.unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks
134134
.nb_issues();
135135
geode::Logger::info(
136136
"BRep Blocks Topology check: ", nb_issues, " issues." );

0 commit comments

Comments
 (0)