Skip to content

Commit b3da841

Browse files
committed
Various minor improvements
1 parent 2d1c4e3 commit b3da841

14 files changed

Lines changed: 91 additions & 109 deletions

File tree

theories/Combi/bintree.v

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,8 +1456,7 @@ apply/idP/idP.
14561456
suff -> : t1 = t2 by apply: le_refl.
14571457
apply/val_inj/eqP => /=.
14581458
have [Hsum2 Heq] := vctleq_sumn_right_sizes Hleq.
1459-
rewrite -Heq; apply/eqP/anti_leq.
1460-
by rewrite Hsum Hsum2.
1459+
by rewrite -Heq eqn_leq Hsum Hsum2.
14611460
case: (t1 =P t2) => [-> | /eqP Hneq]; first by apply: le_refl.
14621461
have [/= tt [Hrot Htleq]] := vctleq_rotation Hleq Hneq.
14631462
have Hszt : size_tree tt == n by rewrite (size_rotations Hrot) bintreeszP.

theories/Combi/partition.v

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -760,9 +760,7 @@ Proof.
760760
move=> Hpart.
761761
case: c => //= c _.
762762
rewrite (conj_leqE Hpart) (conj_ltnE Hpart) /=.
763-
apply/idP/idP.
764-
- by move/eqP ->; rewrite !leqnn.
765-
- by move=> H; apply/eqP; exact: anti_leq.
763+
by apply/idP/idP => [/eqP ->|]; rewrite ?leqnn // -eqn_leq.
766764
Qed.
767765

768766
Lemma rem_corner_incr_first_n sh i :

theories/Combi/skewpart.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ apply (iffP eqP); case: ex_minnP => m eqdrop mmin.
317317
+ rewrite -eqmp1 => i lemi.
318318
by rewrite -(subnKC lemi) -!nth_drop (eqP eqdrop).
319319
- move=> [Hneq Heq].
320-
apply anti_leq; apply/andP; split.
320+
apply/anti_leq/andP; split.
321321
+ apply: mmin; apply/eqP/(eq_from_nth_notin (x0 := x0)); first last.
322322
by move=> i; rewrite !nth_drop addSn; apply: Heq; rewrite ltnS leq_addr.
323323
* by apply/contra: x0notint => /mem_drop.
@@ -1571,7 +1571,7 @@ split => [i|i||i]; first 2 last; first exact: start_ltn.
15711571
rewrite /mindropeq; case: ex_minnP => [[//|m]] /eqP Hdrop _ _ /= ltmi.
15721572
by rewrite -(subnKC ltmi) -!nth_drop Hdrop.
15731573
have conn4sym : connect_sym neig4 := @conn4_sym _ _.
1574-
move=> Hi; apply anti_leq; apply/andP; split.
1574+
move=> Hi; apply/anti_leq/andP; split.
15751575
move/includedP: incl => [_ /(_ i)]; rewrite leq_eqVlt => /orP[/eqP-> | lti].
15761576
by move/is_partP: partout => [_/(_ i)/leq_trans]; apply.
15771577
have Hb : in_skew inner outer (i, nth 0 inner i) by rewrite /in_skew /= leqnn.

theories/Combi/std.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ set pos := (posbig s).+1; set LR := take _ _.
310310
have HposLR : pos = size LR.
311311
rewrite /LR size_take /pos size_std_rec.
312312
case: (ltnP (posbig s).+1 (size s)) => Hpos; first by [].
313-
apply/eqP; rewrite eqn_leq Hpos andbT.
313+
apply: anti_leq; rewrite Hpos andbT.
314314
have: s != [::] by move: Hmax; case s.
315315
exact: posbig_size.
316316
rewrite HposLR; apply/eqP; rewrite -posbigE.
@@ -948,7 +948,7 @@ Qed.
948948
Lemma size_invseq s t : invseq s t -> size s = size t.
949949
Proof.
950950
rewrite /invseq => /andP[Hst Hts].
951-
by apply/eqP; rewrite eqn_leq !size_leq_invseq.
951+
by apply: anti_leq; rewrite !size_leq_invseq.
952952
Qed.
953953

954954
Lemma linvseq_subset_iota s t : linvseq s t -> {subset iota 0 (size s) <= t}.

theories/LRrule/Greene.v

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ Qed.
513513
Lemma Greene_rel_t_0 : Greene_rel_t 0 = 0.
514514
Proof using.
515515
rewrite /Greene_rel_t /=.
516-
apply/eqP; rewrite eqn_leq; apply/andP; split; last by [].
516+
apply/anti_leq/andP; split; last by [].
517517
apply/bigmax_leqP => S.
518518
rewrite /ksupp => /and3P[HS _ _].
519519
have -> : S = set0 by apply/eqP; rewrite -cards_eq0 eqn_leq HS.
@@ -734,7 +734,7 @@ Hypothesis HnegR : transitive negR.
734734
Lemma Greene_rel_seq r k : sorted negR r -> Greene_rel r k = minn (size r) k.
735735
Proof using HnegR.
736736
move=> Hrow /=.
737-
apply/eqP; rewrite eqn_leq; apply/andP; split; last exact: Greene_rel_t_inf.
737+
apply/anti_leq/andP; split; last exact: Greene_rel_t_inf.
738738
rewrite leq_min Greene_rel_t_sup /=; apply/bigmax_leqP => s.
739739
rewrite /ksupp /trivIset => /and3P[Hcard /eqP /= <- /forallP Hsort].
740740
suff {Hcard} H B : B \in s -> #|B| <= 1.
@@ -883,7 +883,7 @@ Qed.
883883
Lemma Greene_rel_rev (leT : rel Alph) u :
884884
Greene_rel leT u =1 Greene_rel (fun y x => leT x y) (rev u).
885885
Proof using.
886-
move=> k; apply anti_leq; apply/andP; split.
886+
move=> k; apply/anti_leq/andP; split.
887887
- apply leq_Greene; first exact: ksupp_inj_rev.
888888
- rewrite [X in _ <= X](eq_Greene_rel (R2 := fun x y => leT x y)).
889889
+ apply leq_Greene; rewrite -{2}(revK u); exact: ksupp_inj_rev.
@@ -1600,7 +1600,7 @@ Qed.
16001600
Theorem Greene_row_tab k t :
16011601
is_tableau t -> Greene_row (to_word t) k = sumn (take k (shape t)).
16021602
Proof using.
1603-
move=> Htab; apply/eqP; rewrite eqn_leq; apply/andP; split.
1603+
move=> Htab; apply/anti_leq/andP; split.
16041604
- rewrite -(conj_partK (is_part_sht Htab)) -sum_conj.
16051605
rewrite (shape_tabcols Htab) /Greene_row /Greene_rel /Greene_rel_t.
16061606
apply/bigmax_leqP => /= U; rewrite /ksupp => /and3P[Hsz Htriv].
@@ -1623,7 +1623,7 @@ Theorem Greene_col_tab k t :
16231623
is_tableau t -> Greene_col (to_word t) k = sumn (take k (conj_part (shape t))).
16241624
Proof using.
16251625
move=> Htab; rewrite -sum_conj.
1626-
apply/eqP; rewrite eqn_leq /=; apply/andP; split.
1626+
apply/anti_leq/andP; split.
16271627
- elim: t Htab => [_ | t0 t IHt] /=.
16281628
by apply: (@leq_trans 0); first exact: Greene_rel_t_sup.
16291629
move=> /and4P[_ Hrow _ /IHt{IHt} Ht]; rewrite to_word_cons.

0 commit comments

Comments
 (0)