Support quantity take-off for element types

Previously it would ignore any element types and work only on occurrences though quantity sets do support product types in general.

src/ifc5d/ifc5d/qto.py

@@ -28,9 +28,10 @@ import ifcopenshell.util.element
 import ifcopenshell.util.selector
 import ifcopenshell.util.shape
 import ifcopenshell.util.representation
+import ifcopenshell.util.type
 import multiprocessing
-from collections import namedtuple
+from collections import namedtuple, defaultdict
-from typing import Any, Literal, get_args, Union
+from typing import Any, Literal, get_args, Union, Iterable
 
 
 Function = namedtuple("Function", ["measure", "name", "description"])
@@ -52,10 +53,19 @@ def quantify(ifc_file: ifcopenshell.file, elements: set[ifcopenshell.entity_inst
 
     """
     results: ResultsDict = {}
+    elements_by_classes: defaultdict[str, set[ifcopenshell.entity_instance]] = defaultdict(set)
+    for element in elements:
+        elements_by_classes[element.is_a()].add(element)
+
     for calculator, queries in rules["calculators"].items():
         calculator = calculators[calculator]
-        for query, qtos in queries.items():
+        for ifc_class, qtos in queries.items():
-            filtered_elements = ifcopenshell.util.selector.filter_elements(ifc_file, query, elements)
+            filtered_elements = set()
+            ifc_classes = [ifc_class] + ifcopenshell.util.type.get_applicable_types(ifc_class)
+            for ifc_class in ifc_classes:
+                if ifc_class not in elements_by_classes:
+                    continue
+                filtered_elements.update(elements_by_classes[ifc_class])
             if filtered_elements:
                 calculator.calculate(ifc_file, filtered_elements, qtos, results)
     return results
@@ -100,6 +110,55 @@ class SI2ProjectUnitConverter:
         return value
 
 
+class IteratorForTypes:
+    """Currently ifcopenshell.geom.iterator support only IfcProducts, so this
+    class is mimicking the iterator interface but works for IfcTypeProducts."""
+
+    element: Union[ifcopenshell.entity_instance, None] = None
+    shape: Union[ifcopenshell.geom.ShapeType, None] = None
+
+    def __init__(
+        self,
+        ifc_file: ifcopenshell.file,
+        settings: ifcopenshell.geom.settings,
+        elements: Iterable[ifcopenshell.entity_instance],
+    ):
+        self.settings = settings
+        self.elements = list(elements)
+        self.element = None
+        self.file = ifc_file
+        model = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Body", "MODEL_VIEW")
+        assert model
+        self.context = model
+
+    def initialize(self) -> bool:
+        return bool(self.next())
+
+    def get_element_and_geometry(self) -> tuple[ifcopenshell.entity_instance, ifcopenshell.geom.ShapeType]:
+        # get() is not implemented so it won't be confused with iteartor.get().
+        # The difference is important since create_shape for product types
+        # doesn't ouput SpapeElementType, only ShapeTypes.
+        assert self.element and self.shape
+        return (self.element, self.shape)
+
+    def next(self) -> bool:
+        if not self.elements:
+            return False
+        while self.elements:
+            element = self.elements.pop()
+            if self.process_shape(element):
+                return True
+        return False
+
+    def process_shape(self, element: ifcopenshell.entity_instance):
+        representation = ifcopenshell.util.representation.get_representation(element, self.context)
+        if not representation:
+            return False
+        self.shape = ifcopenshell.geom.create_shape(self.settings, representation)
+        self.element = element
+        return True
+
+
 class IfcOpenShell:
     """Calculates Model body context geometry using the default IfcOpenShell
     iterator on triangulation elements."""
@@ -189,44 +248,60 @@ class IfcOpenShell:
                     gross_or_net_qtos.setdefault(name, {})[quantity] = formula
                     formula_functions[formula] = getattr(ifcopenshell.util.shape, formula)
 
-        tasks: list[tuple[ifcopenshell.geom.iterator, QtosFormulas]] = []
+        tasks: list[tuple[Union[ifcopenshell.geom.iterator, IteratorForTypes], QtosFormulas]] = []
 
         if gross_qtos:
-            tasks.append((IfcOpenShell.create_iterator(ifc_file, cls.gross_settings, list(elements)), gross_qtos))
+            for iterator in IfcOpenShell.create_iterators(ifc_file, cls.gross_settings, list(elements)):
+                tasks.append((iterator, gross_qtos))
 
         if net_qtos:
-            tasks.append((IfcOpenShell.create_iterator(ifc_file, cls.net_settings, list(elements)), net_qtos))
+            for iterator in IfcOpenShell.create_iterators(ifc_file, cls.gross_settings, list(elements)):
+                tasks.append((iterator, net_qtos))
 
         cls.unit_converter = SI2ProjectUnitConverter(ifc_file)
 
         for iterator, qtos_ in tasks:
             if iterator.initialize():
                 while True:
-                    shape = iterator.get()
+                    if isinstance(iterator, ifcopenshell.geom.iterator):
-                    element = ifc_file.by_id(shape.id)
+                        shape = iterator.get()
+                        geometry = shape.geometry
+                        element = ifc_file.by_id(shape.id)
+                    else:
+                        element, geometry = iterator.get_element_and_geometry()
+
                     results.setdefault(element, {})
                     for name, quantities in qtos_.items():
                         results[element].setdefault(name, {})
                         for quantity, formula in quantities.items():
                             if formula == "get_segment_length":
-                                results[element][name][quantity] = cls.get_segment_length(ifc_file, shape)
+                                results[element][name][quantity] = cls.get_segment_length(element)
                             else:
                                 results[element][name][quantity] = cls.unit_converter.convert(
-                                    formula_functions[formula](shape.geometry),
+                                    formula_functions[formula](geometry),
                                     IfcOpenShell.raw_functions[formula].measure,
                                 )
                     if not iterator.next():
                         break
 
     @staticmethod
-    def create_iterator(
+    def create_iterators(
         ifc_file: ifcopenshell.file, settings: ifcopenshell.geom.settings, elements: list[ifcopenshell.entity_instance]
-    ) -> ifcopenshell.geom.iterator:
+    ) -> list[Union[ifcopenshell.geom.iterator, IteratorForTypes]]:
-        return ifcopenshell.geom.iterator(settings, ifc_file, multiprocessing.cpu_count(), include=elements)
+        elements_sorted: defaultdict[bool, list[ifcopenshell.entity_instance]] = defaultdict(list)
+        iterators = []
+        for element in elements:
+            elements_sorted[element.is_a("IfcTypeProduct")].append(element)
+        if True in elements_sorted:
+            iterators.append(IteratorForTypes(ifc_file, settings, elements_sorted[True]))
+        if False in elements_sorted:
+            iterators.append(
+                ifcopenshell.geom.iterator(settings, ifc_file, multiprocessing.cpu_count(), include=elements)
+            )
+        return iterators
 
     @classmethod
-    def get_segment_length(cls, ifc_file: ifcopenshell.file, shape) -> float:
+    def get_segment_length(cls, element: ifcopenshell.entity_instance) -> float:
-        element = ifc_file.by_id(shape.id)
         rep = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
         if rep and len(rep.Items or []) == 1 and rep.Items[0].is_a("IfcExtrudedAreaSolid"):
             item = rep.Items[0]