Skip to content

Commit 567eb21

Browse files
panquezpanquez
committed
fix
1 parent 93dfb79 commit 567eb21

File tree

4 files changed

+30
-123
lines changed

4 files changed

+30
-123
lines changed

‎bindings/python/tests/test-py-edgedcurve-colocation.py‎

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@
2929
import opengeode as geode
3030
import opengeode_inspector_py_inspector as inspector
3131

32-
def are_values_equal(values1, values2):
33-
if len(values1) != len(values2):
34-
return False
35-
for value in values1:
36-
if value not in values2:
37-
return False
38-
return True
39-
4032
def check_non_colocation2D():
4133
curve = geode.EdgedCurve2D.create()
4234
builder = geode.EdgedCurveBuilder2D.create(curve)
@@ -70,27 +62,16 @@ def check_colocation2D():
7062
if not colocation_inspector.mesh_has_colocated_points():
7163
raise ValueError(
7264
"[Test] EdgedCurve doesn't have colocated points whereas it should have several.")
73-
if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
65+
issues = colocation_inspector.colocated_points_groups()
66+
if not issues.nb_issues() == 2:
7467
raise ValueError(
7568
"[Test] EdgedCurve has wrong number of colocated points groups.")
7669
first_colocated_points_group = [0, 1, 6]
7770
second_colocated_points_group = [3, 5]
78-
for group in colocation_inspector.colocated_points_groups().issues():
79-
for point in group:
80-
print(point)
81-
print("compare")
82-
print( colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group )
83-
print( colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group )
84-
print( colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group )
85-
print( colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group )
86-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], first_colocated_points_group) )
87-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], second_colocated_points_group) )
88-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], first_colocated_points_group) )
89-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], second_colocated_points_group) )
90-
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
71+
if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
9172
raise ValueError(
9273
"[Test] EdgedCurve has wrong first colocated points group.")
93-
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
74+
if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
9475
raise ValueError(
9576
"[Test] EdgedCurve has wrong second colocated points group.")
9677

@@ -129,27 +110,16 @@ def check_colocation3D():
129110
if not colocation_inspector.mesh_has_colocated_points():
130111
raise ValueError(
131112
"[Test] (3D) EdgedCurve doesn't have colocated points whereas it should have several.")
132-
if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
113+
issues = colocation_inspector.colocated_points_groups()
114+
if not issues.nb_issues() == 2:
133115
raise ValueError(
134116
"[Test] (3D) EdgedCurve has wrong number ofgroup of colocated points.")
135117
first_colocated_points_group = [0, 1, 6]
136118
second_colocated_points_group = [3, 5]
137-
for group in colocation_inspector.colocated_points_groups().issues():
138-
for point in group:
139-
print(point)
140-
print("compare")
141-
print( colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group )
142-
print( colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group )
143-
print( colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group )
144-
print( colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group )
145-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], first_colocated_points_group) )
146-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], second_colocated_points_group) )
147-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], first_colocated_points_group) )
148-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], second_colocated_points_group) )
149-
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
119+
if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
150120
raise ValueError(
151121
"[Test] (3D) EdgedCurve has wrong first colocated points group.")
152-
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
122+
if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
153123
raise ValueError(
154124
"[Test] (3D) EdgedCurve has wrong second colocated points group.")
155125

‎bindings/python/tests/test-py-pointset-colocation.py‎

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,16 @@ def check_colocation2D():
7171
if not colocation_inspector.mesh_has_colocated_points():
7272
raise ValueError(
7373
"[Test] PointSet doesn't have colocated points whereas it should have several.")
74-
if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
74+
issues = colocation_inspector.colocated_points_groups()
75+
if not issues.nb_issues() == 2:
7576
raise ValueError(
7677
"[Test] PointSet has wrong number of group of colocated points.")
7778
first_colocated_points_group = [0, 1, 6]
7879
second_colocated_points_group = [3, 5]
79-
for group in colocation_inspector.colocated_points_groups().issues():
80-
for point in group:
81-
print(point)
82-
print("compare")
83-
print( colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group )
84-
print( colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group )
85-
print( colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group )
86-
print( colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group )
87-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], first_colocated_points_group) )
88-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], second_colocated_points_group) )
89-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], first_colocated_points_group) )
90-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], second_colocated_points_group) )
91-
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
80+
if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
9281
raise ValueError(
9382
"[Test] PointSet has wrong first colocated points group.")
94-
if colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
83+
if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
9584
raise ValueError(
9685
"[Test] PointSet has wrong second colocated points group.")
9786

@@ -130,27 +119,16 @@ def check_colocation3D():
130119
if not colocation_inspector.mesh_has_colocated_points():
131120
raise ValueError(
132121
"[Test] (3D) PointSet doesn't have colocated points whereas it should have several.")
133-
if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
122+
issues = colocation_inspector.colocated_points_groups()
123+
if not issues.nb_issues() == 2:
134124
raise ValueError(
135125
"[Test] (3D) PointSet has wrong number of colocated points.")
136126
first_colocated_points_group = [0, 1, 6]
137127
second_colocated_points_group = [3, 5]
138-
for group in colocation_inspector.colocated_points_groups().issues():
139-
for point in group:
140-
print(point)
141-
print("compare")
142-
print( colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group )
143-
print( colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group )
144-
print( colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group )
145-
print( colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group )
146-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], first_colocated_points_group) )
147-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], second_colocated_points_group) )
148-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], first_colocated_points_group) )
149-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], second_colocated_points_group) )
150-
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
128+
if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
151129
raise ValueError(
152130
"[Test] (3D) PointSet has wrong first colocated points group.")
153-
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
131+
if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
154132
raise ValueError(
155133
"[Test] (3D) PointSet has wrong second colocated points group.")
156134

‎bindings/python/tests/test-py-solid-colocation.py‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def are_values_equal(values1, values2):
3636
if value not in values2:
3737
return False
3838
return True
39-
39+
4040
def check_non_colocation():
4141
solid = geode.TetrahedralSolid3D.create()
4242
builder = geode.TetrahedralSolidBuilder3D.create(solid)
@@ -73,26 +73,15 @@ def check_colocation():
7373
if not colocation_inspector.mesh_has_colocated_points():
7474
raise ValueError(
7575
"[Test] Solid doesn't have colocated points whereas it should have several.")
76-
if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
76+
issues = colocation_inspector.colocated_points_groups()
77+
if not issues.nb_issues() == 2:
7778
raise ValueError("[Test] Solid has wrong number of colocated points.")
7879
first_colocated_points_group = [0, 1, 6]
7980
second_colocated_points_group = [3, 5]
80-
for group in colocation_inspector.colocated_points_groups().issues():
81-
for point in group:
82-
print(point)
83-
print("compare")
84-
print( colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group )
85-
print( colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group )
86-
print( colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group )
87-
print( colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group )
88-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], first_colocated_points_group) )
89-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], second_colocated_points_group) )
90-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], first_colocated_points_group) )
91-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], second_colocated_points_group) )
92-
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
81+
if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
9382
raise ValueError(
9483
"[Test] Solid has wrong first colocated points group.")
95-
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
84+
if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
9685
raise ValueError(
9786
"[Test] Solid has wrong second colocated points group.")
9887

‎bindings/python/tests/test-py-surface-colocation.py‎

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@
2929
import opengeode as geode
3030
import opengeode_inspector_py_inspector as inspector
3131

32-
def are_values_equal(values1, values2):
33-
if len(values1) != len(values2):
34-
return False
35-
for value in values1:
36-
if value not in values2:
37-
return False
38-
return True
39-
4032
def check_non_colocation2D():
4133
surface = geode.TriangulatedSurface2D.create()
4234
builder = geode.TriangulatedSurfaceBuilder2D.create(surface)
@@ -69,28 +61,17 @@ def check_colocation2D():
6961
colocation_inspector = inspector.SurfaceMeshColocation2D(surface)
7062
if not colocation_inspector.mesh_has_colocated_points():
7163
raise ValueError(
72-
"[Test] Surface doesn't have colocated points whereas it should have several.")
73-
if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
64+
"[Test] Surface doesn't have colocated points whereas it should have several.")
65+
issues = colocation_inspector.colocated_points_groups()
66+
if not issues.nb_issues() == 2:
7467
raise ValueError(
7568
"[Test] Surface has wrong number of colocated points.")
7669
first_colocated_points_group = [0, 1, 6]
7770
second_colocated_points_group = [3, 5]
78-
for group in colocation_inspector.colocated_points_groups().issues():
79-
for point in group:
80-
print(point)
81-
print("compare")
82-
print( colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group )
83-
print( colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group )
84-
print( colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group )
85-
print( colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group )
86-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], first_colocated_points_group) )
87-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], second_colocated_points_group) )
88-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], first_colocated_points_group) )
89-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], second_colocated_points_group) )
90-
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
71+
if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
9172
raise ValueError(
9273
"[Test] Surface has wrong first colocated points group.")
93-
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
74+
if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
9475
raise ValueError(
9576
"[Test] Surface has wrong second colocated points group.")
9677

@@ -129,27 +110,16 @@ def check_colocation3D():
129110
if not colocation_inspector.mesh_has_colocated_points():
130111
raise ValueError(
131112
"[Test] (3D) Surface doesn't have colocated points whereas it should have several.")
132-
if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
113+
issues = colocation_inspector.colocated_points_groups()
114+
if not issues.nb_issues() == 2:
133115
raise ValueError(
134116
"[Test] (3D) Surface has wrong number of colocated points.")
135117
first_colocated_points_group = [0, 1, 6]
136118
second_colocated_points_group = [3, 5]
137-
for group in colocation_inspector.colocated_points_groups().issues():
138-
for point in group:
139-
print(point)
140-
print("compare")
141-
print( colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group )
142-
print( colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group )
143-
print( colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group )
144-
print( colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group )
145-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], first_colocated_points_group) )
146-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[0], second_colocated_points_group) )
147-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], first_colocated_points_group) )
148-
print( are_values_equal(colocation_inspector.colocated_points_groups().issues()[1], second_colocated_points_group) )
149-
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
119+
if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
150120
raise ValueError(
151121
"[Test] (3D) Surface has wrong first colocated points group.")
152-
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
122+
if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
153123
raise ValueError(
154124
"[Test] (3D) Surface has wrong second colocated points group.")
155125

0 commit comments

Comments
 (0)