Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 06:39:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Read from model precision to determine tolerance when doing diffs

Browse Source
This commit is contained in:
Dion Moult
2020-04-21 17:29:47 +10:00
parent ee69bfedcb
commit 048966bda2
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcdiff/ifcdiff.py
+18 -4
View File
@@ -6,6 +6,7 @@ from deepdiff import DeepDiff
import time import time
import json import json
import argparse import argparse
import decimal
class IfcDiff(): class IfcDiff():
@@ -16,11 +17,14 @@ class IfcDiff():
self.change_register = {} self.change_register = {}
self.representation_ids = [] self.representation_ids = []
self.inverse_classes = inverse_classes self.inverse_classes = inverse_classes
self.precision = 2
def diff(self): def diff(self):
print('# IFC Diff') print('# IFC Diff')
self.load() self.load()
self.precision = self.get_precision()
old_elements = set(e.GlobalId for e in self.old.by_type('IfcProduct')) old_elements = set(e.GlobalId for e in self.old.by_type('IfcProduct'))
new_elements = set(e.GlobalId for e in self.new.by_type('IfcProduct')) new_elements = set(e.GlobalId for e in self.new.by_type('IfcProduct'))
@@ -71,9 +75,19 @@ class IfcDiff():
print('Loading new file ...') print('Loading new file ...')
self.new = ifcopenshell.open(self.new_file) self.new = ifcopenshell.open(self.new_file)
def get_precision(self):
try:
precision = [c for c in self.new.by_type('IfcGeometricRepresentationContext') if c.ContextType == 'Model'][0].Precision
exponent = decimal.Decimal(str(precision)).as_tuple().exponent
if exponent < 0:
return abs(exponent)
return 0
except:
return 2
def diff_element(self, old_element, new_element): def diff_element(self, old_element, new_element):
diff = DeepDiff(old_element, new_element, diff = DeepDiff(old_element, new_element,
significant_digits=2, ignore_string_type_changes=True, ignore_numeric_type_changes=True, significant_digits=self.precision, ignore_string_type_changes=True, ignore_numeric_type_changes=True,
exclude_regex_paths=[ exclude_regex_paths=[
r'root.*id$', r'root.*id$',
r'.*Representation.*', r'.*Representation.*',
@@ -96,7 +110,7 @@ class IfcDiff():
new_relationships = [x for x in new_relationships_all if x.is_a() in self.inverse_classes] new_relationships = [x for x in new_relationships_all if x.is_a() in self.inverse_classes]
diff = DeepDiff(old_relationships, new_relationships, diff = DeepDiff(old_relationships, new_relationships,
significant_digits=2, ignore_string_type_changes=True, ignore_numeric_type_changes=True, significant_digits=self.precision, ignore_string_type_changes=True, ignore_numeric_type_changes=True,
exclude_regex_paths=[ exclude_regex_paths=[
r'root.*id$', r'root.*id$',
r'.*GlobalId.*', r'.*GlobalId.*',
@@ -113,12 +127,12 @@ class IfcDiff():
try: try:
DeepDiff(old_element.ObjectPlacement, new_element.ObjectPlacement, DeepDiff(old_element.ObjectPlacement, new_element.ObjectPlacement,
terminate_on_first=True, terminate_on_first=True,
significant_digits=2, ignore_string_type_changes=True, ignore_numeric_type_changes=True, significant_digits=self.precision, ignore_string_type_changes=True, ignore_numeric_type_changes=True,
exclude_regex_paths=r'root.*id$') exclude_regex_paths=r'root.*id$')
DeepDiff(old_element.Representation, new_element.Representation, DeepDiff(old_element.Representation, new_element.Representation,
terminate_on_first=True, terminate_on_first=True,
skip_after_n=1000, # Arbitrary value to "skim" check skip_after_n=1000, # Arbitrary value to "skim" check
significant_digits=2, ignore_string_type_changes=True, ignore_numeric_type_changes=True, significant_digits=self.precision, ignore_string_type_changes=True, ignore_numeric_type_changes=True,
exclude_regex_paths=r'root.*id$') exclude_regex_paths=r'root.*id$')
except: except:
if new_element.GlobalId: if new_element.GlobalId: