Configurations for generation and new domain for generation ecore model

3 files changed, 7 insertions, 0 deletions

diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py b/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
index feb9a0a9..0a9a95c5 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
@@ -30,3 +30,6 @@ class GraphStat:
             self.id = (contents[constants.STATE_ID])[0]
         if constants.Node_TYPE_KEY in contents:
             self.nodeTypeStat = contents[constants.Node_TYPE_KEY]
+        if constants.VIOLATION in contents:
+            self.violations = int(contents[constants.VIOLATION][0])
+
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py b/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py
index 51e538f8..be115a05 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py
@@ -28,3 +28,5 @@ HUMAN_MPC_REP = '../input/humanOutput/R_2016324_run_1.csv'
 
 HUMAN_NA_REP = '../input/humanOutput/R_2017419_run_1.csv'
 
+VIOLATION = 'violations'
+
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py b/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
index 1cec2f0c..394168d8 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
@@ -30,6 +30,8 @@ def readcsvfile(filename):
             elif(arr[0] == constants.NODE_TYPE):
                 types = data[i+1].replace('\n', '').split(',')
                 numbers = data[i+2].replace('\n', '').split(',')
+                #convert number to floats
+                numbers = [float(n) for n in numbers]
                 contents[constants.Node_TYPE_KEY] = {t : n for t, n in zip(types, numbers)}
             # NA and OD are integers, and store other information as string
             else: