Skip to content

Commit 4ca3ce3

Browse files
committed
Compiles
1 parent 8b2724b commit 4ca3ce3

18 files changed

Lines changed: 37 additions & 1671 deletions

File tree

_CoqProject

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ reals/constructive_ereal.v
3030
reals/reals.v
3131
reals/real_interval.v
3232
reals/signed.v
33-
reals/interval_inference.v
3433
reals/prodnormedzmodule.v
3534
reals/all_reals.v
3635
experimental_reals/xfinmap.v

analysis_stdlib/showcase/uniform_bigO.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ wlog lex12 : x / (`|x.1| <= `|x.2|).
5353
by rewrite addrC [`|_|]maxC (ler_norm (x.2, x.1)).
5454
rewrite [`|_|]max_r // -[X in X * _]ger0_norm // -normrM.
5555
rewrite -sqrtr_sqr ler_wsqrtr // exprMn sqr_sqrtr // mulr_natl mulr2n lerD2r.
56-
rewrite -[_ ^+ 2]ger0_norm ?sqr_ge0 // -[X in _ <=X]ger0_norm ?sqr_ge0 //.
56+
rewrite -[leLHS]ger0_norm ?sqr_ge0 // -[leRHS]ger0_norm ?sqr_ge0 //.
5757
by rewrite !normrX lerXn2r // nnegrE normr_ge0.
5858
Qed.
5959

classical/cardinality.v

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,13 @@ split=> [Ainfinite| + /finite_setP[n eqAI]]; last first.
560560
have /all_sig2[f Af fX] : forall X : {fset T}, {x | x \in A & x \notin X}.
561561
move=> X; apply/sig2W; apply: contra_notP Ainfinite => nAX; apply/finite_fsetP.
562562
exists [fset x in X | x \in A]%fset; rewrite eqEsubset; split; last first.
563-
by move=> x/=; rewrite !inE => /andP[_]; rewrite inE.
564-
move=> x Ax /=; rewrite !inE/=; apply/andP; split; rewrite ?inE//.
563+
(* move=> x/=. *)
564+
(* Set SsrMatching LegacyFoUnif. *) (* TODO: investigate *)
565+
(* rewrite [in X in X -> _]mem_filterf. *)
566+
by move=> x/=; rewrite in_fset inE => /andP[_]; rewrite inE.
567+
(* by move=> x/=; rewrite !inE => /andP[_]; rewrite inE. *)
568+
move=> x Ax /=; rewrite in_fset inE/=; apply/andP; split; rewrite ?inE//. (* TODO: same *)
569+
(* move=> x Ax /=; rewrite !inE/=; apply/andP; split; rewrite ?inE//. *)
565570
by apply: contra_notT nAX => xNX; exists x; rewrite ?inE.
566571
do [under [forall x : {fset _}, _]eq_forall do rewrite inE] in Af *.
567572
suff [g gE] : exists g : nat -> T,

classical/functions.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2456,7 +2456,7 @@ End set_bij_lemmas.
24562456
Lemma bij_II_D1 T n (A : set T) (f : nat -> T) :
24572457
set_bij `I_n.+1 A f -> set_bij `I_n (A `\ f n) f.
24582458
Proof.
2459-
rewrite IIS -image_set1; apply: bij_sub_setUll.
2459+
rewrite IIS -[[set f n]]image_set1; apply: bij_sub_setUll.
24602460
by apply/disj_setPS => i [/= /[swap]->]; rewrite ltnn.
24612461
Qed.
24622462

reals/all_reals.v

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
From mathcomp Require Export interval_inference.
21
From mathcomp Require Export constructive_ereal.
32
From mathcomp Require Export reals.
43
From mathcomp Require Export real_interval.

reals/constructive_ereal.v

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ Proof. exact: raddfMn. Qed.
820820

821821
Lemma prodEFin T s (P : pred T) (f : T -> R) :
822822
\prod_(i <- s | P i) (f i)%:E = (\prod_(i <- s | P i) f i)%:E.
823-
Proof. by elim/big_ind2 : _ => // _ x _ y -> ->; rewrite EFinM. Qed.
823+
Proof. by elim/big_ind2 : _ => // ? x ? y -> ->; rewrite EFinM. Qed.
824824

825825
Lemma sumEFin I s P (F : I -> R) :
826826
\sum_(i <- s | P i) (F i)%:E = (\sum_(i <- s | P i) F i)%:E.
@@ -916,7 +916,7 @@ Lemma adde_defNN x y : - x +? - y = x +? y.
916916
Proof. by rewrite adde_defN oppeK. Qed.
917917

918918
Lemma oppe_eq0 x : (- x == 0)%E = (x == 0)%E.
919-
Proof. by rewrite -(can_eq oppeK) oppe0. Qed.
919+
Proof. by rewrite -[RHS](can_eq oppeK) oppe0. Qed.
920920

921921
Lemma oppeD x y : x +? y -> - (x + y) = - x - y.
922922
Proof. by move: x y => [x| |] [y| |] //= _; rewrite opprD. Qed.
@@ -2467,7 +2467,7 @@ move: x => [x|_|//].
24672467
move=> [y| |] [z| |]//; first by rewrite !lee_fin// ler_pM2r.
24682468
- by move=> _; rewrite mulr_infty gtr0_sg// mul1e leey.
24692469
- by move=> _; rewrite mulr_infty gtr0_sg// mul1e leNye.
2470-
- by move=> _; rewrite 2!mulr_infty gtr0_sg// 2!mul1e.
2470+
- by move=> _; rewrite mulNyr mulyr gtr0_sg// 2!mul1e.
24712471
move=> [y| |] [z| |]//.
24722472
- rewrite lee_fin => yz.
24732473
have [z0|z0|] := ltgtP 0%R z.

0 commit comments

Comments
 (0)