Skip to content

Commit 2632c4c

Browse files
authored
Merge pull request #1815 from affeldt-aist/normed_module_20260101
various easy issues
2 parents 4430cc0 + a94dd09 commit 2632c4c

File tree

6 files changed

+21
-9
lines changed

6 files changed

+21
-9
lines changed

CHANGELOG_UNRELEASED.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@
106106

107107
- in `lebesgue_integrable.v`:
108108
+ lemma `integrable_norm`
109+
- in `order_topology.v`:
110+
+ structures `POrderedNbhs`, `POrderedTopological`, `POrderedUniform`, `POrderedPseudoMetric`,
111+
`POrderedPointedTopological`
109112

110113
### Changed
111114

classical/cardinality.v

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(* mathcomp analysis (c) 2025 Inria and AIST. License: CeCILL-C. *)
1+
(* mathcomp analysis (c) 2026 Inria and AIST. License: CeCILL-C. *)
22
From HB Require Import structures.
33
From mathcomp Require Import all_ssreflect finmap ssralg ssrnum ssrint rat.
44
From mathcomp Require Import mathcomp_extra boolp classical_sets functions.
@@ -430,7 +430,7 @@ Qed.
430430
Lemma card_eq_II {n m} : reflect (n = m) (`I_n #= `I_m).
431431
Proof. by rewrite card_eq_le !card_le_II -eqn_leq; apply: eqP. Qed.
432432

433-
Lemma sub_setP {T} {A : set T} (X : set A) : set_val @` X `<=` A.
433+
Lemma sub_setP {T} {A : set T} (X : set A) : set_val @` X `<=` A.
434434
Proof. by move=> x [/= a Xa <-]; apply: set_valP. Qed.
435435
Arguments sub_setP {T A}.
436436
Arguments image_subset {aT rT} f [A B].
@@ -444,7 +444,7 @@ exists (set_val @` range f); last exact: (subset_trans (sub_setP _)).
444444
by rewrite ?(card_eql (inj_card_eq _))//; apply: in2W; apply: in2TT; apply: inj.
445445
Qed.
446446

447-
(* remove *)
447+
#[deprecated(since="mathcomp-analysis 1.15.0", note="To be removed, use other lemmas instead.")]
448448
Lemma pigeonhole m n (f : nat -> nat) : {in `I_m &, injective f} ->
449449
f @` `I_m `<=` `I_n -> (m <= n)%N.
450450
Proof.

classical/unstable.v

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,7 @@ Inductive boxed T := Box of T.
229229
Reserved Notation "`1- r" (format "`1- r", at level 2).
230230
Reserved Notation "f \^-1" (at level 35, format "f \^-1").
231231

232-
(* TODO: To be backported to finmap *)
233-
232+
(* PR in progress: https://github.com/math-comp/finmap/pull/149 *)
234233
Lemma fset_nat_maximum (X : choiceType) (A : {fset X})
235234
(f : X -> nat) : A != fset0 ->
236235
(exists i, i \in A /\ forall j, j \in A -> f j <= f i)%nat.
@@ -388,16 +387,19 @@ Qed.
388387

389388
End order_min.
390389

390+
(* PR in progress: https://github.com/math-comp/math-comp/pull/1515 *)
391391
Lemma intrD1 {R : pzRingType} (i : int) : i%:~R + 1 = (i + 1)%:~R :> R.
392392
Proof. by rewrite intrD. Qed.
393393

394+
(* PR in progress: https://github.com/math-comp/math-comp/pull/1515 *)
394395
Lemma intr1D {R : pzRingType} (i : int) : 1 + i%:~R = (1 + i)%:~R :> R.
395396
Proof. by rewrite intrD. Qed.
396397

397398
Section trunc_floor_ceil.
398399
Context {R : archiRealDomainType}.
399400
Implicit Type x : R.
400401

402+
(* PR in progress: https://github.com/math-comp/math-comp/pull/1515 *)
401403
Lemma abs_ceil_ge x : `|x| <= `|Num.ceil x|.+1%:R.
402404
Proof.
403405
rewrite -natr1 natr_absz; have [x0|x0] := ltP 0 x.

coq-mathcomp-analysis-stdlib.opam

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ depends: [
2121

2222
tags: [
2323
"category:Mathematics/Real Numbers"
24+
"category:Mathematics/Real Calculus and Topology"
2425
"keyword:real numbers"
2526
"keyword:reals"
2627
"logpath:mathcomp.reals_stdlib"

theories/normedtype_theory/normed_module.v

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(* mathcomp analysis (c) 2025 Inria and AIST. License: CeCILL-C. *)
1+
(* mathcomp analysis (c) 2026 Inria and AIST. License: CeCILL-C. *)
22
From HB Require Import structures.
33
From mathcomp Require Import all_ssreflect finmap ssralg ssrnum ssrint.
44
From mathcomp Require Import archimedean rat interval zmodp vector.
@@ -43,6 +43,7 @@ From mathcomp Require Import ereal_normedtype pseudometric_normed_Zmodule.
4343
(* lipschitz_on f F == f is lipschitz near F *)
4444
(* k.-lipschitz_on f F == f is k.-lipschitz near F *)
4545
(* k.-lipschitz_A f == f is k.-lipschitz on A *)
46+
(* k.-lipschitz f := k.-lipschitz_setT *)
4647
(* [lipschitz f x | x in A] == f is lipschitz on A *)
4748
(* [locally [lipschitz f x | x in A] == f is locally lipschitz on A *)
4849
(* [locally k.-lipschitz_A f] == f is locally k.-lipschitz on A *)

theories/topology_theory/order_topology.v

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(* mathcomp analysis (c) 2017 Inria and AIST. License: CeCILL-C. *)
1+
(* mathcomp analysis (c) 2026 Inria and AIST. License: CeCILL-C. *)
22
From HB Require Import structures.
33
From mathcomp Require Import all_ssreflect all_algebra finmap all_classical.
44
From mathcomp Require Import unstable topology_structure uniform_structure.
@@ -8,8 +8,13 @@ From mathcomp Require Import product_topology pseudometric_structure.
88
(* # Order topology *)
99
(* *)
1010
(* ``` *)
11-
(* orderTopologicalType == a topology built from intervals *)
12-
(* order_topology T == the induced order topology on T *)
11+
(* POrderedNbhs == join of Nbhs and isPOrder *)
12+
(* POrderedTopological == join of Topological and isPOrder *)
13+
(* POrderedUniform == join of Uniform and isPOrder *)
14+
(* POrderedPseudoMetric == join of PseudoMetric and isPOrder *)
15+
(* POrderedPointedTopological == join of PointedTopological and isPOrder *)
16+
(* orderTopologicalType == a topology built from intervals *)
17+
(* order_topology T == the induced order topology on T *)
1318
(* ``` *)
1419
(******************************************************************************)
1520

0 commit comments

Comments
 (0)