From: Hamed Gorjiara Date: Thu, 6 Sep 2018 21:04:38 +0000 (-0700) Subject: Editing the script and .gitignore X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f1376b903730f156a1e1dd6ce669ab77c8da349;p=Benchmarks_CSolver.git Editing the script and .gitignore --- diff --git a/.gitignore b/.gitignore index 501f43e1..d008c06f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ decamouflage/ flow_solver/ numberlink/ slither-link-sat/ +satPlan2006/ # Format DUMP* @@ -17,4 +18,5 @@ DUMP* */.pydevproject */log_file *.pyc -*.csv +/*/*.csv +/*/*.log diff --git a/common.sh b/common.sh index d133fa25..b53fb395 100755 --- a/common.sh +++ b/common.sh @@ -3,4 +3,4 @@ OFILE=result.csv TEMP="temp.out" DUMPDIR="dumps" -TIMEMAX=20s \ No newline at end of file +TIMEMAX=5000s diff --git a/hexiom/.gitignore b/hexiom/.gitignore index ec91c9c6..7b3bd315 100644 --- a/hexiom/.gitignore +++ b/hexiom/.gitignore @@ -1,4 +1,5 @@ *.pyc +*.csv .project .pydevproject diff --git a/hexiom/parse.sh b/hexiom/parse.sh index dada967a..10e5d6dd 100755 --- a/hexiom/parse.sh +++ b/hexiom/parse.sh @@ -28,6 +28,7 @@ while IFS='' read -r line || [[ -n "$line" ]]; do if [[ $line == $SATTIME ]]; then number=$(echo $line|grep -Eo '[+-]?[0-9]+([.][0-9]+)?') row+=","$number + timeout=1 fi done < "$1" diff --git a/hexiom/result.csv b/hexiom/result.csv deleted file mode 100644 index 5c7449e5..00000000 --- a/hexiom/result.csv +++ /dev/null @@ -1,2 +0,0 @@ -36,0.648016,1.260086877,0.656467,1.275278727 -38,73.835073,75.245803462,73.947124,75.364286322