Skip to content

Commit 8ff5b8a

Browse files
committed
fix python tests
1 parent 1dd4bdb commit 8ff5b8a

File tree

1 file changed

+19
-30
lines changed

1 file changed

+19
-30
lines changed

bindings/python/tests/test-py-surface-intersections.py

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
import os
2323
import sys
2424
import platform
25+
2526
if sys.version_info >= (3, 8, 0) and platform.system() == "Windows":
26-
for path in [x.strip() for x in os.environ['PATH'].split(';') if x]:
27+
for path in [x.strip() for x in os.environ["PATH"].split(";") if x]:
2728
os.add_dll_directory(path)
2829

2930
import opengeode as geode
@@ -34,11 +35,11 @@ def check_intersections2D():
3435
surface = geode.TriangulatedSurface2D.create()
3536
builder = geode.TriangulatedSurfaceBuilder2D.create(surface)
3637
builder.create_vertices(5)
37-
builder.set_point(0, geode.Point2D([0., 0.]))
38-
builder.set_point(1, geode.Point2D([3., 0.]))
39-
builder.set_point(2, geode.Point2D([0., 4.]))
40-
builder.set_point(3, geode.Point2D([3., 4.]))
41-
builder.set_point(4, geode.Point2D([-1., 2.]))
38+
builder.set_point(0, geode.Point2D([0.0, 0.0]))
39+
builder.set_point(1, geode.Point2D([3.0, 0.0]))
40+
builder.set_point(2, geode.Point2D([0.0, 4.0]))
41+
builder.set_point(3, geode.Point2D([3.0, 4.0]))
42+
builder.set_point(4, geode.Point2D([-1.0, 2.0]))
4243
builder.create_triangle([0, 1, 2])
4344
builder.create_triangle([0, 1, 3])
4445
builder.create_triangle([1, 3, 4])
@@ -47,30 +48,24 @@ def check_intersections2D():
4748
builder.set_polygon_adjacent(geode.PolygonEdge(1, 1), 2)
4849
builder.set_polygon_adjacent(geode.PolygonEdge(2, 0), 1)
4950

50-
intersections_inspector = inspector.SurfaceMeshIntersections2D(
51-
surface)
51+
intersections_inspector = inspector.SurfaceMeshIntersections2D(surface)
5252
if not intersections_inspector.mesh_has_self_intersections():
5353
raise ValueError("[Test] 2D Surface should have intersections.")
5454
if not intersections_inspector.intersecting_elements().nb_issues() == 3:
55-
raise ValueError(
56-
"[Test] 2D Surface should have 3 intersecting elements pair.")
57-
triangles_inter = intersections_inspector.intersecting_elements().issues()
58-
if len(triangles_inter) != 3 or triangles_inter[0][0] != 2 or triangles_inter[0][1] != 0 or triangles_inter[1][0] != 2 or triangles_inter[1][1] != 1 or triangles_inter[2][0] != 0 or triangles_inter[2][1] != 1:
59-
raise ValueError(
60-
"[Test] 2D Surface has wrong intersecting elements pairs.")
55+
raise ValueError("[Test] 2D Surface should have 3 intersecting elements pair.")
6156

6257

6358
def check_intersections3D():
6459
surface = geode.TriangulatedSurface3D.create()
6560
builder = geode.TriangulatedSurfaceBuilder3D.create(surface)
6661
builder.create_vertices(7)
67-
builder.set_point(0, geode.Point3D([0., 0., 0.]))
68-
builder.set_point(1, geode.Point3D([0., 0., 3.]))
69-
builder.set_point(2, geode.Point3D([0., 2., 0.]))
70-
builder.set_point(3, geode.Point3D([2., 0., 0.]))
71-
builder.set_point(4, geode.Point3D([5., 0., 1.5]))
72-
builder.set_point(5, geode.Point3D([2., 0.5, 2.]))
73-
builder.set_point(6, geode.Point3D([0., 0., 1.5]))
62+
builder.set_point(0, geode.Point3D([0.0, 0.0, 0.0]))
63+
builder.set_point(1, geode.Point3D([0.0, 0.0, 3.0]))
64+
builder.set_point(2, geode.Point3D([0.0, 2.0, 0.0]))
65+
builder.set_point(3, geode.Point3D([2.0, 0.0, 0.0]))
66+
builder.set_point(4, geode.Point3D([5.0, 0.0, 1.5]))
67+
builder.set_point(5, geode.Point3D([2.0, 0.5, 2.0]))
68+
builder.set_point(6, geode.Point3D([0.0, 0.0, 1.5]))
7469
builder.create_triangle([0, 1, 2])
7570
builder.create_triangle([0, 2, 3])
7671
builder.create_triangle([3, 5, 2])
@@ -83,21 +78,15 @@ def check_intersections3D():
8378
builder.set_polygon_adjacent(geode.PolygonEdge(2, 1), 3)
8479
builder.set_polygon_adjacent(geode.PolygonEdge(3, 0), 2)
8580

86-
intersections_inspector = inspector.SurfaceMeshIntersections3D(
87-
surface)
81+
intersections_inspector = inspector.SurfaceMeshIntersections3D(surface)
8882
if not intersections_inspector.mesh_has_self_intersections():
8983
raise ValueError("[Test] 3D Surface should have intersections.")
9084
nb_intersections = intersections_inspector.intersecting_elements().nb_issues()
9185
if not nb_intersections == 2:
92-
raise ValueError(
93-
"[Test] 3D Surface should have 2 intersecting elements pair.")
94-
triangles_inter = intersections_inspector.intersecting_elements().issues()
95-
if len(triangles_inter) != 2 or triangles_inter[0][0] != 0 or triangles_inter[0][1] != 4 or triangles_inter[1][0] != 2 or triangles_inter[1][1] != 4:
96-
raise ValueError(
97-
"[Test] 3D Surface has wrong intersecting elements pairs.")
86+
raise ValueError("[Test] 3D Surface should have 2 intersecting elements pair.")
9887

9988

100-
if __name__ == '__main__':
89+
if __name__ == "__main__":
10190
inspector.InspectorInspectorLibrary.initialize()
10291
check_intersections2D()
10392
check_intersections3D()

0 commit comments

Comments
 (0)