refactor structural module - wip - structural analysis models #1848

src/ifcopenshell-python/ifcopenshell/api/structural/data.py

@@ -1,7 +1,5 @@
 class Data:
     is_loaded = False
-    products = {}
-    structural_analysis_models = {}
     connections = {}
     boundary_conditions = {}
     connects_structural_members = {}
@@ -17,8 +15,6 @@ class Data:
     @classmethod
     def purge(cls):
         cls.is_loaded = False
-        cls.products = {}
-        cls.structural_analysis_models = {}
         cls.connections = {}
         cls.boundary_conditions = {}
         cls.connects_structural_members = {}
@@ -44,7 +40,6 @@ class Data:
                 return cls.load_structural_member(product_id)
             # if product.is_a("IfcStructuralAction"):
             #     return cls.load_structural_action(product_id)
-        cls.load_structural_analysis_models()
         cls.load_structural_load_cases()
         cls.load_structural_load_case_combinations()
         cls.load_structural_load_groups()
@@ -53,34 +48,6 @@ class Data:
         cls.load_boundary_conditions()
         cls.is_loaded = True
 
-    @classmethod
-    def load_structural_analysis_models(cls):
-        cls.products = {}
-        cls.structural_analysis_models = {}
-
-        for model in cls._file.by_type("IfcStructuralAnalysisModel"):
-            if model.IsGroupedBy:
-                for rel in model.IsGroupedBy:
-                    for product in rel.RelatedObjects:
-                        cls.products.setdefault(product.id(), []).append(model.id())
-            data = model.get_info()
-            del data["OwnerHistory"]
-
-            loaded_by = []
-            for load_group in model.LoadedBy or []:
-                loaded_by.append(load_group.id())
-            data["LoadedBy"] = loaded_by
-
-            has_results = []
-            for result_group in model.HasResults or []:
-                has_results.append(result_group.id())
-            data["HasResults"] = has_results
-
-            data["OrientationOf2DPlane"] = model.OrientationOf2DPlane.id() if model.OrientationOf2DPlane else None
-            data["SharedPlacement"] = model.SharedPlacement.id() if model.SharedPlacement else None
-
-            cls.structural_analysis_models[model.id()] = data
-
     @classmethod
     def load_structural_load_cases(cls):
         cls.load_cases = {}

src/ifcopenshell-python/ifcopenshell/api/structural/edit_structural_analysis_model.py

@@ -8,3 +8,4 @@ class Usecase:
     def execute(self):
         for name, value in self.settings["attributes"].items():
             setattr(self.settings["structural_analysis_model"], name, value)
+        return self.settings["structural_analysis_model"]

src/ifcopenshell-python/test/api/structural/__init__.py

@@ -0,0 +1 @@
+

src/ifcopenshell-python/test/api/structural/test_add_structural_analysis_model.py

@@ -0,0 +1,11 @@
+import numpy
+import pytest
+import test.bootstrap
+import ifcopenshell.api
+
+class TestAddStructuralAnalysisModel(test.bootstrap.IFC4):
+    def test_adding_a_structural_analysis_model(self):
+        subject = ifcopenshell.api.run("structural.add_structural_analysis_model", self.file)
+        models = self.file.by_type("IfcStructuralAnalysisModel")
+        assert subject == models[0]
+        assert subject.is_a("IfcStructuralAnalysisModel")

src/ifcopenshell-python/test/api/structural/test_assign_structural_analysis_model.py

@@ -0,0 +1,24 @@
+import numpy
+import pytest
+import test.bootstrap
+import ifcopenshell.api
+
+class TestAssignStructuralAnalysisModel(test.bootstrap.IFC4):
+    def test_assigning_a_structural_analysis_model(self):
+        subject = ifcopenshell.api.run("structural.add_structural_analysis_model", self.file)
+        product = ifcopenshell.api.run(
+            "root.create_entity",
+            self.file,
+            ifc_class="IfcStructuralMember",
+            predefined_type=None,
+            name=None
+        )
+        rel = ifcopenshell.api.run(
+            "structural.assign_structural_analysis_model",
+            self.file,
+            product=product,
+            structural_analysis_model=subject,
+        )
+        assert rel.is_a("IfcRelAssignsToGroup")
+        assert rel.RelatingGroup == subject
+        assert product in rel.RelatedObjects

src/ifcopenshell-python/test/api/structural/test_edit_structural_analysis_model.py

@@ -0,0 +1,20 @@
+import numpy
+import pytest
+import test.bootstrap
+import ifcopenshell.api
+
+class TestEditStructuralAnalysisModel(test.bootstrap.IFC4):
+    def test_editing_a_structural_analysis_model(self):
+        subject = ifcopenshell.api.run("structural.add_structural_analysis_model", self.file)
+        subject = ifcopenshell.api.run(
+            "structural.edit_structural_analysis_model",
+            self.file,
+            structural_analysis_model=subject,
+            attributes={
+                "Name": "My edited model",
+                "Description": "Description of my model"
+            }
+        )
+        models = self.file.by_type("IfcStructuralAnalysisModel")
+        assert subject == models[0]
+        assert subject.is_a("IfcStructuralAnalysisModel")

src/ifcopenshell-python/test/api/structural/test_remove_structural_analysis_model.py

@@ -0,0 +1,16 @@
+import numpy
+import pytest
+import test.bootstrap
+import ifcopenshell.api
+
+class TestRemoveStructuralAnalysisModel(test.bootstrap.IFC4):
+    def test_removing_a_structural_analysis_model(self):
+        subject = ifcopenshell.api.run("structural.add_structural_analysis_model", self.file)
+        ifcopenshell.api.run(
+            "structural.remove_structural_analysis_model",
+            self.file,
+            structural_analysis_model=subject,
+
+        )
+        models = self.file.by_type("IfcStructuralAnalysisModel")
+        assert len(models) == 0

src/ifcopenshell-python/test/api/structural/test_unassign_structural_analysis_model.py

@@ -0,0 +1,31 @@
+import numpy
+import pytest
+import test.bootstrap
+import ifcopenshell.api
+
+class TestUnassignStructuralAnalysisModel(test.bootstrap.IFC4):
+    def test_unassigning_a_structural_analysis_model(self):
+        subject = ifcopenshell.api.run("structural.add_structural_analysis_model", self.file)
+        product = ifcopenshell.api.run(
+            "root.create_entity",
+            self.file,
+            ifc_class="IfcStructuralMember",
+            predefined_type=None,
+            name=None
+        )
+        rel = ifcopenshell.api.run(
+            "structural.assign_structural_analysis_model",
+            self.file,
+            product=product,
+            structural_analysis_model=subject,
+        )
+        ifcopenshell.api.run(
+            "structural.unassign_structural_analysis_model",
+            self.file,
+            product=product,
+            structural_analysis_model=subject,
+        )
+        models = self.file.by_type("IfcStructuralAnalysisModel")
+        rels = self.file.by_type("IfcRelAssignsToGroup")
+        assert len(models[0].IsGroupedBy) == 0
+        assert len(rels) == 0