mirror of
https://github.com/achlipala/frap.git
synced 2024-12-01 00:26:18 +00:00
Fix up ModelChecking to track a change in TransitionSystems
This commit is contained in:
parent
a501f5e1ec
commit
b0ad93e6a4
2 changed files with 26 additions and 26 deletions
|
@ -582,7 +582,7 @@ Inductive add2_R : threaded_state nat (add2_thread * add2_thread)
|
||||||
|
|
||||||
(* Let's also recharacterize the initial states via a singleton set. *)
|
(* Let's also recharacterize the initial states via a singleton set. *)
|
||||||
Theorem add2_init_is :
|
Theorem add2_init_is :
|
||||||
parallel1 add2_binit add2_binit = { {| Shared := true; Private := (BRead, BRead) |} }.
|
parallel_init add2_binit add2_binit = { {| Shared := true; Private := (BRead, BRead) |} }.
|
||||||
Proof.
|
Proof.
|
||||||
simplify.
|
simplify.
|
||||||
apply sets_equal; simplify.
|
apply sets_equal; simplify.
|
||||||
|
@ -1054,7 +1054,7 @@ Qed.
|
||||||
* intimidating statement and a much more interesting proof, whose details we
|
* intimidating statement and a much more interesting proof, whose details we
|
||||||
* nonetheless won't comment on in text. It may make sense to skip past the
|
* nonetheless won't comment on in text. It may make sense to skip past the
|
||||||
* next two lemma statements to the main theorem [withInterference_parallel]. *)
|
* next two lemma statements to the main theorem [withInterference_parallel]. *)
|
||||||
Lemma withInterference_parallel1 : forall shared private1 private2
|
Lemma withInterference_parallel_init : forall shared private1 private2
|
||||||
(invs : shared -> Prop)
|
(invs : shared -> Prop)
|
||||||
(sys1 : trsys (threaded_state shared private1))
|
(sys1 : trsys (threaded_state shared private1))
|
||||||
(sys2 : trsys (threaded_state shared private2))
|
(sys2 : trsys (threaded_state shared private2))
|
||||||
|
@ -1149,7 +1149,7 @@ Proof.
|
||||||
constructor.
|
constructor.
|
||||||
Qed.
|
Qed.
|
||||||
|
|
||||||
Lemma withInterference_parallel2 : forall shared private1 private2
|
Lemma withInterference_parallel_step : forall shared private1 private2
|
||||||
(invs : shared -> Prop)
|
(invs : shared -> Prop)
|
||||||
(sys1 : trsys (threaded_state shared private1))
|
(sys1 : trsys (threaded_state shared private1))
|
||||||
(sys2 : trsys (threaded_state shared private2))
|
(sys2 : trsys (threaded_state shared private2))
|
||||||
|
@ -1268,7 +1268,7 @@ Proof.
|
||||||
assert ((withInterference invs sys1).(Step)^*
|
assert ((withInterference invs sys1).(Step)^*
|
||||||
{| Shared := sh; Private := pr1 |}
|
{| Shared := sh; Private := pr1 |}
|
||||||
{| Shared := s'.(Shared); Private := fst s'.(Private) |}).
|
{| Shared := s'.(Shared); Private := fst s'.(Private) |}).
|
||||||
apply withInterference_parallel1 with (sys2 := sys2)
|
apply withInterference_parallel_init with (sys2 := sys2)
|
||||||
(st := {| Shared := sh; Private := (pr1, pr2) |})
|
(st := {| Shared := sh; Private := (pr1, pr2) |})
|
||||||
(st2 := {| Shared := sh; Private := pr2 |});
|
(st2 := {| Shared := sh; Private := pr2 |});
|
||||||
simplify; propositional.
|
simplify; propositional.
|
||||||
|
@ -1280,7 +1280,7 @@ Proof.
|
||||||
assert ((withInterference invs sys2).(Step)^*
|
assert ((withInterference invs sys2).(Step)^*
|
||||||
{| Shared := sh; Private := pr2 |}
|
{| Shared := sh; Private := pr2 |}
|
||||||
{| Shared := s'.(Shared); Private := snd s'.(Private) |}).
|
{| Shared := s'.(Shared); Private := snd s'.(Private) |}).
|
||||||
apply withInterference_parallel2 with (sys1 := sys1)
|
apply withInterference_parallel_step with (sys1 := sys1)
|
||||||
(st := {| Shared := sh; Private := (pr1, pr2) |})
|
(st := {| Shared := sh; Private := (pr1, pr2) |})
|
||||||
(st1 := {| Shared := sh; Private := pr1 |});
|
(st1 := {| Shared := sh; Private := pr1 |});
|
||||||
simplify; propositional.
|
simplify; propositional.
|
||||||
|
|
|
@ -466,7 +466,7 @@ Inductive add2_R : threaded_state nat (add2_thread * add2_thread)
|
||||||
|
|
||||||
(* Let's also recharacterize the initial states via a singleton set. *)
|
(* Let's also recharacterize the initial states via a singleton set. *)
|
||||||
Theorem add2_init_is :
|
Theorem add2_init_is :
|
||||||
parallel1 add2_binit add2_binit = { {| Shared := true; Private := (BRead, BRead) |} }.
|
parallel_init add2_binit add2_binit = { {| Shared := true; Private := (BRead, BRead) |} }.
|
||||||
Proof.
|
Proof.
|
||||||
simplify.
|
simplify.
|
||||||
apply sets_equal; simplify.
|
apply sets_equal; simplify.
|
||||||
|
@ -925,7 +925,7 @@ Proof.
|
||||||
equality.
|
equality.
|
||||||
Qed.
|
Qed.
|
||||||
|
|
||||||
Lemma withInterference_parallel1 : forall shared private1 private2
|
Lemma withInterference_parallel_init : forall shared private1 private2
|
||||||
(invs : shared -> Prop)
|
(invs : shared -> Prop)
|
||||||
(sys1 : trsys (threaded_state shared private1))
|
(sys1 : trsys (threaded_state shared private1))
|
||||||
(sys2 : trsys (threaded_state shared private2))
|
(sys2 : trsys (threaded_state shared private2))
|
||||||
|
@ -1020,7 +1020,7 @@ Proof.
|
||||||
constructor.
|
constructor.
|
||||||
Qed.
|
Qed.
|
||||||
|
|
||||||
Lemma withInterference_parallel2 : forall shared private1 private2
|
Lemma withInterference_parallel_step : forall shared private1 private2
|
||||||
(invs : shared -> Prop)
|
(invs : shared -> Prop)
|
||||||
(sys1 : trsys (threaded_state shared private1))
|
(sys1 : trsys (threaded_state shared private1))
|
||||||
(sys2 : trsys (threaded_state shared private2))
|
(sys2 : trsys (threaded_state shared private2))
|
||||||
|
@ -1133,7 +1133,7 @@ Proof.
|
||||||
assert ((withInterference invs sys1).(Step)^*
|
assert ((withInterference invs sys1).(Step)^*
|
||||||
{| Shared := sh; Private := pr1 |}
|
{| Shared := sh; Private := pr1 |}
|
||||||
{| Shared := s'.(Shared); Private := fst s'.(Private) |}).
|
{| Shared := s'.(Shared); Private := fst s'.(Private) |}).
|
||||||
apply withInterference_parallel1 with (sys2 := sys2)
|
apply withInterference_parallel_init with (sys2 := sys2)
|
||||||
(st := {| Shared := sh; Private := (pr1, pr2) |})
|
(st := {| Shared := sh; Private := (pr1, pr2) |})
|
||||||
(st2 := {| Shared := sh; Private := pr2 |});
|
(st2 := {| Shared := sh; Private := pr2 |});
|
||||||
simplify; propositional.
|
simplify; propositional.
|
||||||
|
@ -1145,7 +1145,7 @@ Proof.
|
||||||
assert ((withInterference invs sys2).(Step)^*
|
assert ((withInterference invs sys2).(Step)^*
|
||||||
{| Shared := sh; Private := pr2 |}
|
{| Shared := sh; Private := pr2 |}
|
||||||
{| Shared := s'.(Shared); Private := snd s'.(Private) |}).
|
{| Shared := s'.(Shared); Private := snd s'.(Private) |}).
|
||||||
apply withInterference_parallel2 with (sys1 := sys1)
|
apply withInterference_parallel_step with (sys1 := sys1)
|
||||||
(st := {| Shared := sh; Private := (pr1, pr2) |})
|
(st := {| Shared := sh; Private := (pr1, pr2) |})
|
||||||
(st1 := {| Shared := sh; Private := pr1 |});
|
(st1 := {| Shared := sh; Private := pr1 |});
|
||||||
simplify; propositional.
|
simplify; propositional.
|
||||||
|
|
Loading…
Reference in a new issue