From 390a5995f3c1cc3e31b16ced937448758394c77d Mon Sep 17 00:00:00 2001 From: Marijn van Aerle Date: Sun, 22 Sep 2013 20:52:27 +0200 Subject: [PATCH 1/7] LGPL license --- LICENSE | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..02bbb60 --- /dev/null +++ b/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file From d4b847d9b871482dde2bc8ef47740ac56db5b2b9 Mon Sep 17 00:00:00 2001 From: Andreas Bresser Date: Fri, 18 Aug 2017 14:02:00 +0200 Subject: [PATCH 2/7] add gitignore for compiled python files, tox, egg... --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b6e4176 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.tox +*.pyc +*~ +.cache +*.egg-info \ No newline at end of file From bb9632db90eda18d8afecb184f9778c7aba844ac Mon Sep 17 00:00:00 2001 From: Andreas Bresser Date: Fri, 18 Aug 2017 14:02:14 +0200 Subject: [PATCH 3/7] added TODO --- TODO.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 TODO.md diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..01d398b --- /dev/null +++ b/TODO.md @@ -0,0 +1,6 @@ +- documentation (how to get items in your building etc.) +- create python-project and make installable as lib (setup.py) +- create tests (and tox for python3) +- python3 comp. (use print with baces etc.) +- better logging +- benchmarking-capabilities (+multi-core support) \ No newline at end of file From 5e8319c06c85fc26dd45f2bee8aace293ec0bc14 Mon Sep 17 00:00:00 2001 From: Andreas Bresser Date: Fri, 18 Aug 2017 14:16:18 +0200 Subject: [PATCH 4/7] Bugfix: not all elements have a 'supertype' --- ifcschemareader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ifcschemareader.py b/ifcschemareader.py index 527cb8b..cd62cdc 100644 --- a/ifcschemareader.py +++ b/ifcschemareader.py @@ -215,6 +215,8 @@ def getAttributes(self, name): this_ent_attrs = copy.copy(ent["attributes"]) this_ent_attrs.reverse() attrs.extend(this_ent_attrs) + if not 'supertype' in ent: + break ent = self.entities.get(ent["supertype"], None) attrs.reverse() From 9c579d3c9707cf458fcf6b67ea7ac002bac3d41d Mon Sep 17 00:00:00 2001 From: Andreas Bresser Date: Fri, 18 Aug 2017 15:44:48 +0200 Subject: [PATCH 5/7] Bugfix: store ids as list in entById, add benchmarking every 5 seconds --- ifcfilereader.py | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/ifcfilereader.py b/ifcfilereader.py index 2e409bd..2ee609f 100644 --- a/ifcfilereader.py +++ b/ifcfilereader.py @@ -28,20 +28,40 @@ def getEntityById(self, id): def getEntitiesByName(self, name): return self.entsByName.get(name, None) - def read(self): + def read(self, benchmark=True): """ Returns 2 dictionaries, entById and entsByName """ + if benchmark: + import time + first = last = time.time() + lines_done = 0 entById = {} entsByName = {} for line in self.file: e = self.parseLine(line) if e: - entById[int(e["id"])] = e - ids = e.get(e["name"],[]) - ids.append(e["id"]) - entsByName[e["name"]] = list(set(ids)) - + name = e['name'] + id = int(e['id']) + entById[id] = e + if name in entsByName: + entsByName[name].append(id) + else: + entsByName[name] = [id] + if benchmark: + now = time.time() + if now - last > 5: + print('{}: {} lines parsed {}/sec'.format( + int(now - first), lines_done, lines_done/(now-first))) + last = now + lines_done += 1 + + for name in entsByName.keys(): + entsByName[name] = list(set(entsByName[name])) + + if benchmark: + now = time.time() + print('done parsing {} lines after {} seconds'.format(lines_done, now-first)) return [entById, entsByName] def parseLine(self, line): From cc618b5b3e485f8405963519e4b287b6be0b1f06 Mon Sep 17 00:00:00 2001 From: Andreas Bresser Date: Fri, 18 Aug 2017 15:50:52 +0200 Subject: [PATCH 6/7] use '#id' for easier referencing --- ifcfilereader.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ifcfilereader.py b/ifcfilereader.py index 2ee609f..03b9fd0 100644 --- a/ifcfilereader.py +++ b/ifcfilereader.py @@ -2,6 +2,7 @@ import re from ifcschemareader import IfcSchema +from builtins import str IFCLINE_RE = re.compile("#(\d+)[ ]?=[ ]?(.*?)\((.*)\);[\\r]?$") @@ -23,6 +24,8 @@ def __init__(self, filename, schema): self.file.close() def getEntityById(self, id): + if isinstance(id, str) and id.startswith('#'): + return self.entById.get(int(id[1:]), None) return self.entById.get(id, None) def getEntitiesByName(self, name): From cccae2f1b20fd310d96783882b87c72c2bba978e Mon Sep 17 00:00:00 2001 From: Andreas Bresser Date: Fri, 18 Aug 2017 21:24:33 +0200 Subject: [PATCH 7/7] use basestring to check string instance, not str --- ifcfilereader.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ifcfilereader.py b/ifcfilereader.py index 03b9fd0..9cfc616 100644 --- a/ifcfilereader.py +++ b/ifcfilereader.py @@ -2,7 +2,7 @@ import re from ifcschemareader import IfcSchema -from builtins import str +from past.builtins import basestring IFCLINE_RE = re.compile("#(\d+)[ ]?=[ ]?(.*?)\((.*)\);[\\r]?$") @@ -11,7 +11,7 @@ class IfcFile: Parses an ifc file given by filename, entities can be retrieved by name and id The whole file is stored in a dictionary (in memory) """ - + entsById = {} entsByName = {} @@ -22,12 +22,12 @@ def __init__(self, filename, schema): self.entById, self.entsByName = self.read() print "Parsed from file %s: %s entities" % (self.filename, len(self.entById)) self.file.close() - + def getEntityById(self, id): - if isinstance(id, str) and id.startswith('#'): + if isinstance(id, basestring) and id.startswith('#'): return self.entById.get(int(id[1:]), None) return self.entById.get(id, None) - + def getEntitiesByName(self, name): return self.entsByName.get(name, None) @@ -61,7 +61,7 @@ def read(self, benchmark=True): for name in entsByName.keys(): entsByName[name] = list(set(entsByName[name])) - + if benchmark: now = time.time() print('done parsing {} lines after {} seconds'.format(lines_done, now-first)) @@ -69,14 +69,14 @@ def read(self, benchmark=True): def parseLine(self, line): """ - Parse a line - """ + Parse a line + """ m = IFCLINE_RE.search(line) # id,name,attrs if m: id, name, attrs = m.groups() else: return False - + return {"id": id, "name": name, "attributes": self.parseAttributes(name, attrs)} def parseAttributes(self, ent_name, attrs_str): @@ -85,20 +85,20 @@ def parseAttributes(self, ent_name, attrs_str): """ parts = [] lastpos = 0 - + while lastpos < len(attrs_str): newpos = self.nextString(attrs_str, lastpos) parts.extend(self.parseAttribute(attrs_str[lastpos:newpos-1])) lastpos = newpos - + schema_attributes = self.schema.getAttributes(ent_name) # assert len(schema_attributes) == len(parts), \ # "Expected %s attributes, got %s (entity: %s" % \ # (len(schema_attributes), len(parts), ent_name) - + attribute_names = [a[0] for a in schema_attributes] - + return dict(zip(attribute_names, parts)) def parseAttribute(self, attr_str): @@ -124,7 +124,7 @@ def parseAttribute(self, attr_str): parts.append(s) # ref, enum or other lastpos = newpos - + return parts @@ -147,8 +147,8 @@ def nextString(self, s, start): quotes = 1 elif c =="\'" and quotes == 1: quotes = 0 - - return len(s)+1 + + return len(s)+1 @@ -164,6 +164,6 @@ def nextString(self, s, start): ifcfile = IfcFile("testdata/AC11-FZK-Haus-IFC.ifc", schema) t2 = time.time() print "Loading file took: %s s \n" % ((t2-t1)) - + print ifcfile.getEntityById(233), "\n" print ifcfile.getEntityById(216), "\n"