Merge branch 'master' of gitlab.inria.fr:moex/pysake

data/aggsimpleruns.py

@@ -9,6 +9,23 @@ sep = os.environ.get("sep", " ") # default to space
 
 ####### All this for legacy experiences
 
+# Returns the prefix of the files in the results directory of the experience 'label'
+# prefix could be label+nbAgents+nbIterations or just nbAgents+nbIterations
+def getResultsFilePrefix(results_directory,label,extension,nbagents,nbiterations):
+    
+    if label == '20170529-NOOR':
+        prefix = '20170530-NOOR-'+nbagents+'-'+nbiterations+'-'
+    else:    
+        prefix = label+'-'+nbagents+'-'+nbiterations+'-'
+    
+        for filename in os.listdir( results_directory ):
+            if filename.endswith( extension ):
+                if not filename.startswith( prefix ):       
+                    prefix = nbagents+'-'+nbiterations+'-'
+                    break
+                    
+    return prefix
+
 # This to compute incoherence from txt file
 def getIncoherenceFromFile(filenamePath):
     with open(filenamePath,"r") as file:
@@ -54,9 +71,13 @@ def getAllKeys(results_dir,ops,postfix):
     return allKeys
 
 def getOpFromFile(filename,ops):
-    for op in ops:
-        if re.search(r'\b'+op+r'\b',filename):
-            return op
+
+    if re.search(r'\b'+'nothing'+r'\b',filename):
+        return 'nothing'
+    else:
+        for op in ops:
+            if re.search(r'\b'+op+r'\b',filename):
+                return op
             #return str(ops.index(op))+op
     return 'noop'
     

plots/plotreing.py

@@ -6,7 +6,8 @@ import re
 
 import pysake.data.measures as meas
 
-dict_ops = {'Size':['Size','size'],'size':['Size','size'],'Success\\ rate':['Succes rate','srate'],'Success~rate':['Succes rate','srate'],'Success$~$rate':['Succes rate','srate'],'Success':['Succes rate','srate'],'F$-$measure':['F-measure','fmeas'],'Prec':['Precision','prec'],'Precicion':['Precision','prec'],'Precision':['Precision','prec'],'Rec':['Recall','rec'],'Recall':['Recall','rec']}
+#dict_ops = {'Size':['Size','size'],'size':['Size','size'],'Success\\ rate':['Succes rate','srate'],'Success~rate':['Succes rate','srate'],'Success$~$rate':['Succes rate','srate'],'Success':['Succes rate','srate'],'F$-$measure':['F-measure','fmeas'],'Prec':['Precision','prec'],'Precicion':['Precision','prec'],'Precision':['Precision','prec'],'Rec':['Recall','rec'],'Recall':['Recall','rec']}
+dict_ops = {'size':['Size','size'],'successrate':['Succes rate','srate'],'f-measure':['F-measure','fmeas'],'precision':['Precision','prec'],'recall':['Recall','rec']}
 
 sep = os.environ.get("sep", " ") # default to space