Skip to content

fixes issue #324 #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CohenCyril merged 1 commit into from
Jan 19, 2021
Merged

fixes issue #324 #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG_UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

### Renamed

- in `topology.v`, `ball_ler` -> `le_ball`

### Removed

- in `topology.v`:
Expand Down
8 changes: 4 additions & 4 deletions theories/topology.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3741,7 +3741,7 @@ split; first exact: open_interior.
by apply: nbhs_singleton; apply: nbhs_interior; apply:nbhsx_ballx.
Qed.

Lemma ball_ler (x : M) (e1 e2 : R) : e1 <= e2 -> ball x e1 `<=` ball x e2.
Lemma le_ball (x : M) (e1 e2 : R) : e1 <= e2 -> ball x e1 `<=` ball x e2.
Proof.
move=> le12 y. case: comparableP le12 => [lte12 _|//|//|->//].
by rewrite -[e2](subrK e1); apply/ball_triangle/ballxx; rewrite subr_gt0.
Expand Down Expand Up @@ -3909,7 +3909,7 @@ exists (\big[Num.min/1%:pos]_i \big[Num.min/1%:pos]_j xget 1%:pos
move=> MN MN_min; apply: sPA => i j.
have /(xgetPex 1%:pos): exists e : {posnum R}, diag e `<=` P i j.
by have [_/posnumP[e]] := entP i j; exists e.
apply; apply: ball_ler (MN_min i j).
apply; apply: le_ball (MN_min i j).
by apply: le_trans (bigminr_ler _ _ i) _; apply: bigminr_ler.
Qed.
Definition matrix_pseudoMetricType_mixin :=
Expand Down Expand Up @@ -3947,8 +3947,8 @@ move=> [[_/posnumP[eA] sbA] [_/posnumP[eB] sbB] sABP].
exists (Num.min eA eB)%:num => // - [[a b] [c d] [/= bac bbd]].
suff /sABP [] : (A `*` B) ((a, c), (b, d)) by move=> [[??] [??]] ? [<-<-<-<-].
split; [apply: sbA|apply: sbB] => /=.
by apply: ball_ler bac; rewrite -leEsub le_minl lexx.
by apply: ball_ler bbd; rewrite -leEsub le_minl lexx orbT.
by apply: le_ball bac; rewrite -leEsub le_minl lexx.
by apply: le_ball bbd; rewrite -leEsub le_minl lexx orbT.
Qed.
Definition prod_pseudoMetricType_mixin :=
PseudoMetric.Mixin prod_ball_center prod_ball_sym prod_ball_triangle prod_entourage.
Expand Down