Skip to content

Commit 9b67ad5

Browse files
committed
convex -> convex_set
1 parent c3dff45 commit 9b67ad5

File tree

4 files changed

+33
-26
lines changed

4 files changed

+33
-26
lines changed

CHANGELOG_UNRELEASED.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
- in `separation_axioms.v`:
8585
+ lemmas `limit_point_closed`
8686
- in `convex.v`:
87-
+ lemma `convexW`
87+
+ lemma `convex_setW`
8888

8989
### Changed
9090

@@ -244,7 +244,7 @@
244244
+ lemma `ball_open_nbhs`
245245

246246
- moved from `tvs.v` to `convex.v`
247-
+ definition `convex`
247+
+ definition `convex`, renamed to `convex_set`
248248

249249
### Renamed
250250

theories/convex.v

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,15 @@ Proof. by move=> ab; rewrite in_itv/= -lerN2 convN convC !conv_le ?lerN2. Qed.
220220

221221
End conv_numDomainType.
222222

223-
Definition convex (R : numDomainType) (M : lmodType R)
223+
Definition convex_set (R : numDomainType) (M : lmodType R)
224224
(A : set (convex_lmodType M)) :=
225225
forall x y lambda, x \in A -> y \in A -> x <| lambda |> y \in A.
226226

227-
Lemma convexW (R : numDomainType) (M : lmodType R) (A : set (convex_lmodType M)) :
228-
convex A <->
229-
{in A &, forall x y (k : {i01 R}), 0 < k%:num -> k%:num < 1 -> x <| k |> y \in A}.
227+
Lemma convex_setW (R : numDomainType) (M : lmodType R)
228+
(A : set (convex_lmodType M)) :
229+
convex_set A <->
230+
{in A &, forall x y (k : {i01 R}),
231+
0 < k%:num -> k%:num < 1 -> x <| k |> y \in A}.
230232
Proof.
231233
split => [cA x y xA yA k k0 k1|cA x y l xA yA].
232234
by have /(_ k) := cA _ _ _ xA yA.
@@ -237,7 +239,8 @@ apply: cA => //.
237239
- by rewrite lt_neqAle l1 le1.
238240
Qed.
239241

240-
Definition convex_function (R : numFieldType) (E : lmodType R) (E' := convex_lmodType E) (D : set E') (f : E' -> R^o) :=
242+
Definition convex_function (R : numFieldType) (E : lmodType R)
243+
(E' := convex_lmodType E) (D : set E') (f : E' -> R^o) :=
241244
forall (t : {i01 R}),
242245
{in D &, forall (x y : E'), (f (x <| t |> y) <= f x <| t |> f y)%R}.
243246
(* TODO: generalize to convTypes once we have ordered convTypes (mathcomp 2) *)

theories/normedtype_theory/normed_module.v

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ Unshelve. all: by end_near. Qed.
113113

114114
Local Open Scope convex_scope.
115115

116-
Let ball_convex (x : convex_lmodType V) (r : K) : convex (ball x r).
116+
Let ball_convex_set (x : convex_lmodType V) (r : K) : convex_set (ball x r).
117117
Proof.
118-
apply/convexW => z y; rewrite !inE -!ball_normE /= => zx yx l l0 l1.
118+
apply/convex_setW => z y; rewrite !inE -!ball_normE /= => zx yx l l0 l1.
119119
rewrite inE/=.
120120
rewrite [X in `|X|](_ : _ = (x - z : convex_lmodType _) <| l |>
121121
(x - y : convex_lmodType _)); last first.
@@ -127,11 +127,12 @@ by rewrite ltrD// ltr_pM2l// onem_gt0.
127127
Qed.
128128

129129
(** NB: we have almost the same proof in `tvs.v` *)
130-
Let locally_convex :
131-
exists2 B : set (set (convex_lmodType V)), (forall b, b \in B -> convex b) & basis B.
130+
Let locally_convex_set :
131+
exists2 B : set_system (convex_lmodType V),
132+
(forall b, b \in B -> convex_set b) & basis B.
132133
Proof.
133134
exists [set B | exists (x : convex_lmodType V) r, B = ball x r].
134-
by move=> b; rewrite inE => [[x]] [r] ->; exact: ball_convex.
135+
by move=> b; rewrite inE => [[x]] [r] ->; exact: ball_convex_set.
135136
split; first by move=> B [x] [r] ->; exact: ball_open.
136137
move=> x B; rewrite -nbhs_ballE/= => -[r] r0 Bxr /=.
137138
by exists (ball x r) => //; split; [exists x, r|exact: ballxx].
@@ -141,7 +142,7 @@ HB.instance Definition _ :=
141142
PreTopologicalNmodule_isTopologicalNmodule.Build V add_continuous.
142143
HB.instance Definition _ :=
143144
TopologicalNmodule_isTopologicalLmodule.Build K V scale_continuous.
144-
HB.instance Definition _ := Uniform_isTvs.Build K V locally_convex.
145+
HB.instance Definition _ := Uniform_isTvs.Build K V locally_convex_set.
145146
HB.instance Definition _ :=
146147
PseudoMetricNormedZmod_Tvs_isNormedModule.Build K V normrZ.
147148

theories/normedtype_theory/tvs.v

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ HB.end.
310310

311311
HB.mixin Record Uniform_isTvs (R : numDomainType) E
312312
& Uniform E & GRing.Lmodule R E := {
313-
locally_convex : exists2 B : set (set E),
314-
(forall b, b \in B -> convex b) & basis B
313+
locally_convex : exists2 B : set_system E,
314+
(forall b, b \in B -> convex_set b) & basis B
315315
}.
316316

317317
#[short(type="tvsType")]
@@ -358,8 +358,8 @@ HB.factory Record PreTopologicalLmod_isTvs (R : numDomainType) E
358358
& Topological E & GRing.Lmodule R E := {
359359
add_continuous : continuous (fun x : E * E => x.1 + x.2) ;
360360
scale_continuous : continuous (fun z : R^o * E => z.1 *: z.2) ;
361-
locally_convex : exists2 B : set (set E),
362-
(forall b, b \in B -> convex b) & basis B
361+
locally_convex : exists2 B : set_system E,
362+
(forall b, b \in B -> convex_set b) & basis B
363363
}.
364364

365365
HB.builders Context R E & PreTopologicalLmod_isTvs R E.
@@ -511,9 +511,9 @@ Unshelve. all: by end_near. Qed.
511511

512512
Local Open Scope convex_scope.
513513

514-
Let standard_ball_convex (x : R^o) (r : R) : convex (ball x r).
514+
Let standard_ball_convex_set (x : R^o) (r : R) : convex_set (ball x r).
515515
Proof.
516-
apply/convexW => z y; rewrite !inE -!ball_normE /= => zx yx l l0 l1.
516+
apply/convex_setW => z y; rewrite !inE -!ball_normE /= => zx yx l l0 l1.
517517
rewrite inE/=.
518518
rewrite [X in `|X|](_ : _ = (x - z : convex_lmodType _) <| l |>
519519
(x - y : convex_lmodType _)); last first.
@@ -524,11 +524,11 @@ rewrite -[ltRHS]mul1r -(add_onemK l%:num) [ltRHS]mulrDl.
524524
by rewrite ltrD// ltr_pM2l// onem_gt0.
525525
Qed.
526526

527-
Let standard_locally_convex :
528-
exists2 B : set (set R^o), (forall b, b \in B -> convex b) & basis B.
527+
Let standard_locally_convex_set :
528+
exists2 B : set_system R^o, (forall b, b \in B -> convex_set b) & basis B.
529529
Proof.
530530
exists [set B | exists x r, B = ball x r].
531-
by move=> B/= /[!inE]/= [[x]] [r] ->; exact: standard_ball_convex.
531+
by move=> B/= /[!inE]/= [[x]] [r] ->; exact: standard_ball_convex_set.
532532
split; first by move=> B [x] [r] ->; exact: ball_open.
533533
move=> x B; rewrite -nbhs_ballE/= => -[r] r0 Bxr /=.
534534
by exists (ball x r) => //=; split; [exists x, r|exact: ballxx].
@@ -538,14 +538,16 @@ HB.instance Definition _ :=
538538
PreTopologicalNmodule_isTopologicalNmodule.Build R^o standard_add_continuous.
539539
HB.instance Definition _ :=
540540
TopologicalNmodule_isTopologicalLmodule.Build R R^o standard_scale_continuous.
541-
HB.instance Definition _ := Uniform_isTvs.Build R R^o standard_locally_convex.
541+
HB.instance Definition _ :=
542+
Uniform_isTvs.Build R R^o standard_locally_convex_set.
542543

543544
End standard_topology.
544545

545546
Section prod_Tvs.
546547
Context (K : numFieldType) (E F : tvsType K).
547548

548-
Local Lemma prod_add_continuous : continuous (fun x : (E * F) * (E * F) => x.1 + x.2).
549+
Local Lemma prod_add_continuous :
550+
continuous (fun x : (E * F) * (E * F) => x.1 + x.2).
549551
Proof.
550552
move => [/= xy1 xy2] /= U /= [] [A B] /= [nA nB] nU.
551553
have [/= A0 [A01 A02] nA1] := @add_continuous E (xy1.1, xy2.1) _ nA.
@@ -556,7 +558,8 @@ move => [[x1 y1][x2 y2]] /= [] [] a1 b1 [] a2 b2.
556558
by apply: nU; split; [exact: (nA1 (x1, x2))|exact: (nB1 (y1, y2))].
557559
Qed.
558560

559-
Local Lemma prod_scale_continuous : continuous (fun z : K^o * (E * F) => z.1 *: z.2).
561+
Local Lemma prod_scale_continuous :
562+
continuous (fun z : K^o * (E * F) => z.1 *: z.2).
560563
Proof.
561564
move => [/= r [x y]] /= U /= []/= [A B] /= [nA nB] nU.
562565
have [/= A0 [A01 A02] nA1] := @scale_continuous K E (r, x) _ nA.
@@ -568,7 +571,7 @@ by move=> [l [e f]] /= [] [Al Bl] [] Ae Be; apply: nU; split;
568571
Qed.
569572

570573
Local Lemma prod_locally_convex :
571-
exists2 B : set (set (E * F)), (forall b, b \in B -> convex b) & basis B.
574+
exists2 B : set_system (E * F), (forall b, b \in B -> convex_set b) & basis B.
572575
Proof.
573576
have [Be Bcb Beb] := @locally_convex K E.
574577
have [Bf Bcf Bfb] := @locally_convex K F.

0 commit comments

Comments
 (0)