From 1450d51c24b6c5d86f3f2f0e906e315692a20b76 Mon Sep 17 00:00:00 2001
From: imcovangent <I.vanGent@tudelft.nl>
Date: Wed, 25 Apr 2018 17:01:56 +0200
Subject: [PATCH] Temporary bug fix and performance improvement in loading of
CMDOWS file related to the use of the 'relatedInstanceUID'.
Former-commit-id: d48e635b804fc07408025b79197854f1542f8f7f
---
kadmos/graph/graph_kadmos.py | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/kadmos/graph/graph_kadmos.py b/kadmos/graph/graph_kadmos.py
index 86ac775ac..0ec9326ac 100644
--- a/kadmos/graph/graph_kadmos.py
+++ b/kadmos/graph/graph_kadmos.py
@@ -1259,10 +1259,18 @@ class KadmosGraph(nx.DiGraph, EquationMixin, VistomsMixin):
for variable in cmdows.findall('parameters/parameter'):
uid = variable.get('uID').replace("'", '"')
- if variable.findtext('relatedInstanceUID'):
- related_variable = cmdows.xpath(get_uid_search_xpath(variable.findtext('relatedInstanceUID')))[0]
- else:
- related_variable = variable
+ # TODO: Adjust this to improve performance, xpath search takes too long now...
+ # TODO: Handle case of having the relatedInstanceUID missing
+ # if variable.findtext('relatedInstanceUID'):
+ # print variable
+ # related_variable_els = cmdows.xpath(get_uid_search_xpath(variable.findtext('relatedInstanceUID')))
+ # # If loop to catch issue when the related UID does not exist
+ # if related_variable_els:
+ # related_variable = related_variable_els[0]
+ # else:
+ # related_variable = variable
+ # else:
+ related_variable = variable
self.add_node(uid,
category='variable',
--
GitLab