more fix-ups

diff --git a/Makefile b/Makefile
index 45e70d8e097dab3eef7d97718f37a00344167c5a..4e08075bc9054f06b352c4d0298eeeca980e8663 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,12 +60,14 @@ submission:
        cp -p cvc4-smtcomp-main-$(YEAR)/bin/starexec_run_default cvc4-smtcomp-$(YEAR)/bin/starexec_run_default
        cp -p cvc4-smtcomp-application-$(YEAR)/bin/cvc4 cvc4-smtcomp-$(YEAR)/bin/cvc4-application
        cp -p cvc4-smtcomp-application-$(YEAR)/bin/starexec_run_default cvc4-smtcomp-$(YEAR)/bin/starexec_run_application
-       cp -p cvc4-smtcomp-parallel-$(YEAR)/bin/cvc4 cvc4-smtcomp-$(YEAR)/bin/pcvc4
+       cp -p cvc4-smtcomp-parallel-$(YEAR)/bin/pcvc4 cvc4-smtcomp-$(YEAR)/bin/pcvc4
        cp -p cvc4-smtcomp-parallel-$(YEAR)/bin/starexec_run_default cvc4-smtcomp-$(YEAR)/bin/starexec_run_parallel
        cat cvc4-smtcomp-main-$(YEAR)/starexec_description.txt \
            cvc4-smtcomp-application-$(YEAR)/starexec_description.txt \
            cvc4-smtcomp-parallel-$(YEAR)/starexec_description.txt \
            > cvc4-smtcomp-$(YEAR)/starexec_description.txt
+       perl -pi -e 's,\<cvc4\>,cvc4-main,g' cvc4-smtcomp-$(YEAR)/bin/starexec_run_default
+       perl -pi -e 's,\<cvc4\>,cvc4-application,g' cvc4-smtcomp-$(YEAR)/bin/starexec_run_application
        cd cvc4-smtcomp-$(YEAR) && zip -r ../cvc4-smtcomp-$(YEAR).zip *
 submission-main:
        @if [ -d builds-smtcomp/main ]; then \

diff --git a/contrib/run-script-smtcomp2014 b/contrib/run-script-smtcomp2014
index ccb05733a8bfa93c467d4e6233bd67de1ef880af..8f0e2cfcfebd0c4e22203324023400cb7df928af 100755 (executable)
--- a/contrib/run-script-smtcomp2014
+++ b/contrib/run-script-smtcomp2014
@@ -26,11 +26,11 @@ function finishwith {
 case "$logic" in
 
 QF_LRA)
-  finishwith --enable-miplib-trick --miplib-trick-subs=4 --use-approx --stats --lemmas-on-replay-failure --replay-early-close-depth=4 --replay-lemma-reject-cut=128 --replay-reject-cut=512 --unconstrained-simp --use-soi
+  finishwith --enable-miplib-trick --miplib-trick-subs=4 --use-approx --lemmas-on-replay-failure --replay-early-close-depth=4 --replay-lemma-reject-cut=128 --replay-reject-cut=512 --unconstrained-simp --use-soi
   ;;
 QF_LIA)
   # same as QF_LRA but add --pb-rewrites
-  finishwith --enable-miplib-trick --miplib-trick-subs=4 --use-approx --stats --lemmas-on-replay-failure --replay-early-close-depth=4 --replay-lemma-reject-cut=128 --replay-reject-cut=512 --unconstrained-simp --use-soi --pb-rewrites
+  finishwith --enable-miplib-trick --miplib-trick-subs=4 --use-approx --lemmas-on-replay-failure --replay-early-close-depth=4 --replay-lemma-reject-cut=128 --replay-reject-cut=512 --unconstrained-simp --use-soi --pb-rewrites
   ;;
 ALIA|AUFLIA|AUFLIRA|AUFNIRA|BV|UF|UFBV|UFIDL|UFLIA|UFLRA|UFNIA)
   # the following is designed for a run time of 1500s.