From 87e51e04b5ea492af71df15544f66b2ee398f7af Mon Sep 17 00:00:00 2001
From: Mavo <matthias.volk@rwth-aachen.de>
Date: Tue, 9 Feb 2016 14:01:35 +0100
Subject: [PATCH] Improved benchmark script

Former-commit-id: 78f0d49a03b3f6157e7c56577dfe0bd58d00bb0f
---
 benchmark_dft.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/benchmark_dft.py b/benchmark_dft.py
index 1b8e29972..7fe59a276 100644
--- a/benchmark_dft.py
+++ b/benchmark_dft.py
@@ -13,10 +13,16 @@ EXAMPLE_DIR= "/Users/mvolk/develop/storm/examples/dft/"
 benchmarks = [ 
     ("and", False, [3, 1]),
     ("and_param", True, ["(4*x^2+2*x+1)/((x) * (2*x+1))", "1"]),
+    ("cardiac", False, [11378, 1]),
+    ("cas", False, [0.859736, 1]),
     ("cm2", False, [0.256272, 1]),
     #("cm4", False, [0, 1]),
     ("cps", False, ["inf", 0.333333]),
-    #("fdep", False, [0, 1]),
+    ("deathegg", False, [46.667, 1]),
+    ("fdep", False, [0.666667, 1]),
+    #("ftpp_complex", False, [0, 1]), # Compute
+    #("ftpp_large", False, [0, 1]), # Compute
+    #("ftpp_standard", False, [0, 1]), # Compute
     ("mdcs", False, [2.85414, 1]),
     ("mdcs2", False, [2.85414, 1]),
     ("mp", False, [1.66667, 1]),
@@ -59,8 +65,7 @@ def run_storm_dft(filename, prop, parametric, quiet):
     # Get result
     match = re.search(r'Result: \[(.*)\]', output)
     if not match:
-        print("No valid result found in: " + output)
-        return
+        return None
     
     result = match.group(1)
     return result
@@ -98,6 +103,10 @@ if __name__ == "__main__":
             if args.debuglevel > 0:
                 print("Running '{}' with property '{}'".format(benchmark, prop))
             result = run_storm_dft(benchmark, prop, parametric, args.debuglevel<2)
+            if result is None:
+                print("Error occurred on example '{}' with property '{}'".format(benchmark, prop))
+                continue
+
             if not parametric:
                 # Float
                 result = float(result)