Fixes problems with referents

src/ifcopenshell-python/test/api/alignment/test_add_segment_to_layout.py

@@ -67,14 +67,11 @@ def test_add_segment_to_layout():
 
     _add_segment_to_layout(file, horizontal_alignment, alignment_segment)
 
-    assert len(horizontal_alignment.IsNestedBy) == 1
-    assert (
-        len(horizontal_alignment.IsNestedBy[0].RelatedObjects) == 2
-    )  # The the segment we added and the automatically created zero length segment
-    assert horizontal_alignment.IsNestedBy[0].RelatedObjects[0] == alignment_segment
-    assert (
-        alignment_segment.IsNestedBy[0].RelatedObjects[0].is_a("IfcReferent")
-    )  # a referent is automatically added at the start of the segment
+    assert len(horizontal_alignment.IsNestedBy) == 2
+    referent_nest = ifcopenshell.api.alignment.get_referent_nest(file,horizontal_alignment)
+    segment_nest = ifcopenshell.api.alignment.get_alignment_segment_nest(horizontal_alignment)
+    assert (len(segment_nest.RelatedObjects) == 2)
+    assert (len(referent_nest.RelatedObjects) == 2)
 
 
 test_add_segment_to_layout()

src/ifcopenshell-python/test/api/alignment/test_create_by_pi_method.py

@@ -46,15 +46,22 @@ def test_create_by_pi_method():
     )
 
     assert len(alignment.IsDecomposedBy) == 0  # no child alignments
-    assert len(alignment.IsNestedBy) == 2  # one nest
-    assert (len(alignment.IsNestedBy[0].RelatedObjects) == 2)
-    assert ifcopenshell.api.alignment.get_referent_nest(file,alignment).RelatedObjects[0].is_a("IfcReferent")
+    assert len(alignment.IsNestedBy) == 2
+
     layout_nest = ifcopenshell.api.alignment.get_alignment_layout_nest(alignment)
-    assert layout_nest.RelatedObjects[0].is_a("IfcAlignmentHorizontal")
-    assert layout_nest.RelatedObjects[1].is_a("IfcAlignmentVertical")
-    assert (len(layout_nest.RelatedObjects[0].IsNestedBy) == 1)  # nesting of segments beneath IfcAlignmentHorizontal
-    assert (len(layout_nest.RelatedObjects[0].IsNestedBy[0].RelatedObjects) == 8)  # segments in horizontal layout
-    assert (len(layout_nest.RelatedObjects[1].IsNestedBy[0].RelatedObjects) == 10)  # segments in vertical layout
+    assert (len(layout_nest.RelatedObjects) == 2)
+
+    horizontal_layout = ifcopenshell.api.alignment.get_horizontal_layout(alignment)
+    horizontal_segment_nest = ifcopenshell.api.alignment.get_alignment_segment_nest(horizontal_layout)
+    assert (len(horizontal_segment_nest.RelatedObjects) == 8)
+    horizontal_referent_nest = ifcopenshell.api.alignment.get_referent_nest(file,horizontal_layout)
+    assert (len(horizontal_referent_nest.RelatedObjects) == 8)
+
+    vertical_layout = ifcopenshell.api.alignment.get_vertical_layout(alignment)
+    vertical_segment_nest = ifcopenshell.api.alignment.get_alignment_segment_nest(vertical_layout)
+    assert (len(vertical_segment_nest.RelatedObjects) == 10)
+    vertical_referent_nest = ifcopenshell.api.alignment.get_referent_nest(file,vertical_layout)
+    assert (len(vertical_referent_nest.RelatedObjects) == 10)
 
 
 test_create_by_pi_method()

src/ifcopenshell-python/test/api/alignment/test_name_segments.py

@@ -45,12 +45,14 @@ def test_name_segments():
         file, "TestAlignment", coordinates, radii, vpoints, lengths
     )
 
-    for rel in alignment.IsNestedBy:
-        for a in rel.RelatedObjects:
-            if a.is_a("IfcLinearElement"):
-                ifcopenshell.api.alignment.name_segments("Q", a)
-                i = 1
-                for sr in a.IsNestedBy:
-                    for s in sr.RelatedObjects:
-                        assert f"Q{i}" == s.Name
-                        i += 1
+    layout_nest = ifcopenshell.api.alignment.get_alignment_layout_nest(alignment)
+    for layout in layout_nest.RelatedObjects:
+        assert layout.is_a("IfcLinearElement")
+        ifcopenshell.api.alignment.name_segments("Q", layout)
+        segment_nest = ifcopenshell.api.alignment.get_alignment_segment_nest(layout)
+        i = 1
+        for segment in segment_nest.RelatedObjects:
+            assert f"Q{i}" == segment.Name
+            i += 1
+
+test_name_segments()

src/ifcopenshell-python/test/api/alignment/test_referent_names.py

@@ -98,31 +98,36 @@ def callback_alignment():
 
 def test_with_default_names(default_names_alignment):
     hlayout = ifcopenshell.api.alignment.get_horizontal_layout(default_names_alignment)
+    referent_nest = ifcopenshell.api.alignment.get_referent_nest(None,hlayout)
 
-    assert "P.O.B." in hlayout.IsNestedBy[0].RelatedObjects[0].IsNestedBy[0].RelatedObjects[0].Name
-    assert "P.C." in hlayout.IsNestedBy[0].RelatedObjects[1].IsNestedBy[0].RelatedObjects[0].Name
-    assert "P.T." in hlayout.IsNestedBy[0].RelatedObjects[2].IsNestedBy[0].RelatedObjects[0].Name
-    assert "P.O.E." in hlayout.IsNestedBy[0].RelatedObjects[-1].IsNestedBy[0].RelatedObjects[0].Name
+    assert "P.O.B." in referent_nest.RelatedObjects[0].Name
+    assert "P.C." in referent_nest.RelatedObjects[1].Name
+    assert "P.T." in referent_nest.RelatedObjects[2].Name
+    assert "P.O.E." in referent_nest.RelatedObjects[-1].Name
 
     vlayout = ifcopenshell.api.alignment.get_vertical_layout(default_names_alignment)
+    referent_nest = ifcopenshell.api.alignment.get_referent_nest(None,vlayout)
 
-    assert "V.P.O.B." in vlayout.IsNestedBy[0].RelatedObjects[0].IsNestedBy[0].RelatedObjects[0].Name
-    assert "P.V.C." in vlayout.IsNestedBy[0].RelatedObjects[1].IsNestedBy[0].RelatedObjects[0].Name
-    assert "P.V.T." in vlayout.IsNestedBy[0].RelatedObjects[2].IsNestedBy[0].RelatedObjects[0].Name
-    assert "V.P.O.E." in vlayout.IsNestedBy[0].RelatedObjects[-1].IsNestedBy[0].RelatedObjects[0].Name
+    assert "V.P.O.B." in referent_nest.RelatedObjects[0].Name
+    assert "P.V.C." in referent_nest.RelatedObjects[1].Name
+    assert "P.V.T." in referent_nest.RelatedObjects[2].Name
+    assert "V.P.O.E." in referent_nest.RelatedObjects[-1].Name
 
 
 def test_with_callbacks(callback_alignment):
     hlayout = ifcopenshell.api.alignment.get_horizontal_layout(callback_alignment)
+    referent_nest = ifcopenshell.api.alignment.get_referent_nest(None,hlayout)
 
-    assert "A" in hlayout.IsNestedBy[0].RelatedObjects[0].IsNestedBy[0].RelatedObjects[0].Name
-    assert "Q" in hlayout.IsNestedBy[0].RelatedObjects[1].IsNestedBy[0].RelatedObjects[0].Name
-    assert "Q" in hlayout.IsNestedBy[0].RelatedObjects[2].IsNestedBy[0].RelatedObjects[0].Name
-    assert "Z" in hlayout.IsNestedBy[0].RelatedObjects[-1].IsNestedBy[0].RelatedObjects[0].Name
+    assert "A" in referent_nest.RelatedObjects[0].Name
+    assert "Q" in referent_nest.RelatedObjects[1].Name
+    assert "Q" in referent_nest.RelatedObjects[2].Name
+    assert "Z" in referent_nest.RelatedObjects[-1].Name
 
     vlayout = ifcopenshell.api.alignment.get_vertical_layout(callback_alignment)
+    referent_nest = ifcopenshell.api.alignment.get_referent_nest(None,vlayout)
+
+    assert "a" in referent_nest.RelatedObjects[0].Name
+    assert "q" in referent_nest.RelatedObjects[1].Name
+    assert "q" in referent_nest.RelatedObjects[2].Name
+    assert "z" in referent_nest.RelatedObjects[-1].Name
 
-    assert "a" in vlayout.IsNestedBy[0].RelatedObjects[0].IsNestedBy[0].RelatedObjects[0].Name
-    assert "q" in vlayout.IsNestedBy[0].RelatedObjects[1].IsNestedBy[0].RelatedObjects[0].Name
-    assert "q" in vlayout.IsNestedBy[0].RelatedObjects[2].IsNestedBy[0].RelatedObjects[0].Name
-    assert "z" in vlayout.IsNestedBy[0].RelatedObjects[-1].IsNestedBy[0].RelatedObjects[0].Name