Merge branch 'master' of https://github.com/CVC4/CVC4

3 files changed, 8 insertions, 8 deletions

diff --git a/contrib/run-script-casc25-fof b/contrib/run-script-casc25-fof
index b6bea37dd..26c544062 100755
--- a/contrib/run-script-casc25-fof
+++ b/contrib/run-script-casc25-fof
@@ -31,7 +31,7 @@ function finishwith {
 # designed for 300 seconds
 trywith 15 --relevant-triggers --clause-split --full-saturate-quant 
 trywith 15 --clause-split --no-e-matching --full-saturate-quant 
-trywith 15 --finite-model-find --quant-cf --sort-inference --uf-ss-fair
+trywith 15 --finite-model-find --quant-cf --qcf-all-conflict --sort-inference --uf-ss-fair
 trywith 5 --trigger-sel=max --full-saturate-quant
 trywith 5 --relevant-triggers --clause-split --multi-trigger-when-single --full-saturate-quant 
 trywith 5 --multi-trigger-when-single --multi-trigger-priority --full-saturate-quant 
@@ -39,7 +39,7 @@ trywith 5 --pre-skolem-quant --no-pre-skolem-quant-nested --full-saturate-quant
 trywith 15 --relevant-triggers --decision=internal --full-saturate-quant
 trywith 15 --clause-split --no-quant-cf --full-saturate-quant
 trywith 15 --clause-split --trigger-sel=min --full-saturate-quant
-trywith 30 --relevant-triggers --prenex-quant=none --full-saturate-quant
+trywith 30 --prenex-quant=none --full-saturate-quant
 trywith 30 --decision=internal --simplification=none --no-inst-no-entail --no-quant-cf --full-saturate-quant
 trywith 30 --finite-model-find --fmf-inst-engine --sort-inference --uf-ss-fair --mbqi=gen-ev
 finishwith --term-db-mode=relevant --full-saturate-quant
diff --git a/contrib/run-script-casc25-tff b/contrib/run-script-casc25-tfa
index 9313b7886..40ed76df5 100644
--- a/contrib/run-script-casc25-tff
+++ b/contrib/run-script-casc25-tfa
@@ -6,7 +6,7 @@ bench="$1"
 file=${bench##*/}
 filename=${file%.*}
 
-echo "------- cvc4-tff casc 25 : $bench at $2..."
+echo "------- cvc4-tfa casc 25 : $bench at $2..."
 
 # use: trywith [params..]
 # to attempt a run.  If an SZS ontology result is printed, then
@@ -29,11 +29,12 @@ function finishwith {
 }
 
 trywith 10 --cbqi2 --decision=internal --full-saturate-quant
-trywith 10 --relevant-triggers --full-saturate-quant
+trywith 10 --relevant-triggers --full-saturate-quant --partial-triggers --purify-triggers
 trywith 10 --cbqi --full-saturate-quant
+trywith 10 --cbqi2 --e-matching  --partial-triggers --purify-triggers
 trywith 30 --qcf-tconstraint --full-saturate-quant
 trywith 60 --cbqi --cbqi-recurse --full-saturate-quant
-trywith 10 --full-saturate-quant
+trywith 10 --full-saturate-quant --partial-triggers --purify-triggers
 trywith 10 --no-e-matching --full-saturate-quant
 trywith 10 --fmf-bound-int
 finishwith --cbqi2 --cbqi-recurse --full-saturate-quant
diff --git a/contrib/run-script-casc25-tfn b/contrib/run-script-casc25-tfn
index d3c5d0344..6888d7b49 100644
--- a/contrib/run-script-casc25-tfn
+++ b/contrib/run-script-casc25-tfn
@@ -15,7 +15,7 @@ echo "------- cvc4-tfn casc 25 : $bench at $2..."
 function trywith {
   limit=$1; shift;
   echo "--- Run $@ at $limit...";
-  (ulimit -t "$limit";$cvc4 --lang=tptp --no-checking --no-interactive "$@" $bench) 2>/dev/null |
+  (ulimit -t "$limit";$cvc4 --lang=tptp --no-checking --no-interactive --force-logic="UFNIRA" "$@" $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;;
@@ -25,11 +25,10 @@ function trywith {
 }
 function finishwith {
   echo "--- Run $@...";
-  $cvc4 --lang=tptp --no-checking --no-interactive "$@" $bench
+  $cvc4 --lang=tptp --no-checking --no-interactive --force-logic="UFNIRA" "$@" $bench
 }
 
 trywith 30 --cbqi2 --decision=internal --full-saturate-quant
-trywith 60 --finite-model-find --sort-inference --uf-ss-fair
 trywith 30 --cbqi --full-saturate-quant
 trywith 60 --cbqi --cbqi-recurse --full-saturate-quant
 trywith 60 --fmf-bound-int --macros-quant