refactor

comparisons/flow_by_flow.py

@@ -16,16 +16,15 @@ class FlowByFlow(ComparisonMethod):
     def init(self, args: list):
         self.supported_tools: Tuple[str] = args[0]
 
-    def handle_flow_by_flow_comparison(self):
+    def compare(self):
         self.log('', "-" * 30)
         self.log("Comparison method: ", self.name)
         self.log(' ', ' ')
 
-        # now apply this method to all supported tools
+        # apply this method to all supported tools
         for tool in self.supported_tools:
-            # get the actual and predicted labels by the tool
             calc = Calculator(tool, self.output_dir)
-
+            # get the actual and predicted labels by the tool
             labels: Iterator = self.get_labels(tool)
             cm: dict = calc.get_confusion_matrix(labels)
             self.db.store_performance_errors_flow_by_flow(tool, cm)

comparisons/per_timewindow.py

@@ -14,7 +14,7 @@ def init(self, args: list):
         self.supported_tools: Tuple[str] = args[0]
         self.last_registered_tw: int = self.db.get_last_registered_timewindow()
 
-    def handle_per_tw_comparison(self):
+    def compare(self):
         self.log('', "-" * 30)
         self.log("Comparison method: ", self.name)
         self.log(' ', ' ')

main.py

@@ -253,10 +253,10 @@ def main(self):
 
             FlowByFlow(self.output_dir,
                        self.supported_tools
-                       ).handle_flow_by_flow_comparison()
+                       ).compare()
             PerTimewindow(self.output_dir,
                           self.supported_tools
-                          ).handle_per_tw_comparison()
+                          ).compare()
 
         self.db.close()