Commit 9f3e9d78 authored by Francois Bobot's avatar Francois Bobot

Encoding_instantiate uncommented : it now uses meta

parent b6878d8d
......@@ -473,7 +473,7 @@ DIR_DRIVERS := drivers/
DRIVERS := z3_inst cvc3_inst
DRIVERS := $(DRIVERS) $(addsuffix _def, $(DRIVERS)) \
$(addsuffix _goal, $(DRIVERS)) $(addsuffix _mono, $(DRIVERS))
DRIVERS := $(DRIVERS) $(addsuffix _nbp, $(DRIVERS))
DRIVERS := $(DRIVERS) $(addsuffix _incomplete, $(DRIVERS))
DRIVERS := $(addsuffix .drv, $(DRIVERS))
DRIVERS := $(addprefix $(DIR_DRIVERS), $(DRIVERS))
......
......@@ -4,8 +4,8 @@ DIR=drivers/
for prover in z3 cvc3; do
for what in "" _goal _mono _def; do
for complete in "" _nbp; do
cat ${DIR}${prover}.drv |sed -e "s/transformation \"encoding_decorate\"/(* transformation \"encoding_instantiate$what$complete\" *)/" > ${DIR}${prover}_inst${what}${complete}.drv
for complete in "" _incomplete; do
cat ${DIR}${prover}.drv |sed -e "s/transformation \"encoding_decorate\"/transformation \"encoding_instantiate$what$complete\"/" > ${DIR}${prover}_inst${what}${complete}.drv
done
done
done
This diff is collapsed.
......@@ -23,6 +23,8 @@ let ($) f x = f x
let const f _ = f
let flip f x y = f y x
(* useful option combinators *)
let of_option = function None -> assert false | Some x -> x
......
......@@ -23,6 +23,8 @@ val ($) : ('a -> 'b) -> 'a -> 'b
val const : 'a -> 'b -> 'a
val flip : ('a -> 'b -> 'c) -> 'b -> 'a -> 'c
(* useful option combinators *)
val of_option : 'a option -> 'a
......
......@@ -32,9 +32,9 @@ end
*)
theory Test_simplify_array
use import array.Array
use import array.ArrayPoly
goal G : forall x y:int. forall m: t int int.
select (store m y x) y = x
get (set m y x) y = x
end
theory Test_conjunction
......
......@@ -72,15 +72,15 @@ name = "Z3 (inst)"
command = "why3-cpulimit %t %m z3 -smt %f 2>&1"
driver = "drivers/z3_inst.drv"
[prover cvc3_inst_nbp]
name = "CVC3 (inst+nbp)"
[prover cvc3_inst_incomplete]
name = "CVC3 (inst+incomplete)"
command = "why3-cpulimit 0 %m cvc3 -timeout %t -lang smt %f 2>&1"
driver = "drivers/cvc3_inst_nbp.drv"
driver = "drivers/cvc3_inst_incomplete.drv"
[prover z3_inst_nbp]
name = "Z3 (inst+nbp)"
[prover z3_inst_incomplete]
name = "Z3 (inst+incomplete)"
command = "why3-cpulimit %t %m z3 -smt %f 2>&1"
driver = "drivers/z3_inst_nbp.drv"
driver = "drivers/z3_inst_incomplete.drv"
[prover cvc3_inst_goal]
name = "CVC3 (inst+goal)"
......@@ -92,15 +92,15 @@ name = "Z3 (inst+goal)"
command = "why3-cpulimit %t %m z3 -smt %f 2>&1"
driver = "drivers/z3_inst_goal.drv"
[prover cvc3_inst_goal_nbp]
name = "CVC3 (inst+goal+nbp)"
[prover cvc3_inst_goal_incomplete]
name = "CVC3 (inst+goal+incomplete)"
command = "why3-cpulimit 0 %m cvc3 -timeout %t -lang smt %f 2>&1"
driver = "drivers/cvc3_inst_goal_nbp.drv"
driver = "drivers/cvc3_inst_goal_incomplete.drv"
[prover z3_inst_goal_nbp]
name = "Z3 (inst+goal+nbp)"
[prover z3_inst_goal_incomplete]
name = "Z3 (inst+goal+incomplete)"
command = "why3-cpulimit %t %m z3 -smt %f 2>&1"
driver = "drivers/z3_inst_goal_nbp.drv"
driver = "drivers/z3_inst_goal_incomplete.drv"
[prover cvc3_inst_def]
name = "CVC3 (inst+def)"
......@@ -112,15 +112,15 @@ name = "Z3 (inst+def)"
command = "why3-cpulimit %t %m z3 -smt %f 2>&1"
driver = "drivers/z3_inst_def.drv"
[prover cvc3_inst_def_nbp]
name = "CVC3 (inst+def+nbp)"
[prover cvc3_inst_def_incomplete]
name = "CVC3 (inst+def+incomplete)"
command = "why3-cpulimit 0 %m cvc3 -timeout %t -lang smt %f 2>&1"
driver = "drivers/cvc3_inst_def_nbp.drv"
driver = "drivers/cvc3_inst_def_incomplete.drv"
[prover z3_inst_def_nbp]
name = "Z3 (inst+def+nbp)"
[prover z3_inst_def_incomplete]
name = "Z3 (inst+def+incomplete)"
command = "why3-cpulimit %t %m z3 -smt %f 2>&1"
driver = "drivers/z3_inst_def_nbp.drv"
driver = "drivers/z3_inst_def_incomplete.drv"
[prover cvc3_inst_mono]
......@@ -133,12 +133,12 @@ name = "Z3 (inst+mono)"
command = "why3-cpulimit %t %m z3 -smt %f 2>&1"
driver = "drivers/z3_inst_mono.drv"
[prover cvc3_inst_mono_nbp]
name = "CVC3 (inst+mono+nbp)"
[prover cvc3_inst_mono_incomplete]
name = "CVC3 (inst+mono+incomplete)"
command = "why3-cpulimit 0 %m cvc3 -timeout %t -lang smt %f 2>&1"
driver = "drivers/cvc3_inst_mono_nbp.drv"
driver = "drivers/cvc3_inst_mono_incomplete.drv"
[prover z3_inst_mono_nbp]
name = "Z3 (inst+mono+nbp)"
[prover z3_inst_mono_incomplete]
name = "Z3 (inst+mono+incomplete)"
command = "why3-cpulimit %t %m z3 -smt %f 2>&1"
driver = "drivers/z3_inst_mono_nbp.drv"
driver = "drivers/z3_inst_mono_incomplete.drv"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment