Commit d7a230da authored by MARCHE Claude's avatar MARCHE Claude
Browse files

Better support for div and mod by SMT solvers CVC4 and veriT

parent 89c2faca
......@@ -33,7 +33,7 @@ timeout "interrupted by timeout"
(* Disabled:
CVC4 division seems to be neither the Euclidean one, nor the Computer one
*)
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
......@@ -43,6 +43,7 @@ theory int.EuclideanDivision
remove prop Div_1
end
(*
theory int.ComputerDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
......
......@@ -47,6 +47,7 @@ stepslimitexceeded "??"
(* Disabled:
CVC4 division seems to be neither the Euclidean one, nor the Computer one
*)
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
......@@ -57,6 +58,7 @@ theory int.EuclideanDivision
remove prop Div_1
end
(*
theory int.ComputerDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
......
......@@ -29,6 +29,15 @@ transformation "simplify_formula"
transformation "encoding_smt"
transformation "encoding_sort"
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
(*
Local Variables:
......
......@@ -9,7 +9,7 @@
<prover id="4" name="Alt-Ergo" version="0.94" timelimit="2" memlimit="4000"/>
<prover id="5" name="MetiTarski" version="2.2" timelimit="2" memlimit="4000"/>
<prover id="6" name="Z3" version="2.19" timelimit="2" memlimit="4000"/>
<prover id="7" name="CVC4" version="1.4" timelimit="2" memlimit="4000"/>
<prover id="7" name="CVC4" version="1.4" timelimit="5" memlimit="1000"/>
<prover id="8" name="Z3" version="4.3.1" timelimit="2" memlimit="4000"/>
<prover id="9" name="Spass" version="3.7" timelimit="2" memlimit="4000"/>
<prover id="10" name="Eprover" version="1.4" timelimit="2" memlimit="4000"/>
......@@ -22,7 +22,7 @@
<prover id="17" name="veriT" version="201310" timelimit="2" memlimit="4000"/>
<prover id="18" name="iProver" version="0.8.1" timelimit="2" memlimit="4000"/>
<prover id="19" name="Alt-Ergo" version="0.95.2" timelimit="2" memlimit="4000"/>
<prover id="20" name="CVC4" version="1.3" timelimit="2" memlimit="4000"/>
<prover id="20" name="CVC4" version="1.3" timelimit="5" memlimit="1000"/>
<prover id="21" name="Vampire" version="0.6" timelimit="2" memlimit="4000"/>
<prover id="22" name="veriT" version="201410" timelimit="5" memlimit="1000"/>
<prover id="23" name="Alt-Ergo" version="1.00.prv" timelimit="5" memlimit="1000"/>
......@@ -37,7 +37,7 @@
<proof prover="5"><result status="unknown" time="0.11"/></proof>
<proof prover="6"><result status="valid" time="0.00"/></proof>
<proof prover="7"><result status="valid" time="0.00"/></proof>
<proof prover="8"><result status="valid" time="0.00"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="valid" time="0.00"/></proof>
<proof prover="9"><result status="timeout" time="2.06"/></proof>
<proof prover="10"><result status="timeout" time="1.99"/></proof>
<proof prover="11"><result status="valid" time="0.00"/></proof>
......@@ -54,7 +54,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.00" steps="1"/></proof>
</goal>
<goal name="ok2" expanded="true">
<goal name="ok2">
<proof prover="0"><result status="valid" time="0.00"/></proof>
<proof prover="1"><result status="timeout" time="2.00"/></proof>
<proof prover="2"><result status="valid" time="0.01"/></proof>
......@@ -63,7 +63,7 @@
<proof prover="5"><result status="unknown" time="0.10"/></proof>
<proof prover="6"><result status="valid" time="0.00"/></proof>
<proof prover="7"><result status="valid" time="0.00"/></proof>
<proof prover="8"><result status="valid" time="0.00"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="valid" time="0.00"/></proof>
<proof prover="9"><result status="timeout" time="2.00"/></proof>
<proof prover="10"><result status="timeout" time="2.00"/></proof>
<proof prover="11"><result status="valid" time="0.00"/></proof>
......@@ -80,7 +80,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.00" steps="1"/></proof>
</goal>
<goal name="ok3" expanded="true">
<goal name="ok3">
<proof prover="0"><result status="valid" time="0.00"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="valid" time="0.00"/></proof>
......@@ -89,7 +89,7 @@
<proof prover="5"><result status="unknown" time="0.11"/></proof>
<proof prover="6"><result status="valid" time="0.00"/></proof>
<proof prover="7"><result status="valid" time="0.00"/></proof>
<proof prover="8"><result status="valid" time="0.00"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="valid" time="0.00"/></proof>
<proof prover="9"><result status="timeout" time="2.01"/></proof>
<proof prover="10"><result status="timeout" time="1.99"/></proof>
<proof prover="11"><result status="valid" time="0.00"/></proof>
......@@ -106,7 +106,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.00" steps="5"/></proof>
</goal>
<goal name="ok4" expanded="true">
<goal name="ok4">
<proof prover="0"><result status="valid" time="0.00"/></proof>
<proof prover="1"><result status="timeout" time="2.00"/></proof>
<proof prover="2"><result status="valid" time="0.00"/></proof>
......@@ -115,7 +115,7 @@
<proof prover="5"><result status="unknown" time="0.10"/></proof>
<proof prover="6"><result status="valid" time="0.00"/></proof>
<proof prover="7"><result status="valid" time="0.00"/></proof>
<proof prover="8"><result status="valid" time="0.00"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="valid" time="0.00"/></proof>
<proof prover="9"><result status="timeout" time="2.01"/></proof>
<proof prover="10"><result status="timeout" time="2.00"/></proof>
<proof prover="11"><result status="valid" time="0.00"/></proof>
......@@ -132,7 +132,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.00" steps="5"/></proof>
</goal>
<goal name="ok5" expanded="true">
<goal name="ok5">
<proof prover="0"><result status="valid" time="0.00"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="valid" time="0.00"/></proof>
......@@ -141,7 +141,7 @@
<proof prover="5"><result status="unknown" time="0.11"/></proof>
<proof prover="6"><result status="valid" time="0.00"/></proof>
<proof prover="7"><result status="valid" time="0.00"/></proof>
<proof prover="8"><result status="valid" time="0.00"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="valid" time="0.00"/></proof>
<proof prover="9"><result status="timeout" time="2.00"/></proof>
<proof prover="10"><result status="timeout" time="1.99"/></proof>
<proof prover="11"><result status="valid" time="0.00"/></proof>
......@@ -167,7 +167,7 @@
<proof prover="5"><result status="unknown" time="0.11"/></proof>
<proof prover="6"><result status="valid" time="0.00"/></proof>
<proof prover="7"><result status="valid" time="0.00"/></proof>
<proof prover="8"><result status="valid" time="0.00"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="valid" time="0.00"/></proof>
<proof prover="9"><result status="timeout" time="2.02"/></proof>
<proof prover="10"><result status="timeout" time="2.00"/></proof>
<proof prover="11"><result status="valid" time="0.00"/></proof>
......@@ -184,7 +184,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.00" steps="5"/></proof>
</goal>
<goal name="smoke1" expanded="true">
<goal name="smoke1">
<proof prover="0"><result status="unknown" time="0.01"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="unknown" time="0.02"/></proof>
......@@ -193,7 +193,7 @@
<proof prover="5"><result status="unknown" time="0.11"/></proof>
<proof prover="6"><result status="timeout" time="1.99"/></proof>
<proof prover="7"><result status="unknown" time="0.00"/></proof>
<proof prover="8"><result status="timeout" time="1.99"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="timeout" time="4.98"/></proof>
<proof prover="9"><result status="timeout" time="2.03"/></proof>
<proof prover="10"><result status="timeout" time="1.99"/></proof>
<proof prover="11"><result status="unknown" time="0.02"/></proof>
......@@ -210,7 +210,7 @@
<proof prover="22"><result status="unknown" time="0.00"/></proof>
<proof prover="23"><result status="unknown" time="0.05"/></proof>
</goal>
<goal name="smoke2" expanded="true">
<goal name="smoke2">
<proof prover="0"><result status="unknown" time="0.00"/></proof>
<proof prover="1"><result status="timeout" time="1.98"/></proof>
<proof prover="2"><result status="unknown" time="0.02"/></proof>
......@@ -219,7 +219,7 @@
<proof prover="5"><result status="unknown" time="0.11"/></proof>
<proof prover="6"><result status="timeout" time="1.99"/></proof>
<proof prover="7"><result status="unknown" time="0.01"/></proof>
<proof prover="8"><result status="timeout" time="1.98"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="timeout" time="4.90"/></proof>
<proof prover="9"><result status="timeout" time="2.01"/></proof>
<proof prover="10"><result status="timeout" time="1.99"/></proof>
<proof prover="11"><result status="unknown" time="0.02"/></proof>
......@@ -236,7 +236,7 @@
<proof prover="22"><result status="unknown" time="0.00"/></proof>
<proof prover="23"><result status="unknown" time="0.08"/></proof>
</goal>
<goal name="smoke3" expanded="true">
<goal name="smoke3">
<proof prover="0"><result status="unknown" time="0.01"/></proof>
<proof prover="1"><result status="timeout" time="2.00"/></proof>
<proof prover="2"><result status="unknown" time="0.06"/></proof>
......@@ -245,7 +245,7 @@
<proof prover="5"><result status="unknown" time="0.11"/></proof>
<proof prover="6"><result status="timeout" time="1.99"/></proof>
<proof prover="7"><result status="unknown" time="0.01"/></proof>
<proof prover="8"><result status="timeout" time="1.99"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="timeout" time="4.99"/></proof>
<proof prover="9"><result status="timeout" time="2.00"/></proof>
<proof prover="10"><result status="timeout" time="2.00"/></proof>
<proof prover="11"><result status="unknown" time="0.05"/></proof>
......@@ -262,7 +262,7 @@
<proof prover="22"><result status="unknown" time="0.00"/></proof>
<proof prover="23"><result status="unknown" time="0.18"/></proof>
</goal>
<goal name="smoke4" expanded="true">
<goal name="smoke4">
<proof prover="0"><result status="unknown" time="0.00"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="unknown" time="0.06"/></proof>
......@@ -271,7 +271,7 @@
<proof prover="5"><result status="unknown" time="0.11"/></proof>
<proof prover="6"><result status="timeout" time="1.98"/></proof>
<proof prover="7"><result status="unknown" time="0.01"/></proof>
<proof prover="8"><result status="timeout" time="1.99"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="timeout" time="4.93"/></proof>
<proof prover="9"><result status="timeout" time="2.05"/></proof>
<proof prover="10"><result status="timeout" time="1.99"/></proof>
<proof prover="11"><result status="unknown" time="0.04"/></proof>
......@@ -288,7 +288,7 @@
<proof prover="22"><result status="unknown" time="0.00"/></proof>
<proof prover="23"><result status="unknown" time="0.32"/></proof>
</goal>
<goal name="smoke5" expanded="true">
<goal name="smoke5">
<proof prover="0"><result status="unknown" time="0.01"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="unknown" time="0.05"/></proof>
......@@ -297,7 +297,7 @@
<proof prover="5"><result status="unknown" time="0.10"/></proof>
<proof prover="6"><result status="timeout" time="1.99"/></proof>
<proof prover="7"><result status="unknown" time="0.00"/></proof>
<proof prover="8"><result status="timeout" time="1.99"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="timeout" time="4.91"/></proof>
<proof prover="9"><result status="timeout" time="2.00"/></proof>
<proof prover="10"><result status="timeout" time="1.99"/></proof>
<proof prover="11"><result status="unknown" time="0.05"/></proof>
......@@ -314,7 +314,7 @@
<proof prover="22"><result status="unknown" time="0.00"/></proof>
<proof prover="23"><result status="unknown" time="0.04"/></proof>
</goal>
<goal name="smoke6" expanded="true">
<goal name="smoke6">
<proof prover="0"><result status="unknown" time="0.01"/></proof>
<proof prover="1"><result status="timeout" time="2.00"/></proof>
<proof prover="2"><result status="unknown" time="0.06"/></proof>
......@@ -323,7 +323,7 @@
<proof prover="5"><result status="unknown" time="0.10"/></proof>
<proof prover="6"><result status="timeout" time="1.98"/></proof>
<proof prover="7"><result status="unknown" time="0.00"/></proof>
<proof prover="8"><result status="timeout" time="1.99"/></proof>
<proof prover="8" timelimit="5" memlimit="1000"><result status="timeout" time="4.97"/></proof>
<proof prover="9"><result status="timeout" time="2.01"/></proof>
<proof prover="10"><result status="timeout" time="1.99"/></proof>
<proof prover="11"><result status="unknown" time="0.05"/></proof>
......@@ -368,7 +368,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.01" steps="6"/></proof>
</goal>
<goal name="ok2" expanded="true">
<goal name="ok2">
<proof prover="0"><result status="valid" time="0.00"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="valid" time="0.01"/></proof>
......@@ -394,7 +394,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.01" steps="7"/></proof>
</goal>
<goal name="ok3" expanded="true">
<goal name="ok3">
<proof prover="0"><result status="valid" time="0.01"/></proof>
<proof prover="1"><result status="timeout" time="2.00"/></proof>
<proof prover="2"><result status="valid" time="0.00"/></proof>
......@@ -420,7 +420,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.01" steps="9"/></proof>
</goal>
<goal name="ok4" expanded="true">
<goal name="ok4">
<proof prover="0"><result status="valid" time="0.01"/></proof>
<proof prover="1"><result status="timeout" time="2.00"/></proof>
<proof prover="2"><result status="valid" time="0.00"/></proof>
......@@ -446,7 +446,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.00" steps="7"/></proof>
</goal>
<goal name="ok5" expanded="true">
<goal name="ok5">
<proof prover="0"><result status="valid" time="0.01"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="valid" time="0.00"/></proof>
......@@ -472,7 +472,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.01" steps="9"/></proof>
</goal>
<goal name="ok6" expanded="true">
<goal name="ok6">
<proof prover="0"><result status="valid" time="0.01"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="valid" time="0.01"/></proof>
......@@ -498,7 +498,7 @@
<proof prover="22"><result status="valid" time="0.00"/></proof>
<proof prover="23"><result status="valid" time="0.00" steps="7"/></proof>
</goal>
<goal name="smoke1" expanded="true">
<goal name="smoke1">
<proof prover="0"><result status="unknown" time="0.01"/></proof>
<proof prover="1"><result status="timeout" time="2.00"/></proof>
<proof prover="2"><result status="unknown" time="0.14"/></proof>
......@@ -524,7 +524,7 @@
<proof prover="22"><result status="unknown" time="0.00"/></proof>
<proof prover="23"><result status="unknown" time="0.01"/></proof>
</goal>
<goal name="smoke2" expanded="true">
<goal name="smoke2">
<proof prover="0"><result status="unknown" time="0.02"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="unknown" time="0.07"/></proof>
......@@ -550,7 +550,7 @@
<proof prover="22"><result status="unknown" time="0.00"/></proof>
<proof prover="23"><result status="unknown" time="0.01"/></proof>
</goal>
<goal name="smoke3" expanded="true">
<goal name="smoke3">
<proof prover="0"><result status="unknown" time="0.01"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="unknown" time="0.13"/></proof>
......@@ -576,7 +576,7 @@
<proof prover="22"><result status="unknown" time="0.00"/></proof>
<proof prover="23"><result status="unknown" time="0.01"/></proof>
</goal>
<goal name="smoke4" expanded="true">
<goal name="smoke4">
<proof prover="0"><result status="unknown" time="0.02"/></proof>
<proof prover="1"><result status="timeout" time="1.98"/></proof>
<proof prover="2"><result status="unknown" time="0.10"/></proof>
......@@ -602,7 +602,7 @@
<proof prover="22"><result status="unknown" time="0.00"/></proof>
<proof prover="23"><result status="unknown" time="0.02"/></proof>
</goal>
<goal name="smoke5" expanded="true">
<goal name="smoke5">
<proof prover="0"><result status="unknown" time="0.02"/></proof>
<proof prover="1"><result status="timeout" time="1.99"/></proof>
<proof prover="2"><result status="unknown" time="0.13"/></proof>
......@@ -628,7 +628,7 @@
<proof prover="22"><result status="unknown" time="0.00"/></proof>
<proof prover="23"><result status="unknown" time="0.00"/></proof>
</goal>
<goal name="smoke6" expanded="true">
<goal name="smoke6">
<proof prover="0"><result status="unknown" time="0.02"/></proof>
<proof prover="1"><result status="timeout" time="2.00"/></proof>
<proof prover="2"><result status="unknown" time="0.10"/></proof>
......
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