gappa

Makefile.in

@@ -107,7 +107,7 @@ LIB_TRANSFORM = simplify_recursive_definition simplify_formula inlining \
 		eliminate_inductive eliminate_let eliminate_if \
 		explicit_polymorphism
 
-LIB_PRINTER = print_real alt_ergo why3 smt coq tptp simplify
+LIB_PRINTER = print_real alt_ergo why3 smt coq tptp simplify gappa
 
 LIBMODULES = src/config \
 	      $(addprefix src/util/, $(LIB_UTIL)) \
@@ -456,15 +456,15 @@ clean::
 # tools
 #######
 
-TOOLS = bin/why-cpulimit
+TOOLS = bin/why3-cpulimit
 
 byte opt: $(TOOLS)
 
-bin/why-cpulimit: src/tools/@CPULIMIT@.c
+bin/why3-cpulimit: src/tools/@CPULIMIT@.c
 	$(CC) -o $@ $^
 
 clean::
-	rm -f bin/why-cpulimit src/tools/*~
+	rm -f bin/why3-cpulimit src/tools/*~
 
 ########
 # bench

drivers/gappa.drv

+
+(* Why driver for Gappa *)
+
+prelude "# this is a prelude for Gappa"
+
+printer "gappa"
+filename "%f-%t-%g.gappa"
+
+valid 0
+unknown "no contradiction was found" "some enclosures were not satisfied"
+
+transformation "simplify_recursive_definition"
+(*
+transformation "inline_trivial"
+*)
+
+transformation "eliminate_builtin"
+transformation "eliminate_inductive"
+transformation "eliminate_algebraic"
+transformation "eliminate_if"
+transformation "eliminate_let"
+transformation "simplify_formula"
+transformation "simplify_trivial_quantification"
+
+theory BuiltIn
+  syntax type int "int"
+  syntax type real "real"
+  syntax logic (_=_) "(%1 = %2)"
+  syntax logic (_<>_) "(%1 <> %2)"
+end
+
+theory int.Int
+
+  prelude "# this is a prelude for Gappa integer arithmetic"
+
+  syntax logic zero "0"
+  syntax logic one  "1"
+
+  syntax logic (_+_) "(%1 + %2)"
+  syntax logic (_-_) "(%1 - %2)"
+  syntax logic (_*_) "(%1 * %2)"
+  syntax logic (-_)  "(-%1)"
+
+  syntax logic (_<=_) "(%1 <= %2)"
+  syntax logic (_<_) "(%1 <  %2)"
+  syntax logic (_>=_) "(%1 >= %2)"
+  syntax logic (_>_) "(%1 >  %2)"
+
+  remove prop CommutativeGroup.Comm.Comm
+  remove prop CommutativeGroup.Assoc.Assoc
+  remove prop CommutativeGroup.Unit_def
+  remove prop CommutativeGroup.Inv_def
+  remove prop Assoc.Assoc
+  remove prop Mul_distr
+  remove prop Comm.Comm
+  remove prop Unitary
+  remove prop Refl
+  remove prop Trans
+  remove prop Total
+  remove prop Antisymm
+
+end
+
+theory real.Real
+
+  prelude "# this is a prelude for Gappa real arithmetic"
+
+  syntax logic zero "0.0"
+  syntax logic one  "1.0"
+
+  syntax logic (_+_) "(%1 + %2)"
+  syntax logic (_-_) "(%1 - %2)"
+  syntax logic (_*_) "(%1 * %2)"
+  syntax logic (_/_) "(%1 / %2)"
+  syntax logic (-_)  "(-%1)"
+  syntax logic inv   "(1.0 / %1)"
+
+  syntax logic (_<=_) "(%1 <= %2)"
+  syntax logic (_<_) "(%1 <  %2)"
+  syntax logic (_>=_) "(%1 >= %2)"
+  syntax logic (_>_) "(%1 >  %2)"
+
+  remove prop CommutativeGroup.Comm.Comm
+  remove prop CommutativeGroup.Assoc.Assoc
+  remove prop CommutativeGroup.Unit_def
+  remove prop CommutativeGroup.Inv_def
+  remove prop Assoc.Assoc
+  remove prop Mul_distr
+  remove prop Comm.Comm
+  remove prop Unitary
+  remove prop Refl
+  remove prop Trans
+  remove prop Total
+  remove prop Antisymm
+  remove prop Inverse
+
+end
+
+
+
+(*
+Local Variables: 
+mode: why
+compile-command: "make -C .. bench"
+End: 
+*)

src/manager/test.ml

@@ -194,7 +194,7 @@ let goal_menu g =
          let p = List.assoc i menu in
          let call = 
 	   try
-             Db.try_prover ~debug:false ~timelimit ~memlimit:0 
+             Db.try_prover ~debug:true ~timelimit ~memlimit:0 
                ~prover:p.prover ~command:p.command ~driver:p.driver g 
            with Db.AlreadyAttempted ->
              printf "Proof already attempted, no need to rerun@.";

why.conf

@@ -4,7 +4,7 @@ timelimit = 2
 
 [prover alt-ergo]
 name = "Alt-Ergo"
-command = "why-cpulimit %t %m alt-ergo -debug %f"
+command = "why3-cpulimit %t %m alt-ergo -debug %f"
 driver = "drivers/alt_ergo.drv"
 
 [prover coq]
@@ -14,25 +14,30 @@ driver = "drivers/coq.drv"
 
 [prover cvc3]
 name = "CVC3"
-command = "why-cpulimit 0 %m cvc3 -timeout %t -lang smt %f 2>&1"
+command = "why3-cpulimit 0 %m cvc3 -timeout %t -lang smt %f 2>&1"
 driver = "drivers/cvc3.drv"
 
 [prover z3]
 name = "Z3"
-command = "why-cpulimit %t %m z3 -smt %f 2>&1"
+command = "why3-cpulimit %t %m z3 -smt %f 2>&1"
 driver = "drivers/z3.drv"
 
 [prover spass]
 name = "spass"
-command = "why-cpulimit 0 %m SPASS -TPTP -PGiven=0 -PProblem=0 -DocProof -TimeLimit=%t %f 2>&1"
+command = "why3-cpulimit 0 %m SPASS -TPTP -PGiven=0 -PProblem=0 -DocProof -TimeLimit=%t %f 2>&1"
 driver = "drivers/tptp.drv"
 
 [prover eprover]
 name = "eprover"
-command = "why-cpulimit 0 %m eprover -s --print-statistics -xAuto -tAuto --cpu-limit=%t --tstp-in %f 2>&1"
+command = "why3-cpulimit 0 %m eprover -s --print-statistics -xAuto -tAuto --cpu-limit=%t --tstp-in %f 2>&1"
 driver = "drivers/tptp.drv"
 
 [prover simplify]
 name = "simplify"
-command = "why-cpulimit %t %m Simplify %f 2>&1"
+command = "why3-cpulimit %t %m Simplify %f 2>&1"
 driver = "drivers/simplify.drv"
+
+[prover gappa]
+name = "Gappa"
+command = "why3-cpulimit %t %m gappa %f 2>&1"
+driver = "drivers/gappa.drv"