Merge pull request #126 from Geode-solutions/fix/pb-coloc-python

Fix/pb coloc python

Author: MelchiorSchuh

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

@@ -29,7 +29,6 @@
 import opengeode as geode
 import opengeode_inspector_py_inspector as inspector
 
-
 def check_non_colocation2D():
     curve = geode.EdgedCurve2D.create()
     builder = geode.EdgedCurveBuilder2D.create(curve)
@@ -63,15 +62,16 @@ def check_colocation2D():
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError(
             "[Test] EdgedCurve doesn't have colocated points whereas it should have several.")
-    if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
+    issues = colocation_inspector.colocated_points_groups()
+    if not issues.nb_issues() == 2:
         raise ValueError(
             "[Test] EdgedCurve has wrong number of colocated points groups.")
     first_colocated_points_group = [0, 1, 6]
     second_colocated_points_group = [3, 5]
-    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:
+    if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
         raise ValueError(
             "[Test] EdgedCurve has wrong first colocated points group.")
-    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:
+    if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
         raise ValueError(
             "[Test] EdgedCurve has wrong second colocated points group.")
 
@@ -110,15 +110,16 @@ def check_colocation3D():
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError(
             "[Test] (3D) EdgedCurve doesn't have colocated points whereas it should have several.")
-    if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
+    issues = colocation_inspector.colocated_points_groups()
+    if not issues.nb_issues() == 2:
         raise ValueError(
             "[Test] (3D) EdgedCurve has wrong number ofgroup of colocated points.")
     first_colocated_points_group = [0, 1, 6]
     second_colocated_points_group = [3, 5]
-    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:
+    if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
         raise ValueError(
             "[Test] (3D) EdgedCurve has wrong first colocated points group.")
-    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:
+    if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
         raise ValueError(
             "[Test] (3D) EdgedCurve has wrong second colocated points group.")
 

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

@@ -30,7 +30,6 @@
 import opengeode_inspector_py_inspector as inspector
 print(dir(inspector))
 
-
 def check_non_colocation2D():
     pointset = geode.PointSet2D.create()
     builder = geode.PointSetBuilder2D.create(pointset)
@@ -64,15 +63,16 @@ def check_colocation2D():
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError(
             "[Test] PointSet doesn't have colocated points whereas it should have several.")
-    if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
+    issues = colocation_inspector.colocated_points_groups()
+    if not issues.nb_issues() == 2:
         raise ValueError(
             "[Test] PointSet has wrong number of group of colocated points.")
     first_colocated_points_group = [0, 1, 6]
     second_colocated_points_group = [3, 5]
-    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:
+    if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
         raise ValueError(
             "[Test] PointSet has wrong first colocated points group.")
-    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:
+    if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
         raise ValueError(
             "[Test] PointSet has wrong second colocated points group.")
 
@@ -111,15 +111,16 @@ def check_colocation3D():
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError(
             "[Test] (3D) PointSet doesn't have colocated points whereas it should have several.")
-    if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
+    issues = colocation_inspector.colocated_points_groups()
+    if not issues.nb_issues() == 2:
         raise ValueError(
             "[Test] (3D) PointSet has wrong number of colocated points.")
     first_colocated_points_group = [0, 1, 6]
     second_colocated_points_group = [3, 5]
-    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:
+    if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
         raise ValueError(
             "[Test] (3D) PointSet has wrong first colocated points group.")
-    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:
+    if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
         raise ValueError(
             "[Test] (3D) PointSet has wrong second colocated points group.")
 

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

@@ -29,7 +29,6 @@
 import opengeode as geode
 import opengeode_inspector_py_inspector as inspector
 
-
 def check_non_colocation():
     solid = geode.TetrahedralSolid3D.create()
     builder = geode.TetrahedralSolidBuilder3D.create(solid)
@@ -66,14 +65,15 @@ def check_colocation():
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError(
             "[Test] Solid doesn't have colocated points whereas it should have several.")
-    if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
+    issues = colocation_inspector.colocated_points_groups()
+    if not issues.nb_issues() == 2:
         raise ValueError("[Test] Solid has wrong number of colocated points.")
     first_colocated_points_group = [0, 1, 6]
     second_colocated_points_group = [3, 5]
-    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:
+    if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
         raise ValueError(
             "[Test] Solid has wrong first colocated points group.")
-    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:
+    if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
         raise ValueError(
             "[Test] Solid has wrong second colocated points group.")
 

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

@@ -29,7 +29,6 @@
 import opengeode as geode
 import opengeode_inspector_py_inspector as inspector
 
-
 def check_non_colocation2D():
     surface = geode.TriangulatedSurface2D.create()
     builder = geode.TriangulatedSurfaceBuilder2D.create(surface)
@@ -62,16 +61,17 @@ def check_colocation2D():
     colocation_inspector = inspector.SurfaceMeshColocation2D(surface)
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError(
-            "[Test] Surface doesn't have colocated points whereas it should have several.")
-    if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
+            "[Test] Surface doesn't have colocated points whereas it should have several.") 
+    issues = colocation_inspector.colocated_points_groups()
+    if not issues.nb_issues() == 2:
         raise ValueError(
             "[Test] Surface has wrong number of colocated points.")
     first_colocated_points_group = [0, 1, 6]
     second_colocated_points_group = [3, 5]
-    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:
+    if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
         raise ValueError(
             "[Test] Surface has wrong first colocated points group.")
-    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:
+    if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
         raise ValueError(
             "[Test] Surface has wrong second colocated points group.")
 
@@ -110,15 +110,16 @@ def check_colocation3D():
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError(
             "[Test] (3D) Surface doesn't have colocated points whereas it should have several.")
-    if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
+    issues = colocation_inspector.colocated_points_groups()
+    if not issues.nb_issues() == 2:
         raise ValueError(
             "[Test] (3D) Surface has wrong number of colocated points.")
     first_colocated_points_group = [0, 1, 6]
     second_colocated_points_group = [3, 5]
-    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:
+    if not issues.issues()[0] == first_colocated_points_group and not issues.issues()[0] == second_colocated_points_group:
         raise ValueError(
             "[Test] (3D) Surface has wrong first colocated points group.")
-    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:
+    if not issues.issues()[1] == first_colocated_points_group and not issues.issues()[1] == second_colocated_points_group:
         raise ValueError(
             "[Test] (3D) Surface has wrong second colocated points group.")
 

tests/inspector/test-surface-colocation.cpp

@@ -87,7 +87,7 @@ void check_colocation2D()
                    == second_colocated_points_group,
         "[Test] Surface has wrong first colocated points group." );
     OPENGEODE_EXCEPTION(
-        colocated_points_groups.issues()[1] == second_colocated_points_group
+        colocated_points_groups.issues()[1] == first_colocated_points_group
             || colocated_points_groups.issues()[1]
                    == second_colocated_points_group,
         "[Test] Surface has wrong second colocated points group." );