Merge pull request #58 from bmwcarit/57-print_messages

prints replaced with Scoutmessages, deleted unused funcition
bmwcarit · May 18, 2020 · aa81903 · aa81903
2 parents 0abb999 + 4a54e7e
commit aa81903
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/Emma/emma_delta_libs/FilePresenter.py b/Emma/emma_delta_libs/FilePresenter.py
@@ -82,15 +82,15 @@ def __printCandidates(candidates) -> None:
             print(string)
 
     @staticmethod
-    def __printSelectedFiles( paths: typing.List[str]) -> None:
+    def __printSelectedFiles(paths: typing.List[str]) -> None:
         sc().info("Selected files:")
         for path in paths:
             pathSplit: typing.List[str] = os.path.split(path)
             version: str = os.path.split(os.path.split(pathSplit[0])[0])[1]
             file: str = pathSplit[1]
             string = "    " + version + " - " + file
-            print(string)
+            sc().info(string)
 
     def __printFileType(self) -> None:
         for i, file in self.__filetypes.items():
-            print("    " + str(i) + ": " + file)
+            sc().info("    " + str(i) + ": " + file)
diff --git a/Emma/emma_vis.py b/Emma/emma_vis.py
@@ -228,6 +228,7 @@ def main(arguments):
     gc.collect()
 
     sc().info("\n", consumptionImage.calcConsumptionByMemType())
+    sc().info("\n", consumptionImage.calcConsumptionByMemTypeDetailed())
 
     # FIXME: Deactivated; colours of legend in figure not correct - possibly this figure is not even needed/useful (MSc)
     # categorisedImage.plotNdisplay(plotShow=False)

diff --git a/Emma/emma_vis_libs/dataVisualiserCategorisedSections.py b/Emma/emma_vis_libs/dataVisualiserCategorisedSections.py
@@ -102,6 +102,7 @@ def __calcUsedByModulesInImage(self):
 
         return usedByModulesInImage
 
+    # FIXME: Function not used (DP)
     def __groupCategorisedImage(self):
         """
         Function to group __categorisedImage
@@ -111,7 +112,7 @@ def __groupCategorisedImage(self):
         groupedImage = groupedImage.groupby([CONFIG_ID, MEM_TYPE, CATEGORY, SECTION_NAME, SECTION_SIZE_BYTE, OBJECT_NAME]).sum()
         return groupedImage
 
-    # FIXME: Colours of the legend are not working (MSc)
+    # FIXME: Colours of the legend are not working (MSc), function not used (DP)
     def displayUsedByModulesInImage(self):
         """
         Creates the figure for the plot.
@@ -164,20 +165,23 @@ def displayUsedByModulesInImage(self):
 
         return barGraph.get_figure()
 
+    # FIXME: Function not used (DP)
     def printModulesInImage(self):
         """
         Print wrapper for self.__usedByModulesInImage
         :return: nothing
         """
         print(self.__usedByModulesInImage)
 
+    # FIXME: Function not used (DP)
     def printCategorisedImage(self):
         """
         Print wrapper for self.__usedByModulesInImage
         :return: nothing
         """
         print(self.__categorisedImage)
 
+    # FIXME: Function not used (DP)
     def appendCategorisedImageToMarkdownOverview(self, markdownFilePath):
         """
         Appends categorisedImage to the markdown file

diff --git a/Emma/emma_vis_libs/dataVisualiserObjects.py b/Emma/emma_vis_libs/dataVisualiserObjects.py
@@ -43,6 +43,7 @@ def __init__(self, projectPath, fileToUse, resultsPath):
         self.project = os.path.split(projectPath)[-1]
         self.consumptionByCategorisedModules = self.calcConsumptionByCategorisedModules()
 
+    # FIXME: function not used (DP)
     def printCategorisedModules(self):
         print(self.consumptionByCategorisedModules)
 

diff --git a/Emma/emma_vis_libs/dataVisualiserSections.py b/Emma/emma_vis_libs/dataVisualiserSections.py
@@ -230,14 +230,6 @@ def writeReportToFile(self):
         title = self.project + "-Memory_Report_by_configID-memType"
         self.__appendStatsConsumption(self.consumptionByMemType, title)
 
-    def printStats(self):
-        """
-        Print all three consumption lists
-        """
-        print(self.consumptionByMemType)
-        print(self.consumptionByMemTypeDetailed)
-        print(self.consumptionByMemTypePerMap)
-
     def plotByMemType(self, plotShow=True):
         """
         function to display and save to file the figure created in self.displayConsumptionByMemType()