Editing the script and .gitignore

diff --git a/.gitignore b/.gitignore
index 501f43e171ce46addd362579c30c947654d98f42..d008c06f2c8da60166a598fefea8e5641c7a24da 100644 (file)
--- 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 d133fa256716c2e22ec76a7e677a8593fdd3c5fc..b53fb39592dc91fd2efe7d91976b689b6601bb6c 100755 (executable)
--- 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 ec91c9c69f1c437d76bf6eca35d3944299f3330e..7b3bd315483350581c524d0985ede8ad9980d09f 100644 (file)
--- 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 dada967a4271a41565047c08e12af0896c64e827..10e5d6ddf8aac432a1fd46a61693a7809d72ccdc 100755 (executable)
--- 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 (file)
index 5c7449e..0000000
--- 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