Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-18 22:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Continue to revise optimisation of remove_deep to fix failing tests after a8729933

Browse Source
This commit is contained in:
Dion Moult
2024-05-23 22:54:19 +10:00
parent 3c42962635
commit 02cae9c7c2
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/util/element.py
+13 -2
View File
@@ -1315,8 +1315,19 @@ def remove_deep2(
:type element: ifcopenshell.entity_instance :type element: ifcopenshell.entity_instance
""" """
# ifc_file.batch() # ifc_file.batch()
if ifc_file.get_total_inverses(element): also_considered_inverses = 0
def increment_considered_inverses(_):
nonlocal also_considered_inverses
also_considered_inverses += 1
for considered_element in also_consider:
for attribute in considered_element:
considered_element.walk(lambda x: x == element, increment_considered_inverses, attribute)
if ifc_file.get_total_inverses(element) > 0 + also_considered_inverses:
return return
to_delete = set() to_delete = set()
subgraph = list(ifc_file.traverse(element, breadth_first=True)) subgraph = list(ifc_file.traverse(element, breadth_first=True))
subgraph.extend(also_consider) subgraph.extend(also_consider)
@@ -1328,7 +1339,7 @@ def remove_deep2(
subelement.id() subelement.id()
and subelement not in do_not_delete and subelement not in do_not_delete
and ( and (
# 0 or 1 inverses means it only exists in this subgraph # 0 or 1 inverses guarantees that the subelement only exists in this subgraph
ifc_file.get_total_inverses(subelement) < 2 ifc_file.get_total_inverses(subelement) < 2
# Alternatively, let's ensure all inverses are within the subgrpah # Alternatively, let's ensure all inverses are within the subgrpah
or len(set(ifc_file.get_inverse(subelement)) - subgraph_set) == 0 or len(set(ifc_file.get_inverse(subelement)) - subgraph_set) == 0