3 files changed, 19 insertions, 7 deletions

diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py b/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
index d6bdad0d..feb9a0a9 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
@@ -25,6 +25,8 @@ class GraphStat:
     # init with teh file name of the stat
     def __init__(self, filename):
         contents, self.out_d, self.na, self.mpc = reader.getmetrics(filename)
-        self.num_nodes = np.array(contents[constants.NUMBER_NODES])
+        self.numNodes = np.array(contents[constants.NUMBER_NODES])
         if constants.STATE_ID in contents:
             self.id = (contents[constants.STATE_ID])[0]
+        if constants.Node_TYPE_KEY in contents:
+            self.nodeTypeStat = contents[constants.Node_TYPE_KEY]
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py b/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py
index aba81b13..51e538f8 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py
@@ -18,8 +18,13 @@ METAMODEL = 'Meta Mode'
 
 STATE_ID = 'State Id'
 
+NODE_TYPE = 'Node Type'
+
+Node_TYPE_KEY = 'NodeType'
+
 HUMAN_OUT_D_REP = '../input/humanOutput/R_2015225_run_1.csv'
 
 HUMAN_MPC_REP = '../input/humanOutput/R_2016324_run_1.csv'
 
 HUMAN_NA_REP = '../input/humanOutput/R_2017419_run_1.csv'
+
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py b/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
index 33378ce5..1cec2f0c 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
@@ -13,8 +13,10 @@ def readcsvfile(filename):
     
     contents = {}
     with open(filename) as f:
-        for i, line in enumerate(f):
-            arr = line.split(',')
+        data = list(f)
+        f.close()
+        for i, line in enumerate(data):
+            arr = line.replace('\n', '').split(',')
             # if there is no element in the line, continue
             if len(line) < 0: continue
             # else check for contents
@@ -24,14 +26,17 @@ def readcsvfile(filename):
             # meta models are string
             elif(arr[0] == constants.METAMODEL):
                 contents[constants.METAMODEL] = arr[1:]
-            # NA and OD are integers
+            # Node types
+            elif(arr[0] == constants.NODE_TYPE):
+                types = data[i+1].replace('\n', '').split(',')
+                numbers = data[i+2].replace('\n', '').split(',')
+                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:
                 try:
                     contents[arr[0]] = list(map(int, arr[1:]))
                 except:
-                    message = arr[0], ' is not integer'
-                    #print(message)
-    f.close()
+                    contents[arr[0]] = arr[1:]
     return contents
 
 def checkAndReshape(arr):