From 9c4c274b23ea3efaa6bb2a0577e787b78d156dce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Wi=C3=9Fmann?= <edu@thorsten-wissmann.de>
Date: Sat, 1 Feb 2014 02:15:33 +0100
Subject: [PATCH] Improve testscripts
---
benchmarks/scripts/dotestGML.sh | 41 ++++++++++++++++++---------------
benchmarks/scripts/dotestK.sh | 3 +++
2 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/benchmarks/scripts/dotestGML.sh b/benchmarks/scripts/dotestGML.sh
index e276c43..0f4c5c1 100755
--- a/benchmarks/scripts/dotestGML.sh
+++ b/benchmarks/scripts/dotestGML.sh
@@ -1,25 +1,28 @@
#!/bin/bash
-logic=GML
+dir=$HOME/.www/cool/noon/
-while sleep 0.1 ; do
+ulimit -S -m 6000000
+ulimit -H -m 6000000
-for T in {0..2} ; do
-for d in {6..10} ; do
-
-echo
-echo "=== d=$d ==="
-
- ~/git/cool-solver/randcool/dist/build/randcool/randcool \
- -G \
- --modal-depth-tbox 2 -T 0 -n 2 \
- --max-conjuncts 6 \
- --max-disjuncts 6 \
- -d $d \
- > input
-
- ./coalgcompare --timeout 300 generic$logic < input | tee -a ${logic}-d${d}-T${T}
-done
-done
+while sleep 0.2 ; do
+ for T in 0 1 2 ; do
+ for d in {3..15} ; do
+ echo
+ echo "=== d=$d T=$T ==="
+ ~/git/cool-solver/randcool/dist/build/randcool/randcool \
+ -G \
+ --no-toplevel-disj-form \
+ --no-toplevel-conj-tbox \
+ --modal-depth-tbox 2 -T 0 -n 2 \
+ --max-conjuncts 6 \
+ --max-disjuncts 6 \
+ -d $d \
+ > input
+ ./coalgcompare --timeout 300 genericGML < input \
+ | tee -a $dir/GML-d${d}-T${T}.${HOSTNAME} \
+ || break
+ done
+ done
done
diff --git a/benchmarks/scripts/dotestK.sh b/benchmarks/scripts/dotestK.sh
index 9417cc2..20979dd 100755
--- a/benchmarks/scripts/dotestK.sh
+++ b/benchmarks/scripts/dotestK.sh
@@ -2,6 +2,9 @@
dir=$HOME/.www/cool/noon/
+ulimit -S -m 6000000
+ulimit -H -m 6000000
+
while sleep 0.2 ; do
for T in 5 ; do
for d in {8..15} ; do
--
GitLab