3 files changed, 17 insertions, 0 deletions

diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py b/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
index 41054294..48d96ccc 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py
@@ -12,6 +12,8 @@ class GraphCollection:
         self.mpcs = []
         self.nts = []
         self.name = name
+        self.tccs = []
+        self.violations = []
         models = reader.readmultiplefiles(path, number, shouldShuffle)
         print(len(models))
         self.size = len(models)
@@ -22,6 +24,10 @@ class GraphCollection:
             self.mpcs.append(mpc)
             if(constants.Node_TYPE_KEY in contents):
                 self.nts.append(contents[constants.Node_TYPE_KEY])
+            if(constants.TCC_VALUE in contents):
+                self.tccs.append(contents[constants.TCC_VALUE])
+            if(constants.VIOLATION in contents):
+                self.violations.append(contents[constants.VIOLATION][0])
 
 #Graph stat for one graph
 class GraphStat:
@@ -35,4 +41,6 @@ class GraphStat:
             self.nodeTypeStat = contents[constants.Node_TYPE_KEY]
         if constants.VIOLATION in contents:
             self.violations = int(contents[constants.VIOLATION][0])
+        if(constants.TCC_VALUE_KEY in contents):
+            self.tcc = contents[constants.TCC_VALUE_KEY]
 
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py b/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py
index be115a05..e30cc583 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/constants.py
@@ -30,3 +30,6 @@ HUMAN_NA_REP = '../input/humanOutput/R_2017419_run_1.csv'
 
 VIOLATION = 'violations'
 
+TCC_VALUE= 'TCCValue'
+
+TCC_COUNT = 'TCCCount'
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py b/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
index 394168d8..a56caf45 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
+++ b/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py
@@ -33,6 +33,8 @@ def readcsvfile(filename):
                 #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)}
+            elif(arr[0] == constants.TCC_VALUE):
+                contents[constants.TCC_VALUE] = list(map(float, arr[1:]))
             # NA and OD are integers, and store other information as string
             else:
                 try:
@@ -79,6 +81,10 @@ def getmetrics(filename):
     outdegree_sample = reproduceSample(contents[constants.OUT_DEGREE_VALUE], contents[constants.OUT_DEGREE_COUNT])
     na_sample = reproduceSample(contents[constants.NA_VALUE], contents[constants.NA_COUNT])
     mpc_sample = reproduceSample(contents[constants.MPC_VALUE], contents[constants.MPC_COUNT])
+
+    if(constants.TCC_VALUE in contents):
+        contents[constants.TCC_VALUE] = reproduceSample(contents[constants.TCC_VALUE], contents[constants.TCC_COUNT])
+
     return contents,outdegree_sample, na_sample, mpc_sample
 
 #