Commit 65af15a2 authored by MARCHE Claude's avatar MARCHE Claude

proofs improved again

parent 38628bc5
......@@ -526,7 +526,6 @@ Axiom distrib_conj : forall (s:stmt) (sigma:(map mident value)) (pi:(list
(ident* value)%type)) (p:fmla) (q:fmla), ((eval_fmla sigma pi (wp s p)) /\
(eval_fmla sigma pi (wp s q))) -> (eval_fmla sigma pi (wp s (Fand p q))).
Require Import Why3.
Ltac ae := why3 "alt-ergo" timelimit 2.
......@@ -538,14 +537,14 @@ Theorem wp_preserved_by_reduction : forall (sigma:(map mident value))
pi' (wp s' q)).
intros sigma sigma' pi pi' s s' h1.
induction h1; try (simpl; intro; ae).
(* case while true do ... *)
simpl; intros q (_ & h).
(* need to keep a copy of h *)
generalize h; intro h'.
apply abstract_effects_generalize in h'; simpl in h'.
ae.
apply abstract_effects_generalize in h'; simpl in h'; ae.
(* case while false do ... *)
simpl; intros q (_ & h).
generalize h; intro h'.
apply abstract_effects_generalize in h'; simpl in h'.
ae.
apply abstract_effects_generalize in h; simpl in h; ae.
Qed.
......@@ -4054,7 +4054,7 @@
locfile="blocking_semantics5/../blocking_semantics5.mlw"
loclnum="583" loccnumb="7" loccnume="9"
verified="true"
expanded="false">
expanded="true">
<goal
name="monotonicity"
locfile="blocking_semantics5/../blocking_semantics5.mlw"
......@@ -4604,7 +4604,7 @@
edited="blocking_semantics5_WP_distrib_conj_1.v"
obsolete="false"
archived="false">
<result status="valid" time="0.76"/>
<result status="valid" time="1.33"/>
</proof>
</goal>
<goal
......@@ -4670,7 +4670,7 @@
edited="blocking_semantics5_WP_distrib_conj_2.v"
obsolete="false"
archived="false">
<result status="valid" time="0.97"/>
<result status="valid" time="1.05"/>
</proof>
</goal>
<goal
......@@ -4879,7 +4879,7 @@
loclnum="696" loccnumb="8" loccnume="33"
sum="77062a7c2881739dc5c4b430817ea6e6"
proved="true"
expanded="false"
expanded="true"
shape="aeval_fmlaV1V3awpV5V6Iaeval_fmlaV0V2awpV4V6FIaone_stepV0V2V4V1V3V5F">
<proof
prover="5"
......@@ -4888,7 +4888,7 @@
edited="blocking_semantics5_WP_wp_preserved_by_reduction_4.v"
obsolete="false"
archived="false">
<result status="valid" time="6.78"/>
<result status="valid" time="6.66"/>
</proof>
</goal>
<goal
......@@ -4897,31 +4897,31 @@
loclnum="703" loccnumb="8" loccnume="16"
sum="611a01a4377996dcab32da28c32c7f34"
proved="true"
expanded="false"
expanded="true"
shape="areductibleV1V2V0Iainfix =V0aSskipNIaeval_fmlaV1V2awpV0V5Iatype_stmtV3V4V0Iacompatible_envV1V3V2V4F">
<transf
name="induction_ty_lex"
proved="true"
expanded="false">
expanded="true">
<goal
name="progress.1"
locfile="blocking_semantics5/../blocking_semantics5.mlw"
loclnum="703" loccnumb="8" loccnume="16"
sum="20ddfff62d0f72a14f60d8cea4403b1c"
proved="true"
expanded="false"
expanded="true"
shape="CV0aSskipareductibleV1V2V0Iainfix =V0aSskipNIaeval_fmlaV1V2awpV0V5Iatype_stmtV3V4V0Iacompatible_envV1V3V2V4FaSassignVVareductibleV8V9V0Iainfix =V0aSskipNIaeval_fmlaV8V9awpV0V12Iatype_stmtV10V11V0Iacompatible_envV8V10V9V11FaSseqVVareductibleV15V16V0Iainfix =V0aSskipNIaeval_fmlaV15V16awpV0V19Iatype_stmtV17V18V0Iacompatible_envV15V17V16V18FIareductibleV20V21V13Iainfix =V13aSskipNIaeval_fmlaV20V21awpV13V24Iatype_stmtV22V23V13Iacompatible_envV20V22V21V23FIareductibleV25V26V14Iainfix =V14aSskipNIaeval_fmlaV25V26awpV14V29Iatype_stmtV27V28V14Iacompatible_envV25V27V26V28FaSifVVVareductibleV33V34V0Iainfix =V0aSskipNIaeval_fmlaV33V34awpV0V37Iatype_stmtV35V36V0Iacompatible_envV33V35V34V36FIareductibleV38V39V31Iainfix =V31aSskipNIaeval_fmlaV38V39awpV31V42Iatype_stmtV40V41V31Iacompatible_envV38V40V39V41FIareductibleV43V44V32Iainfix =V32aSskipNIaeval_fmlaV43V44awpV32V47Iatype_stmtV45V46V32Iacompatible_envV43V45V44V46FaSassertVareductibleV49V50V0Iainfix =V0aSskipNIaeval_fmlaV49V50awpV0V53Iatype_stmtV51V52V0Iacompatible_envV49V51V50V52FaSwhileVVVareductibleV57V58V0Iainfix =V0aSskipNIaeval_fmlaV57V58awpV0V61Iatype_stmtV59V60V0Iacompatible_envV57V59V58V60FIareductibleV62V63V56Iainfix =V56aSskipNIaeval_fmlaV62V63awpV56V66Iatype_stmtV64V65V56Iacompatible_envV62V64V63V65FF">
<transf
name="split_goal_wp"
proved="true"
expanded="false">
expanded="true">
<goal
name="progress.1.1"
locfile="blocking_semantics5/../blocking_semantics5.mlw"
loclnum="703" loccnumb="8" loccnume="16"
sum="0aedcaeb8d859c7cba3421fbbefd6f0d"
proved="true"
expanded="false"
expanded="true"
shape="CV0aSskipareductibleV1V2V0Iainfix =V0aSskipNIaeval_fmlaV1V2awpV0V5Iatype_stmtV3V4V0Iacompatible_envV1V3V2V4FaSassignVVtaSseqVVtaSifVVVtaSassertVtaSwhileVVVtF">
<proof
prover="1"
......@@ -4978,7 +4978,7 @@
loclnum="703" loccnumb="8" loccnume="16"
sum="e459d99bbc26ed2fcfe5165ff76c58c7"
proved="true"
expanded="false"
expanded="true"
shape="CV0aSskiptaSassignVVareductibleV3V4V0Iainfix =V0aSskipNIaeval_fmlaV3V4awpV0V7Iatype_stmtV5V6V0Iacompatible_envV3V5V4V6FaSseqVVtaSifVVVtaSassertVtaSwhileVVVtF">
<proof
prover="1"
......@@ -5035,7 +5035,7 @@
edited="blocking_semantics5_WP_progress_1.v"
obsolete="false"
archived="false">
<result status="valid" time="0.69"/>
<result status="valid" time="0.56"/>
</proof>
</goal>
<goal
......@@ -5044,7 +5044,7 @@
loclnum="703" loccnumb="8" loccnume="16"
sum="20b1c22faa832cb219376bf593908fdf"
proved="true"
expanded="false"
expanded="true"
shape="CV0aSskiptaSassignVVtaSseqVVareductibleV5V6V0Iainfix =V0aSskipNIaeval_fmlaV5V6awpV0V9Iatype_stmtV7V8V0Iacompatible_envV5V7V6V8FIareductibleV10V11V3Iainfix =V3aSskipNIaeval_fmlaV10V11awpV3V14Iatype_stmtV12V13V3Iacompatible_envV10V12V11V13FIareductibleV15V16V4Iainfix =V4aSskipNIaeval_fmlaV15V16awpV4V19Iatype_stmtV17V18V4Iacompatible_envV15V17V16V18FaSifVVVtaSassertVtaSwhileVVVtF">
<proof
prover="1"
......@@ -5101,7 +5101,7 @@
edited="blocking_semantics5_WP_progress_2.v"
obsolete="false"
archived="false">
<result status="valid" time="0.75"/>
<result status="valid" time="0.90"/>
</proof>
</goal>
<goal
......@@ -5110,7 +5110,7 @@
loclnum="703" loccnumb="8" loccnume="16"
sum="01bb1da4dbe46fc2bacc6109abc6366c"
proved="true"
expanded="false"
expanded="true"
shape="CV0aSskiptaSassignVVtaSseqVVtaSifVVVareductibleV8V9V0Iainfix =V0aSskipNIaeval_fmlaV8V9awpV0V12Iatype_stmtV10V11V0Iacompatible_envV8V10V9V11FIareductibleV13V14V6Iainfix =V6aSskipNIaeval_fmlaV13V14awpV6V17Iatype_stmtV15V16V6Iacompatible_envV13V15V14V16FIareductibleV18V19V7Iainfix =V7aSskipNIaeval_fmlaV18V19awpV7V22Iatype_stmtV20V21V7Iacompatible_envV18V20V19V21FaSassertVtaSwhileVVVtF">
<proof
prover="1"
......@@ -5176,7 +5176,7 @@
loclnum="703" loccnumb="8" loccnume="16"
sum="0731aa11b69e374fc267a508128f373f"
proved="true"
expanded="false"
expanded="true"
shape="CV0aSskiptaSassignVVtaSseqVVtaSifVVVtaSassertVareductibleV9V10V0Iainfix =V0aSskipNIaeval_fmlaV9V10awpV0V13Iatype_stmtV11V12V0Iacompatible_envV9V11V10V12FaSwhileVVVtF">
<proof
prover="1"
......@@ -5242,7 +5242,7 @@
loclnum="703" loccnumb="8" loccnume="16"
sum="2eb19251b2e214b7d32337941d46a2da"
proved="true"
expanded="false"
expanded="true"
shape="CV0aSskiptaSassignVVtaSseqVVtaSifVVVtaSassertVtaSwhileVVVareductibleV12V13V0Iainfix =V0aSskipNIaeval_fmlaV12V13awpV0V16Iatype_stmtV14V15V0Iacompatible_envV12V14V13V15FIareductibleV17V18V11Iainfix =V11aSskipNIaeval_fmlaV17V18awpV11V21Iatype_stmtV19V20V11Iacompatible_envV17V19V18V20FF">
<proof
prover="1"
......@@ -5312,7 +5312,7 @@
loclnum="713" loccnumb="8" loccnume="20"
sum="a3c30e738d3295e20ca452e9124ca47b"
proved="true"
expanded="false"
expanded="true"
shape="aeval_fmlaV2V4V9Aainfix =V6aSskipIaeval_fmlaV1V3awpV5V9AareductibleV2V4V6NAamany_stepsV1V3V5V2V4V6V0Iatype_stmtV7V8V5Iacompatible_envV1V7V3V8F">
<proof
prover="1"
......
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