Minor changes to script. Disable cbqi sat.

diff --git a/contrib/run-script-cascj7-fnt b/contrib/run-script-cascj7-fnt
index ce54fe5aec6bd5df7e9edba5be5a1204939b0fcd..0d8642e67cc9d4a49239cdbf30f5dd4f38abc962 100755 (executable)
--- a/contrib/run-script-cascj7-fnt
+++ b/contrib/run-script-cascj7-fnt
@@ -15,7 +15,7 @@ echo "------- cvc4-fnt casc j7 : $bench at $2..."
 function trywith {
   limit=$1; shift;
   echo "--- Run $@ at $limit...";
-  (ulimit -t "$limit";$cvc4 --no-checking --no-interactive --dump-models --produce-models --force-no-limit-cpu-while-dump "$@" $bench) 2>/dev/null |
+  (ulimit -S -t "$limit";$cvc4 --no-checking --no-interactive --dump-models --produce-models --force-no-limit-cpu-while-dump "$@" $bench) 2>/dev/null |
   (read w1 w2 w3 result w4 w5;
   case "$result" in
   Satisfiable) echo "$w1 $w2 $w3 $result $w4 $w5";cat;exit 0;;

diff --git a/contrib/run-script-cascj7-fof b/contrib/run-script-cascj7-fof
index 783eca17e3bdab55aa20b0efff4367fdd986b917..4cd22285415c8586a1565b621381f353bc965d67 100755 (executable)
--- a/contrib/run-script-cascj7-fof
+++ b/contrib/run-script-cascj7-fof
@@ -15,7 +15,7 @@ echo "------- cvc4-fof casc j7 : $bench at $2..."
 function trywith {
   limit=$1; shift;
   echo "--- Run $@ at $limit...";
-  (ulimit -t "$limit";$cvc4 --no-checking --no-interactive --dump-instantiations --inst-format=szs --force-no-limit-cpu-while-dump "$@" $bench) 2>/dev/null |
+  (ulimit -S -t "$limit";$cvc4 --no-checking --no-interactive --dump-instantiations --inst-format=szs --force-no-limit-cpu-while-dump "$@" $bench) 2>/dev/null |
   (read w1 w2 w3 result w4 w5;
   case "$result" in
   Unsatisfiable) echo "$w1 $w2 $w3 $result $w4 $w5";cat;exit 0;;

diff --git a/contrib/run-script-cascj7-tff b/contrib/run-script-cascj7-tff
index 5dd1a9d98c92b0edb0331e0d2eac0d69d1288f89..9422f8536b038c624b63978f2cbcee18177aa7aa 100755 (executable)
--- a/contrib/run-script-cascj7-tff
+++ b/contrib/run-script-cascj7-tff
@@ -25,14 +25,14 @@ function trywith {
 }
 function finishwith {
   echo "--- Run $@...";
-  $cvc4 --no-checking --no-interactive --dump-instantiations --inst-format=szs "$@" $bench
+  $cvc4 --no-checking --no-interactive "$@" $bench
 }
 
 trywith 15 --cbqi-recurse --full-saturate-quant
 trywith 15 --decision=internal --full-saturate-quant
 trywith 30 --quant-cf --qcf-tconstraint --full-saturate-quant
 trywith 20 --finite-model-find
-trywith 30 --full-saturate-quant
+trywith 30 --fmf-bound-int
 trywith 60 --quant-cf --full-saturate-quant
 finishwith --cbqi-recurse --full-saturate-quant --pre-skolem-quant
 # echo "% SZS status" "GaveUp for $filename"

diff --git a/src/theory/quantifiers/instantiation_engine.cpp b/src/theory/quantifiers/instantiation_engine.cpp
index 53c6d9e2755b5c17b362a035ab380303077bddf7..d0f50fa6a7999a286660c458494cf6121ebf19de 100644 (file)
--- a/src/theory/quantifiers/instantiation_engine.cpp
+++ b/src/theory/quantifiers/instantiation_engine.cpp
@@ -393,7 +393,7 @@ void InstantiationEngine::debugSat( int reason ){
         }
       }
     }
-    if( options::recurseCbqi() && !options::preSkolemQuant() && d_setIncomplete ){
+    if( d_setIncomplete ){
       Debug("quantifiers-sat") << "Cannot conclude SAT with nested quantifiers in recursive strategy." << std::endl;
       //TODO : only when existentials with inst constants
       d_quantEngine->getOutputChannel().setIncomplete();