X-Git-Url: https://git.siccegge.de//index.cgi?p=master%2Fcool-versuchung.git;a=blobdiff_plain;f=cool.py;h=a4ccd1b797e45cc96034cc4f1988063c00c8abb5;hp=18ed21d850bbddce0139ca8ab8276f2d253ffc67;hb=8cc4bba85900a867db2a0b93d807032b29174244;hpb=0d5c7d931d1b5a5cb8a758ffb433726c930f4e4d

diff --git a/cool.py b/cool.py
index 18ed21d..a4ccd1b 100755
--- a/cool.py
+++ b/cool.py
@@ -19,7 +19,7 @@ def natural_key(string_):
 
 def parse_timedelta(strrep):
     minutes, seconds = strrep.split(":")
-    return seconds + 60 * minutes
+    return float(seconds) + 60 * float(minutes)
 
 
 class SolverExperiment(Experiment):
@@ -137,6 +137,7 @@ class ComparisonExperiment(Experiment):
                 command = command.split("<")[1].strip().strip('"')
                 formula = os.path.basename(command)
                 time = parse_timedelta(timeline.split(": ")[1].strip())
+                time = time if time > 0 else 0.001
                 memory = memoryline.split(": ")[1].strip()
                 csv.append([formula, time, memory])
         csv.flush()
@@ -154,6 +155,7 @@ class ComparisonExperiment(Experiment):
                       os.path.basename(self.inputs.treetab.metadata['formulas']))
             plt.yscale('log')
             plt.ylabel('time / s')
+            plt.ylim(0.001, 10000)
             plt.xlabel('problem size')
             plt.plot([x[0].split('.')[1] for x in self.outputs.cool_data.value],
                      [x[1] for x in self.outputs.cool_data.value],
@@ -161,11 +163,11 @@ class ComparisonExperiment(Experiment):
             plt.plot([x[0].split('.')[1] for x in self.outputs.treetab_data.value],
                      [x[1] for x in self.outputs.treetab_data.value],
                      'gv', label="TreeTab")
-            plt.legend()
             plt.plot([x[0].split('.')[1] for x in self.outputs.gmul_data.value],
                      [x[1] for x in self.outputs.gmul_data.value],
                      'r*', label="GMUL")
 
+            plt.legend(loc=2)
             plt.savefig('time.svg', format='svg')
             plt.close()
 
@@ -181,11 +183,11 @@ class ComparisonExperiment(Experiment):
             plt.plot([x[0].split('.')[1] for x in self.outputs.treetab_data.value],
                      [x[2] for x in self.outputs.treetab_data.value],
                      'gv', label="TreeTab")
-            plt.legend()
             plt.plot([x[0].split('.')[1] for x in self.outputs.gmul_data.value],
                      [x[2] for x in self.outputs.gmul_data.value],
                      'r*', label="GMUL")
 
+            plt.legend(loc=2)
             plt.savefig('memory.svg', format='svg')