From 3636b9ac0d1483ba5731230fba3cd3bd1250fba3 Mon Sep 17 00:00:00 2001 From: Mavo Date: Wed, 10 Feb 2016 09:49:09 +0100 Subject: [PATCH] Added more benchmarks Former-commit-id: b6936dfb7b8f0095aaa9678e9cae2f26ee8cd8b3 --- benchmark_dft.py | 8 ++++++-- examples/dft/pdep2.dft | 9 +++++++++ examples/dft/symmetry.dft | 8 ++++++++ examples/dft/symmetry2.dft | 8 ++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 examples/dft/pdep2.dft create mode 100644 examples/dft/symmetry.dft create mode 100644 examples/dft/symmetry2.dft diff --git a/benchmark_dft.py b/benchmark_dft.py index 54dadeacc..d2c43bf80 100644 --- a/benchmark_dft.py +++ b/benchmark_dft.py @@ -6,8 +6,8 @@ import time import math import argparse -STORM_PATH= "/Users/mvolk/develop/storm/build/src/storm-dft" -EXAMPLE_DIR= "/Users/mvolk/develop/storm/examples/dft/" +STORM_PATH= "/Users/mvolk/develop/dft-storm/build/src/storm-dft" +EXAMPLE_DIR= "/Users/mvolk/develop/dft-storm/examples/dft/" benchmarks = [ @@ -30,6 +30,8 @@ benchmarks = [ ("or", False, [1, 1]), ("pand", False, ["inf", 0.666667]), ("pand_param", True, ["-1", "(x)/(y+x)"]), + ("pdep", False, [0, 1]), #Compute + ("pdep2", False, [0, 1]), #Compute ("spare", False, [3.53846, 1]), ("spare2", False, [1.86957, 1]), ("spare3", False, [1.27273, 1]), @@ -37,6 +39,8 @@ benchmarks = [ ("spare5", False, [2.66667, 1]), # We discard the result 2.16667 from DFTCalc ("spare6", False, [1.4, 1]), ("spare7", False, [3.67333, 1]), + ("symmetry", False, [4.16667, 1]), + ("symmetry2", False, [3.06111, 1]), ("tripple_and1", False, [4.16667, 1]), ("tripple_and2", False, [3.66667, 1]), ("tripple_and2_c", False, [3.6667, 1]), diff --git a/examples/dft/pdep2.dft b/examples/dft/pdep2.dft new file mode 100644 index 000000000..ab1c7a9b8 --- /dev/null +++ b/examples/dft/pdep2.dft @@ -0,0 +1,9 @@ +toplevel "SF"; +"SF" or "A" "B" "PDEP"; +"A" pand "S" "MA"; +"B" and "MA" "MB"; +"PDEP" pdep=0.2 "MA" "S" "MB"; + +"S" lambda=0.5 dorm=0; +"MA" lambda=0.5 dorm=0; +"MB" lambda=0.5 dorm=0; diff --git a/examples/dft/symmetry.dft b/examples/dft/symmetry.dft new file mode 100644 index 000000000..6f4031d0b --- /dev/null +++ b/examples/dft/symmetry.dft @@ -0,0 +1,8 @@ +toplevel "A"; +"A" and "B" "B'"; +"B" and "C" "D"; +"B'" and "C'" "D'"; +"C" lambda=0.5 dorm=0; +"D" lambda=0.5 dorm=0; +"C'" lambda=0.5 dorm=0; +"D'" lambda=0.5 dorm=0; diff --git a/examples/dft/symmetry2.dft b/examples/dft/symmetry2.dft new file mode 100644 index 000000000..6d04021bb --- /dev/null +++ b/examples/dft/symmetry2.dft @@ -0,0 +1,8 @@ +toplevel "A"; +"A" and "B" "B'"; +"B" and "C" "D"; +"B'" and "C'" "D'"; +"C" lambda=0.5 dorm=0; +"D" lambda=2 dorm=0; +"C'" lambda=0.5 dorm=0; +"D'" lambda=2 dorm=0;