Commit 917cd4c9 authored by Andrei Paskevich's avatar Andrei Paskevich

split_vc: perform generalize_introduced before splitting

parent adc66fc1
......@@ -100,18 +100,10 @@
<proof prover="6"><result status="valid" time="0.02"/></proof>
</goal>
<goal name="VC equality.9" expl="precondition" proved="true">
<transf name="split_all_full" proved="true" >
<goal name="VC equality.9.0" expl="precondition" proved="true">
<proof prover="6"><result status="valid" time="0.09"/></proof>
</goal>
</transf>
<proof prover="6" timelimit="5"><result status="valid" time="0.03"/></proof>
</goal>
<goal name="VC equality.10" expl="precondition" proved="true">
<transf name="split_vc" proved="true" >
<goal name="VC equality.10.0" expl="precondition" proved="true">
<proof prover="6"><result status="valid" time="0.05"/></proof>
</goal>
</transf>
<proof prover="6" timelimit="5"><result status="valid" time="0.03"/></proof>
</goal>
<goal name="VC equality.11" expl="precondition" proved="true">
<proof prover="5"><result status="valid" time="0.02"/></proof>
......@@ -123,21 +115,13 @@
<proof prover="6"><result status="valid" time="0.04"/></proof>
</goal>
<goal name="VC equality.14" expl="unreachable point" proved="true">
<transf name="split_all_full" proved="true" >
<goal name="VC equality.14.0" expl="unreachable point" proved="true">
<proof prover="6"><result status="valid" time="0.04"/></proof>
</goal>
</transf>
<proof prover="6" timelimit="5"><result status="valid" time="0.07"/></proof>
</goal>
<goal name="VC equality.15" expl="precondition" proved="true">
<proof prover="6"><result status="valid" time="0.03"/></proof>
</goal>
<goal name="VC equality.16" expl="precondition" proved="true">
<transf name="split_vc" proved="true" >
<goal name="VC equality.16.0" expl="precondition" proved="true">
<proof prover="7"><result status="valid" time="0.03"/></proof>
</goal>
</transf>
<proof prover="6" timelimit="5"><result status="valid" time="0.02"/></proof>
</goal>
<goal name="VC equality.17" expl="assertion" proved="true">
<proof prover="6"><result status="valid" time="0.03"/></proof>
......@@ -150,18 +134,18 @@
</goal>
<goal name="VC equality.20" expl="postcondition" proved="true">
<transf name="split_vc" proved="true" >
<goal name="VC equality.20.0" expl="VC for equality" proved="true">
<goal name="VC equality.20.0" expl="postcondition" proved="true">
<proof prover="6"><result status="valid" time="0.08"/></proof>
</goal>
<goal name="VC equality.20.1" expl="VC for equality" proved="true">
<goal name="VC equality.20.1" expl="postcondition" proved="true">
<proof prover="2"><result status="valid" time="0.01" steps="15"/></proof>
</goal>
<goal name="VC equality.20.2" expl="VC for equality" proved="true">
<goal name="VC equality.20.2" expl="postcondition" proved="true">
<transf name="assert" proved="true" arg1="((k-1) * lambda &gt;= 0)">
<goal name="VC equality.20.2.0" proved="true">
<proof prover="7"><result status="valid" time="5.90"/></proof>
</goal>
<goal name="VC equality.20.2.1" expl="VC for equality" proved="true">
<goal name="VC equality.20.2.1" expl="postcondition" proved="true">
<proof prover="7"><result status="valid" time="0.22"/></proof>
</goal>
</transf>
......@@ -176,15 +160,7 @@
<proof prover="6"><result status="valid" time="0.02"/></proof>
</goal>
<goal name="VC tortoise_and_hare.1" expl="precondition" proved="true">
<transf name="split_vc" proved="true" >
<goal name="VC tortoise_and_hare.1.0" expl="precondition" proved="true">
<transf name="split_all_full" proved="true" >
<goal name="VC tortoise_and_hare.1.0.0" expl="precondition" proved="true">
<proof prover="6"><result status="valid" time="0.05"/></proof>
</goal>
</transf>
</goal>
</transf>
<proof prover="6" timelimit="5"><result status="valid" time="0.05"/></proof>
</goal>
<goal name="VC tortoise_and_hare.2" expl="loop invariant init" proved="true">
<proof prover="6"><result status="valid" time="0.07"/></proof>
......@@ -203,21 +179,21 @@
</goal>
<goal name="VC tortoise_and_hare.7" expl="loop invariant preservation" proved="true">
<transf name="split_vc" proved="true" >
<goal name="VC tortoise_and_hare.7.0" expl="VC for tortoise_and_hare" proved="true">
<goal name="VC tortoise_and_hare.7.0" expl="loop invariant preservation" proved="true">
<proof prover="6"><result status="valid" time="0.04"/></proof>
</goal>
<goal name="VC tortoise_and_hare.7.1" expl="VC for tortoise_and_hare" proved="true">
<proof prover="6"><result status="valid" time="0.03"/></proof>
</goal>
<goal name="VC tortoise_and_hare.7.2" expl="VC for tortoise_and_hare" proved="true">
<proof prover="6"><result status="valid" time="0.29"/></proof>
</goal>
<goal name="VC tortoise_and_hare.7.3" expl="VC for tortoise_and_hare" proved="true">
<goal name="VC tortoise_and_hare.7.1" expl="loop invariant preservation" proved="true">
<proof prover="6"><result status="valid" time="0.12"/></proof>
</goal>
<goal name="VC tortoise_and_hare.7.4" expl="VC for tortoise_and_hare" proved="true">
<goal name="VC tortoise_and_hare.7.2" expl="loop invariant preservation" proved="true">
<proof prover="6"><result status="valid" time="0.10"/></proof>
</goal>
<goal name="VC tortoise_and_hare.7.3" expl="loop invariant preservation" proved="true">
<proof prover="6"><result status="valid" time="0.03"/></proof>
</goal>
<goal name="VC tortoise_and_hare.7.4" expl="loop invariant preservation" proved="true">
<proof prover="6"><result status="valid" time="0.06"/></proof>
</goal>
</transf>
</goal>
<goal name="VC tortoise_and_hare.8" expl="assertion" proved="true">
......@@ -249,14 +225,7 @@
</transf>
</goal>
<goal name="VC tortoise_and_hare.11" expl="loop invariant init" proved="true">
<transf name="split_all_full" proved="true" >
<goal name="VC tortoise_and_hare.11.0" expl="VC for tortoise_and_hare" proved="true">
<proof prover="2"><result status="valid" time="0.01" steps="19"/></proof>
</goal>
<goal name="VC tortoise_and_hare.11.1" expl="VC for tortoise_and_hare" proved="true">
<proof prover="6"><result status="valid" time="0.05"/></proof>
</goal>
</transf>
<proof prover="6" timelimit="5"><result status="valid" time="0.02"/></proof>
</goal>
<goal name="VC tortoise_and_hare.12" expl="loop invariant init" proved="true">
<proof prover="6"><result status="valid" time="0.25"/></proof>
......@@ -271,25 +240,7 @@
<proof prover="6"><result status="valid" time="0.04"/></proof>
</goal>
<goal name="VC tortoise_and_hare.16" expl="loop invariant preservation" proved="true">
<transf name="split_vc" proved="true" >
<goal name="VC tortoise_and_hare.16.0" expl="VC for tortoise_and_hare" proved="true">
<proof prover="6"><result status="valid" time="0.03"/></proof>
</goal>
<goal name="VC tortoise_and_hare.16.1" expl="VC for tortoise_and_hare" proved="true">
<transf name="assert" proved="true" arg1="(x (n+lambda) = x n)">
<goal name="VC tortoise_and_hare.16.1.0" proved="true">
<transf name="instantiate" proved="true" arg1="H21" arg2="(n+lambda),n">
<goal name="VC tortoise_and_hare.16.1.0.0" proved="true">
<proof prover="6"><result status="valid" time="0.04"/></proof>
</goal>
</transf>
</goal>
<goal name="VC tortoise_and_hare.16.1.1" expl="VC for tortoise_and_hare" proved="true">
<proof prover="5"><result status="valid" time="0.02"/></proof>
</goal>
</transf>
</goal>
</transf>
<proof prover="2" timelimit="5"><result status="valid" time="0.02" steps="40"/></proof>
</goal>
<goal name="VC tortoise_and_hare.17" expl="loop invariant preservation" proved="true">
<proof prover="6"><result status="valid" time="0.51"/></proof>
......@@ -393,11 +344,11 @@
</goal>
<goal name="VC tortoise_and_hare.22" expl="loop invariant preservation" proved="true">
<transf name="split_vc" proved="true" >
<goal name="VC tortoise_and_hare.22.0" expl="VC for tortoise_and_hare" proved="true">
<proof prover="6"><result status="valid" time="0.10"/></proof>
<goal name="VC tortoise_and_hare.22.0" expl="loop invariant preservation" proved="true">
<proof prover="6"><result status="valid" time="0.11"/></proof>
</goal>
<goal name="VC tortoise_and_hare.22.1" expl="VC for tortoise_and_hare" proved="true">
<proof prover="6"><result status="valid" time="0.33"/></proof>
<goal name="VC tortoise_and_hare.22.1" expl="loop invariant preservation" proved="true">
<proof prover="6" timelimit="5"><result status="valid" time="0.32"/></proof>
</goal>
</transf>
</goal>
......
......@@ -2,8 +2,8 @@
<!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
"http://why3.lri.fr/why3session.dtd">
<why3session shape_version="4">
<prover id="0" name="Alt-Ergo" version="1.30" timelimit="1" steplimit="0" memlimit="1000"/>
<prover id="1" name="Z3" version="4.5.0" timelimit="1" steplimit="0" memlimit="1000"/>
<prover id="0" name="Alt-Ergo" version="2.0.0" timelimit="5" steplimit="0" memlimit="1000"/>
<prover id="1" name="Z3" version="4.5.0" timelimit="5" steplimit="0" memlimit="1000"/>
<file name="../verifythis_2018_mind_the_gap_2.mlw" proved="true">
<theory name="GapBuffer" proved="true">
<goal name="VC dummy_char" expl="VC for dummy_char" proved="true">
......@@ -52,7 +52,7 @@
<proof prover="1"><result status="valid" time="0.02"/></proof>
</goal>
<goal name="VC right.4" expl="postcondition" proved="true">
<proof prover="0" timelimit="5" memlimit="2000"><result status="valid" time="0.02" steps="55"/></proof>
<proof prover="0" memlimit="2000"><result status="valid" time="0.02" steps="55"/></proof>
</goal>
<goal name="VC right.5" expl="postcondition" proved="true">
<proof prover="1"><result status="valid" time="0.02"/></proof>
......@@ -80,14 +80,7 @@
<proof prover="1"><result status="valid" time="0.03"/></proof>
</goal>
<goal name="VC grow.4" expl="precondition" proved="true">
<transf name="split_vc" proved="true" >
<goal name="VC grow.4.0" expl="VC for grow" proved="true">
<proof prover="1"><result status="valid" time="0.02"/></proof>
</goal>
<goal name="VC grow.4.1" expl="VC for grow" proved="true">
<proof prover="1"><result status="valid" time="0.03"/></proof>
</goal>
</transf>
<proof prover="1"><result status="valid" time="0.02"/></proof>
</goal>
<goal name="VC grow.5" expl="type invariant" proved="true">
<proof prover="1"><result status="valid" time="0.02"/></proof>
......@@ -116,7 +109,6 @@
</goal>
<goal name="VC insert.3" expl="postcondition" proved="true">
<proof prover="0"><result status="valid" time="0.02" steps="182"/></proof>
<proof prover="1"><result status="timeout" time="1.00"/></proof>
</goal>
<goal name="VC insert.4" expl="index in array bounds" proved="true">
<proof prover="1"><result status="valid" time="0.02"/></proof>
......@@ -129,7 +121,6 @@
</goal>
<goal name="VC insert.7" expl="postcondition" proved="true">
<proof prover="0"><result status="valid" time="0.03" steps="104"/></proof>
<proof prover="1"><result status="timeout" time="1.00"/></proof>
</goal>
</transf>
</goal>
......@@ -139,41 +130,7 @@
<proof prover="1"><result status="valid" time="0.04"/></proof>
</goal>
<goal name="VC delete.1" expl="postcondition" proved="true">
<transf name="split_vc" proved="true" >
<goal name="VC delete.1.0" expl="VC for delete" proved="true">
<proof prover="1"><result status="valid" time="0.01"/></proof>
</goal>
<goal name="VC delete.1.1" expl="VC for delete" proved="true">
<proof prover="1"><result status="valid" time="0.01"/></proof>
</goal>
<goal name="VC delete.1.2" expl="VC for delete" proved="true">
<transf name="introduce_premises" proved="true" >
<goal name="VC delete.1.2.0" expl="VC for delete" proved="true">
<transf name="inline_goal" proved="true" >
<goal name="VC delete.1.2.0.0" expl="VC for delete" proved="true">
<transf name="split_vc" proved="true" >
<goal name="VC delete.1.2.0.0.0" expl="VC for delete" proved="true">
<proof prover="1"><result status="valid" time="0.04"/></proof>
</goal>
<goal name="VC delete.1.2.0.0.1" expl="VC for delete" proved="true">
<proof prover="1"><result status="valid" time="0.03"/></proof>
</goal>
<goal name="VC delete.1.2.0.0.2" expl="VC for delete" proved="true">
<proof prover="1"><result status="valid" time="0.02"/></proof>
</goal>
<goal name="VC delete.1.2.0.0.3" expl="VC for delete" proved="true">
<proof prover="1"><result status="valid" time="0.02"/></proof>
</goal>
<goal name="VC delete.1.2.0.0.4" expl="VC for delete" proved="true">
<proof prover="1"><result status="valid" time="0.04"/></proof>
</goal>
</transf>
</goal>
</transf>
</goal>
</transf>
</goal>
</transf>
<proof prover="1"><result status="valid" time="0.04"/></proof>
</goal>
<goal name="VC delete.2" expl="postcondition" proved="true">
<proof prover="1"><result status="valid" time="0.01"/></proof>
......
......@@ -218,8 +218,8 @@ let simplify_intros =
introduce_premises
let split_vc =
Trans.compose_l (* TODO: decide whether we want generalize in split_vc *)
((* Trans.compose generalize_intro *) Split_goal.split_goal_right)
Trans.compose_l
(Trans.compose generalize_intro Split_goal.split_goal_right)
(Trans.singleton simplify_intros)
let () = Trans.register_transform_l
......
......@@ -58,9 +58,6 @@ let () = log_time ("Initialising why3 worker: end ")
let split_trans = Trans.lookup_transform_l "split_vc" env
let split_trans = (* TODO: remove if generalize is integrated in split_vc *)
Trans.compose (Trans.lookup_transform "generalize_introduced" env) split_trans
(* CF gmain.ml ligne 568 et suivante *)
module W =
struct
......
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