Abaissement du niveau d'optimisation de la compilation des modules python pour conser...

[minwii.git] / src / minwii / loganalyse.py

diff --git a/src/minwii/loganalyse.py b/src/minwii/loganalyse.py
index 03d0837..ec1b025 100755 (executable)
--- a/src/minwii/loganalyse.py
+++ b/src/minwii/loganalyse.py
@@ -9,12 +9,15 @@ $URL$
 from minwii.logfilereader import LogFileReader
 from pprint import pprint
 from minwii.musicxml import musicXml2Song
 from minwii.logfilereader import LogFileReader
 from pprint import pprint
 from minwii.musicxml import musicXml2Song

+from minwii.globals import PLAYING_MODES

 from statlib import stats
 from datetime import timedelta
 
 from statlib import stats
 from datetime import timedelta
 

+PLAYING_MODES = dict(PLAYING_MODES)
+

 DEFAULT_STATS = (#'geometricmean',
 DEFAULT_STATS = (#'geometricmean',

-                 #'harmonicmean',
-                 #'mean',
+                 ('harmonicmean', 'Moyenne harmonique'),
+                 ('mean', 'Moyenne  '),

                  ('median', 'Médiane'),
                  #'medianscore',
                  #'mode',
                  ('median', 'Médiane'),
                  #'medianscore',
                  #'mode',


@@ -69,7 +72,7 @@ class LogFileAnalyser(LogFileReader) :
         
         try :
             self.mode = mode = self.getMode()
         
         try :
             self.mode = mode = self.getMode()

-            results.append(('Mode de jeu', mode))
+            results.append(('Mode de jeu', PLAYING_MODES.get(mode, mode)))

             for name in self.POSSIBLE_ANALYSES[mode] :
                 meth = getattr(self, name)
                 results.append((meth.__doc__, meth()))
             for name in self.POSSIBLE_ANALYSES[mode] :
                 meth = getattr(self, name)
                 results.append((meth.__doc__, meth()))