@@ -3,7 +3,7 @@ From HB Require Import structures.
33From mathcomp Require Import all_ssreflect ssralg ssrnum ssrint interval finmap.
44From mathcomp Require Import mathcomp_extra boolp classical_sets functions.
55From mathcomp Require Import cardinality fsbigop signed reals ereal.
6- From mathcomp Require Import topology normedtype sequences real_interval.
6+ From mathcomp Require Import topology tvs normedtype sequences real_interval.
77From mathcomp Require Import esum measure lebesgue_measure numfun realfun.
88From mathcomp Require Import lebesgue_integral derive charge.
99
@@ -24,7 +24,7 @@ Set Implicit Arguments.
2424Unset Strict Implicit .
2525Unset Printing Implicit Defensive.
2626Import Order.TTheory GRing.Theory Num.Def Num.Theory.
27- Import numFieldTopology .Exports.
27+ Import numFieldNormedType .Exports.
2828
2929Local Open Scope classical_set_scope.
3030Local Open Scope ring_scope.
@@ -358,7 +358,7 @@ Proof.
358358move=> ab intf; pose fab := f \_ `[a, b].
359359have intfab : mu.-integrable `[a, b] (EFin \o fab).
360360 by rewrite -restrict_EFin; apply/integrable_restrict => //=; rewrite setIidr.
361- apply/cvgrPdist_le => /= e e0; rewrite near_simpl; near=> x.
361+ apply/cvgrPdist_le => /= e e0; near=> x.
362362rewrite {1}/int /parameterized_integral sub0r normrN.
363363have [|xa] := leP a x.
364364 move=> ax; apply/ltW; move: ax.
@@ -423,7 +423,6 @@ have intfab : mu.-integrable `[a, b] (EFin \o fab).
423423 by rewrite -restrict_EFin; apply/integrable_restrict => //=; rewrite setIidr.
424424rewrite /int /parameterized_integral => z; rewrite in_itv/= => /andP[az zb].
425425apply/cvgrPdist_le => /= e e0.
426- rewrite near_simpl.
427426have [d [d0 /= {}int_normr_cont]] := int_normr_cont _ e0.
428427near=> x.
429428have [xz|xz|->] := ltgtP x z; last by rewrite subrr normr0 ltW.
@@ -501,7 +500,7 @@ Corollary continuous_FTC2 f F a b : (a < b)%R ->
501500Proof .
502501move=> ab cf dF F'f.
503502pose fab := f \_ `[a, b].
504- pose G x : R : = (\int[mu]_(t in `[a, x]) fab t)%R.
503+ pose G x := (\int[mu]_(t in `[a, x]) fab t)%R.
505504have iabf : mu.-integrable `[a, b] (EFin \o f).
506505 by apply: continuous_compact_integrable => //; exact: segment_compact.
507506have G'f : {in `]a, b[, forall x, G^`() x = fab x /\ derivable G x 1}.
@@ -730,7 +729,7 @@ Lemma increasing_cvg_at_left_comp F G a b (l : R) : (a < b)%R ->
730729Proof .
731730move=> ab incrF cFb GFb.
732731apply/cvgrPdist_le => /= e e0.
733- have/cvgrPdist_le /(_ e e0) [d /= d0 {}GFb] := GFb.
732+ have /cvgrPdist_le /(_ e e0) [d /= d0 {}GFb] := GFb.
734733have := cvg_at_left_within cFb.
735734move/cvgrPdist_lt/(_ _ d0) => [d' /= d'0 {}cFb].
736735near=> t.
@@ -748,7 +747,7 @@ Lemma decreasing_cvg_at_right_comp F G a b (l : R) : (a < b)%R ->
748747Proof .
749748move=> ab decrF cFa GFa.
750749apply/cvgrPdist_le => /= e e0.
751- have/cvgrPdist_le /(_ e e0) [d' /= d'0 {}GFa] := GFa.
750+ have /cvgrPdist_le /(_ e e0) [d' /= d'0 {}GFa] := GFa.
752751have := cvg_at_right_within cFa.
753752move/cvgrPdist_lt/(_ _ d'0) => [d'' /= d''0 {}cFa].
754753near=> t.
@@ -766,7 +765,7 @@ Lemma decreasing_cvg_at_left_comp F G a b (l : R) : (a < b)%R ->
766765Proof .
767766move=> ab decrF cFb GFb.
768767apply/cvgrPdist_le => /= e e0.
769- have/cvgrPdist_le /(_ e e0) [d' /= d'0 {}GFb] := GFb.
768+ have /cvgrPdist_le /(_ e e0) [d' /= d'0 {}GFb] := GFb.
770769have := cvg_at_left_within cFb. (* different point from gt0 version *)
771770move/cvgrPdist_lt/(_ _ d'0) => [d'' /= d''0 {}cFb].
772771near=> t.
@@ -863,7 +862,7 @@ rewrite oppeD//= -(continuous_FTC2 ab _ _ DPGFE); last 2 first.
863862 exact: decreasing_image_oo.
864863 * have : -%R F^`() @ x --> (- f x)%R.
865864 by rewrite -fE//; apply: cvgN; exact: cF'.
866- apply: cvg_trans; apply: near_eq_cvg; rewrite near_simpl .
865+ apply: cvg_trans; apply: near_eq_cvg.
867866 apply: (@open_in_nearW _ _ `]a, b[) ; last by rewrite inE.
868867 exact: interval_open.
869868 by move=> z; rewrite inE/= => zab; rewrite fctE fE.
@@ -978,7 +977,7 @@ rewrite (@integration_by_substitution_decreasing (- F)%R); first last.
978977 by case: Fab => + _ _; exact.
979978 rewrite -derive1E.
980979 have /cvgN := cF' _ xab; apply: cvg_trans; apply: near_eq_cvg.
981- rewrite near_simpl; near=> y; rewrite fctE !derive1E deriveN//.
980+ near=> y; rewrite fctE !derive1E deriveN//.
982981 by case: Fab => + _ _; apply; near: y; exact: near_in_itvoo.
983982- by move=> x y xab yab yx; rewrite ltrN2 incrF.
984983- by [].
0 commit comments