diff -r e44d86131648 -r 0c18df79b1c8 src/ZF/UNITY/Increasing.thy --- a/src/ZF/UNITY/Increasing.thy Tue Sep 27 16:51:35 2022 +0100 +++ b/src/ZF/UNITY/Increasing.thy Tue Sep 27 17:03:23 2022 +0100 @@ -13,13 +13,13 @@ definition increasing :: "[i, i, i=>i] => i" (\increasing[_]'(_, _')\) where "increasing[A](r, f) \ - {F \ program. (\k \ A. F \ stable({s \ state. \ r})) & + {F \ program. (\k \ A. F \ stable({s \ state. \ r})) \ (\x \ state. f(x):A)}" definition Increasing :: "[i, i, i=>i] => i" (\Increasing[_]'(_, _')\) where "Increasing[A](r, f) \ - {F \ program. (\k \ A. F \ Stable({s \ state. \ r})) & + {F \ program. (\k \ A. F \ Stable({s \ state. \ r})) \ (\x \ state. f(x):A)}" abbreviation (input) @@ -40,14 +40,14 @@ by (unfold increasing_def, blast) lemma increasingD: -"F \ increasing[A](r,f) \ F \ program & (\a. a \ A) & (\s \ state. f(s):A)" +"F \ increasing[A](r,f) \ F \ program \ (\a. a \ A) \ (\s \ state. f(s):A)" apply (unfold increasing_def) apply (subgoal_tac "\x. x \ state") apply (auto dest: stable_type [THEN subsetD] intro: st0_in_state) done lemma increasing_constant [simp]: - "F \ increasing[A](r, %s. c) \ F \ program & c \ A" + "F \ increasing[A](r, %s. c) \ F \ program \ c \ A" apply (unfold increasing_def stable_def) apply (subgoal_tac "\x. x \ state") apply (auto dest: stable_type [THEN subsetD] intro: st0_in_state) @@ -109,14 +109,14 @@ by (unfold Increasing_def, blast) lemma IncreasingD: -"F \ Increasing[A](r, f) \ F \ program & (\a. a \ A) & (\s \ state. f(s):A)" +"F \ Increasing[A](r, f) \ F \ program \ (\a. a \ A) \ (\s \ state. f(s):A)" apply (unfold Increasing_def) apply (subgoal_tac "\x. x \ state") apply (auto intro: st0_in_state) done lemma Increasing_constant [simp]: - "F \ Increasing[A](r, %s. c) \ F \ program & (c \ A)" + "F \ Increasing[A](r, %s. c) \ F \ program \ (c \ A)" apply (subgoal_tac "\x. x \ state") apply (auto dest!: IncreasingD intro: st0_in_state increasing_imp_Increasing) done @@ -127,7 +127,7 @@ apply (unfold Increasing_def Stable_def Constrains_def part_order_def constrains_def mono1_def metacomp_def, safe) apply (simp_all add: ActsD) -apply (subgoal_tac "xb \ state & xa \ state") +apply (subgoal_tac "xb \ state \ xa \ state") prefer 2 apply (simp add: ActsD) apply (subgoal_tac ":r") prefer 2 apply (force simp add: refl_def) @@ -168,9 +168,9 @@ part_order_def constrains_def mono2_def, clarify, simp) apply clarify apply (rename_tac xa xb) -apply (subgoal_tac "xb \ state & xa \ state") +apply (subgoal_tac "xb \ state \ xa \ state") prefer 2 apply (blast dest!: ActsD) -apply (subgoal_tac ":r & :s") +apply (subgoal_tac ":r \ :s") prefer 2 apply (force simp add: refl_def) apply (rotate_tac 6) apply (drule_tac x = "f (xb) " in bspec) @@ -199,9 +199,9 @@ apply (unfold Increasing_def stable_def part_order_def constrains_def mono2_def Stable_def Constrains_def, safe) apply (simp_all add: ActsD) -apply (subgoal_tac "xa \ state & x \ state") +apply (subgoal_tac "xa \ state \ x \ state") prefer 2 apply (blast dest!: ActsD) -apply (subgoal_tac ":r & :s") +apply (subgoal_tac ":r \ :s") prefer 2 apply (force simp add: refl_def) apply (rotate_tac 6) apply (drule_tac x = "f (xa) " in bspec)