data.qpf.multivariate.constructions.comp
⟷
Mathlib.Data.QPF.Multivariate.Constructions.Comp
The following section lists changes to this file in mathlib3 and mathlib4 that occured after the initial port. Most recent changes are shown first. Hovering over a commit will show all commits associated with the same mathlib3 commit.
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(no changes)
(last sync)
mathlib commit https://github.com/leanprover-community/mathlib/commit/65a1391a0106c9204fe45bc73a039f056558cb83
@@ -3,8 +3,8 @@ Copyright (c) 2018 Jeremy Avigad. All rights reserved.
Released under Apache 2.0 license as described in the file LICENSE.
Authors: Jeremy Avigad, Simon Hudon
-/
-import Data.Pfunctor.Multivariate.Basic
-import Data.Qpf.Multivariate.Basic
+import Data.PFunctor.Multivariate.Basic
+import Data.QPF.Multivariate.Basic
#align_import data.qpf.multivariate.constructions.comp from "leanprover-community/mathlib"@"23aa88e32dcc9d2a24cca7bc23268567ed4cd7d6"
mathlib commit https://github.com/leanprover-community/mathlib/commit/ce64cd319bb6b3e82f31c2d38e79080d377be451
@@ -3,8 +3,8 @@ Copyright (c) 2018 Jeremy Avigad. All rights reserved.
Released under Apache 2.0 license as described in the file LICENSE.
Authors: Jeremy Avigad, Simon Hudon
-/
-import Mathbin.Data.Pfunctor.Multivariate.Basic
-import Mathbin.Data.Qpf.Multivariate.Basic
+import Data.Pfunctor.Multivariate.Basic
+import Data.Qpf.Multivariate.Basic
#align_import data.qpf.multivariate.constructions.comp from "leanprover-community/mathlib"@"23aa88e32dcc9d2a24cca7bc23268567ed4cd7d6"
mathlib commit https://github.com/leanprover-community/mathlib/commit/8ea5598db6caeddde6cb734aa179cc2408dbd345
@@ -2,15 +2,12 @@
Copyright (c) 2018 Jeremy Avigad. All rights reserved.
Released under Apache 2.0 license as described in the file LICENSE.
Authors: Jeremy Avigad, Simon Hudon
-
-! This file was ported from Lean 3 source module data.qpf.multivariate.constructions.comp
-! leanprover-community/mathlib commit 23aa88e32dcc9d2a24cca7bc23268567ed4cd7d6
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
-/
import Mathbin.Data.Pfunctor.Multivariate.Basic
import Mathbin.Data.Qpf.Multivariate.Basic
+#align_import data.qpf.multivariate.constructions.comp from "leanprover-community/mathlib"@"23aa88e32dcc9d2a24cca7bc23268567ed4cd7d6"
+
/-!
# The composition of QPFs is itself a QPF
mathlib commit https://github.com/leanprover-community/mathlib/commit/9fb8964792b4237dac6200193a0d533f1b3f7423
@@ -62,17 +62,19 @@ protected def get (x : (Comp F G) α) : F fun i => G i α :=
#align mvqpf.comp.get MvQPF.Comp.get
-/
+#print MvQPF.Comp.mk_get /-
@[simp]
protected theorem mk_get (x : (Comp F G) α) : Comp.mk (Comp.get x) = x :=
rfl
#align mvqpf.comp.mk_get MvQPF.Comp.mk_get
+-/
+#print MvQPF.Comp.get_mk /-
@[simp]
protected theorem get_mk (x : F fun i => G i α) : Comp.get (Comp.mk x) = x :=
rfl
#align mvqpf.comp.get_mk MvQPF.Comp.get_mk
-
-include fG
+-/
#print MvQPF.Comp.map' /-
/-- map operation defined on a vector of functors -/
@@ -80,8 +82,6 @@ protected def map' : (fun i : Fin2 n => G i α) ⟹ fun i : Fin2 n => G i β :=
#align mvqpf.comp.map' MvQPF.Comp.map'
-/
-include fF
-
#print MvQPF.Comp.map /-
/-- The composition of functors is itself functorial -/
protected def map : (Comp F G) α → (Comp F G) β :=
@@ -91,17 +91,19 @@ protected def map : (Comp F G) α → (Comp F G) β :=
instance : MvFunctor (Comp F G) where map α β := Comp.map
+#print MvQPF.Comp.map_mk /-
theorem map_mk (x : F fun i => G i α) :
f <$$> Comp.mk x = Comp.mk ((fun i (x : G i α) => f <$$> x) <$$> x) :=
rfl
#align mvqpf.comp.map_mk MvQPF.Comp.map_mk
+-/
+#print MvQPF.Comp.get_map /-
theorem get_map (x : Comp F G α) :
Comp.get (f <$$> x) = (fun i (x : G i α) => f <$$> x) <$$> Comp.get x :=
rfl
#align mvqpf.comp.get_map MvQPF.Comp.get_map
-
-include q q'
+-/
instance : MvQPF (Comp F G)
where
mathlib commit https://github.com/leanprover-community/mathlib/commit/cca40788df1b8755d5baf17ab2f27dacc2e17acb
@@ -110,9 +110,9 @@ instance : MvQPF (Comp F G)
repr α :=
MvPFunctor.comp.mk ∘
repr ∘ (map fun i => (repr : G i α → (fun i : Fin2 n => Obj (p (G i)) α) i)) ∘ Comp.get
- abs_repr := by intros ; simp [(· ∘ ·), MvFunctor.map_map, (· ⊚ ·), abs_repr]
+ abs_repr := by intros; simp [(· ∘ ·), MvFunctor.map_map, (· ⊚ ·), abs_repr]
abs_map := by
- intros ; simp [(· ∘ ·)]; rw [← abs_map]
+ intros; simp [(· ∘ ·)]; rw [← abs_map]
simp [MvFunctor.id_map, (· ⊚ ·), map_mk, MvPFunctor.comp.get_map, abs_map, MvFunctor.map_map,
abs_repr]
mathlib commit https://github.com/leanprover-community/mathlib/commit/917c3c072e487b3cccdbfeff17e75b40e45f66cb
@@ -26,7 +26,7 @@ universe u
namespace MvQPF
-open MvFunctor
+open scoped MvFunctor
variable {n m : ℕ} (F : TypeVec.{u} n → Type _) [fF : MvFunctor F] [q : MvQPF F]
(G : Fin2 n → TypeVec.{u} m → Type u) [fG : ∀ i, MvFunctor <| G i] [q' : ∀ i, MvQPF <| G i]
mathlib commit https://github.com/leanprover-community/mathlib/commit/917c3c072e487b3cccdbfeff17e75b40e45f66cb
@@ -62,23 +62,11 @@ protected def get (x : (Comp F G) α) : F fun i => G i α :=
#align mvqpf.comp.get MvQPF.Comp.get
-/
-/- warning: mvqpf.comp.mk_get -> MvQPF.Comp.mk_get is a dubious translation:
-lean 3 declaration is
- forall {n : Nat} {m : Nat} {F : (TypeVec.{u1} n) -> Type.{u2}} {G : (Fin2 n) -> (TypeVec.{u1} m) -> Type.{u1}} {α : TypeVec.{u1} m} (x : MvQPF.Comp.{u1, u2} n m F G α), Eq.{succ u2} (MvQPF.Comp.{u1, u2} n m F G α) (MvQPF.Comp.mk.{u1, u2} n m F G α (MvQPF.Comp.get.{u1, u2} n m F G α x)) x
-but is expected to have type
- forall {n : Nat} {m : Nat} {F : (TypeVec.{u2} n) -> Type.{u1}} {G : (Fin2 n) -> (TypeVec.{u2} m) -> Type.{u2}} {α : TypeVec.{u2} m} (x : MvQPF.Comp.{u2, u1} n m F G α), Eq.{succ u1} (MvQPF.Comp.{u2, u1} n m F (fun (i : Fin2 n) => G i) α) (MvQPF.Comp.mk.{u2, u1} n m F (fun (i : Fin2 n) => G i) α (MvQPF.Comp.get.{u2, u1} n m F G α x)) x
-Case conversion may be inaccurate. Consider using '#align mvqpf.comp.mk_get MvQPF.Comp.mk_getₓ'. -/
@[simp]
protected theorem mk_get (x : (Comp F G) α) : Comp.mk (Comp.get x) = x :=
rfl
#align mvqpf.comp.mk_get MvQPF.Comp.mk_get
-/- warning: mvqpf.comp.get_mk -> MvQPF.Comp.get_mk is a dubious translation:
-lean 3 declaration is
- forall {n : Nat} {m : Nat} {F : (TypeVec.{u1} n) -> Type.{u2}} {G : (Fin2 n) -> (TypeVec.{u1} m) -> Type.{u1}} {α : TypeVec.{u1} m} (x : F (fun (i : Fin2 n) => G i α)), Eq.{succ u2} (F (fun (i : Fin2 n) => G i α)) (MvQPF.Comp.get.{u1, u2} n m F G α (MvQPF.Comp.mk.{u1, u2} n m F G α x)) x
-but is expected to have type
- forall {n : Nat} {m : Nat} {F : (TypeVec.{u2} n) -> Type.{u1}} {G : (Fin2 n) -> (TypeVec.{u2} m) -> Type.{u2}} {α : TypeVec.{u2} m} (x : F (fun (i : Fin2 n) => G i α)), Eq.{succ u1} (F (fun (i : Fin2 n) => G i α)) (MvQPF.Comp.get.{u2, u1} n m F (fun (i : Fin2 n) => G i) α (MvQPF.Comp.mk.{u2, u1} n m F (fun (i : Fin2 n) => G i) α x)) x
-Case conversion may be inaccurate. Consider using '#align mvqpf.comp.get_mk MvQPF.Comp.get_mkₓ'. -/
@[simp]
protected theorem get_mk (x : F fun i => G i α) : Comp.get (Comp.mk x) = x :=
rfl
@@ -103,23 +91,11 @@ protected def map : (Comp F G) α → (Comp F G) β :=
instance : MvFunctor (Comp F G) where map α β := Comp.map
-/- warning: mvqpf.comp.map_mk -> MvQPF.Comp.map_mk is a dubious translation:
-lean 3 declaration is
- forall {n : Nat} {m : Nat} {F : (TypeVec.{u1} n) -> Type.{u2}} [fF : MvFunctor.{u1, u2} n F] {G : (Fin2 n) -> (TypeVec.{u1} m) -> Type.{u1}} [fG : forall (i : Fin2 n), MvFunctor.{u1, u1} m (G i)] {α : TypeVec.{u1} m} {β : TypeVec.{u1} m} (f : TypeVec.Arrow.{u1, u1} m α β) (x : F (fun (i : Fin2 n) => G i α)), Eq.{succ u2} (MvQPF.Comp.{u1, u2} n m F (fun (i : Fin2 n) {α : TypeVec.{u1} m} => G i α) β) (MvFunctor.map.{u1, u2} m (MvQPF.Comp.{u1, u2} n m F (fun (i : Fin2 n) {α : TypeVec.{u1} m} => G i α)) (MvQPF.Comp.mvfunctor.{u1, u2} n m F fF (fun (i : Fin2 n) {α : TypeVec.{u1} m} => G i α) (fun (i : Fin2 n) => fG i)) α β f (MvQPF.Comp.mk.{u1, u2} n m F (fun (i : Fin2 n) {α : TypeVec.{u1} m} => G i α) α x)) (MvQPF.Comp.mk.{u1, u2} n m F (fun (i : Fin2 n) {α : TypeVec.{u1} m} => G i α) β (MvFunctor.map.{u1, u2} n F fF (fun (i : Fin2 n) => G i α) (fun (i : Fin2 n) => G i β) (fun (i : Fin2 n) (x : G i α) => MvFunctor.map.{u1, u1} m (fun {α : TypeVec.{u1} m} => G i α) (fG i) α β f x) x))
-but is expected to have type
- forall {n : Nat} {m : Nat} {F : (TypeVec.{u2} n) -> Type.{u1}} [fF : MvFunctor.{u2, u1} n F] {G : (Fin2 n) -> (TypeVec.{u2} m) -> Type.{u2}} [fG : forall (i : Fin2 n), MvFunctor.{u2, u2} m (G i)] {α : TypeVec.{u2} m} {β : TypeVec.{u2} m} (f : TypeVec.Arrow.{u2, u2} m α β) (x : F (fun (i : Fin2 n) => G i α)), Eq.{succ u1} (MvQPF.Comp.{u2, u1} n m F (fun (i : Fin2 n) => G i) β) (MvFunctor.map.{u2, u1} m (MvQPF.Comp.{u2, u1} n m F (fun (i : Fin2 n) => G i)) (MvQPF.Comp.instMvFunctorComp.{u2, u1} n m F fF (fun (i : Fin2 n) => G i) (fun (i : Fin2 n) => fG i)) α β f (MvQPF.Comp.mk.{u2, u1} n m F (fun (i : Fin2 n) => G i) α x)) (MvQPF.Comp.mk.{u2, u1} n m F (fun (i : Fin2 n) => G i) β (MvFunctor.map.{u2, u1} n F fF (fun (i : Fin2 n) => G i α) (fun (i : Fin2 n) => G i β) (fun (i : Fin2 n) (x : G i α) => MvFunctor.map.{u2, u2} m (G i) (fG i) α β f x) x))
-Case conversion may be inaccurate. Consider using '#align mvqpf.comp.map_mk MvQPF.Comp.map_mkₓ'. -/
theorem map_mk (x : F fun i => G i α) :
f <$$> Comp.mk x = Comp.mk ((fun i (x : G i α) => f <$$> x) <$$> x) :=
rfl
#align mvqpf.comp.map_mk MvQPF.Comp.map_mk
-/- warning: mvqpf.comp.get_map -> MvQPF.Comp.get_map is a dubious translation:
-lean 3 declaration is
- forall {n : Nat} {m : Nat} {F : (TypeVec.{u1} n) -> Type.{u2}} [fF : MvFunctor.{u1, u2} n F] {G : (Fin2 n) -> (TypeVec.{u1} m) -> Type.{u1}} [fG : forall (i : Fin2 n), MvFunctor.{u1, u1} m (G i)] {α : TypeVec.{u1} m} {β : TypeVec.{u1} m} (f : TypeVec.Arrow.{u1, u1} m α β) (x : MvQPF.Comp.{u1, u2} n m F G α), Eq.{succ u2} (F (fun (i : Fin2 n) => G i β)) (MvQPF.Comp.get.{u1, u2} n m F G β (MvFunctor.map.{u1, u2} m (MvQPF.Comp.{u1, u2} n m F G) (MvQPF.Comp.mvfunctor.{u1, u2} n m F fF G (fun (i : Fin2 n) => fG i)) α β f x)) (MvFunctor.map.{u1, u2} n F fF (fun (i : Fin2 n) => G i α) (fun (i : Fin2 n) => G i β) (fun (i : Fin2 n) (x : G i α) => MvFunctor.map.{u1, u1} m (fun {α : TypeVec.{u1} m} => G i α) (fG i) α β f x) (MvQPF.Comp.get.{u1, u2} n m F G α x))
-but is expected to have type
- forall {n : Nat} {m : Nat} {F : (TypeVec.{u2} n) -> Type.{u1}} [fF : MvFunctor.{u2, u1} n F] {G : (Fin2 n) -> (TypeVec.{u2} m) -> Type.{u2}} [fG : forall (i : Fin2 n), MvFunctor.{u2, u2} m (G i)] {α : TypeVec.{u2} m} {β : TypeVec.{u2} m} (f : TypeVec.Arrow.{u2, u2} m α β) (x : MvQPF.Comp.{u2, u1} n m F G α), Eq.{succ u1} (F (fun (i : Fin2 n) => G i β)) (MvQPF.Comp.get.{u2, u1} n m F G β (MvFunctor.map.{u2, u1} m (MvQPF.Comp.{u2, u1} n m F G) (MvQPF.Comp.instMvFunctorComp.{u2, u1} n m F fF G (fun (i : Fin2 n) => fG i)) α β f x)) (MvFunctor.map.{u2, u1} n F fF (fun (i : Fin2 n) => G i α) (fun (i : Fin2 n) => G i β) (fun (i : Fin2 n) (x : G i α) => MvFunctor.map.{u2, u2} m (G i) (fG i) α β f x) (MvQPF.Comp.get.{u2, u1} n m F (fun (i : Fin2 n) => G i) α x))
-Case conversion may be inaccurate. Consider using '#align mvqpf.comp.get_map MvQPF.Comp.get_mapₓ'. -/
theorem get_map (x : Comp F G α) :
Comp.get (f <$$> x) = (fun i (x : G i α) => f <$$> x) <$$> Comp.get x :=
rfl
mathlib commit https://github.com/leanprover-community/mathlib/commit/917c3c072e487b3cccdbfeff17e75b40e45f66cb
@@ -134,13 +134,9 @@ instance : MvQPF (Comp F G)
repr α :=
MvPFunctor.comp.mk ∘
repr ∘ (map fun i => (repr : G i α → (fun i : Fin2 n => Obj (p (G i)) α) i)) ∘ Comp.get
- abs_repr := by
- intros
- simp [(· ∘ ·), MvFunctor.map_map, (· ⊚ ·), abs_repr]
+ abs_repr := by intros ; simp [(· ∘ ·), MvFunctor.map_map, (· ⊚ ·), abs_repr]
abs_map := by
- intros
- simp [(· ∘ ·)]
- rw [← abs_map]
+ intros ; simp [(· ∘ ·)]; rw [← abs_map]
simp [MvFunctor.id_map, (· ⊚ ·), map_mk, MvPFunctor.comp.get_map, abs_map, MvFunctor.map_map,
abs_repr]
mathlib commit https://github.com/leanprover-community/mathlib/commit/3ade05ac9447ae31a22d2ea5423435e054131240
@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Jeremy Avigad, Simon Hudon
! This file was ported from Lean 3 source module data.qpf.multivariate.constructions.comp
-! leanprover-community/mathlib commit 58581d0fe523063f5651df0619be2bf65012a94a
+! leanprover-community/mathlib commit 23aa88e32dcc9d2a24cca7bc23268567ed4cd7d6
! Please do not edit these lines, except to modify the commit id
! if you have ported upstream changes.
-/
@@ -14,6 +14,9 @@ import Mathbin.Data.Qpf.Multivariate.Basic
/-!
# The composition of QPFs is itself a QPF
+> THIS FILE IS SYNCHRONIZED WITH MATHLIB4.
+> Any changes to this file require a corresponding PR to mathlib4.
+
We define composition between one `n`-ary functor and `n` `m`-ary functors
and show that it preserves the QPF structure
-/
mathlib commit https://github.com/leanprover-community/mathlib/commit/bd9851ca476957ea4549eb19b40e7b5ade9428cc
This is the supremum of
along with some minor fixes from failures on nightly-testing as Mathlib master
is merged into it.
Note that some PRs for changes that are already compatible with the current toolchain and will be necessary have already been split out: #8380.
I am hopeful that in future we will be able to progressively merge adaptation PRs into a bump/v4.X.0
branch, so we never end up with a "big merge" like this. However one of these adaptation PRs (#8056) predates my new scheme for combined CI, and it wasn't possible to keep that PR viable in the meantime.
In particular this includes adjustments for the Lean PRs
We can get rid of all the
local macro_rules | `($x ^ $y) => `(HPow.hPow $x $y) -- Porting note: See issue [lean4#2220](https://github.com/leanprover/lean4/pull/2220)
macros across Mathlib (and in any projects that want to write natural number powers of reals).
Changes the default behaviour of simp
to (config := {decide := false})
. This makes simp
(and consequentially norm_num
) less powerful, but also more consistent, and less likely to blow up in long failures. This requires a variety of changes: changing some previously by simp
or norm_num
to decide
or rfl
, or adding (config := {decide := true})
.
This changed the behaviour of simp
so that simp [f]
will only unfold "fully applied" occurrences of f
. The old behaviour can be recovered with simp (config := { unfoldPartialApp := true })
. We may in future add a syntax for this, e.g. simp [!f]
; please provide feedback! In the meantime, we have made the following changes:
(config := { unfoldPartialApp := true })
in some places, to recover the old behaviour@[eqns]
to manually adjust the equation lemmas for a particular definition, recovering the old behaviour just for that definition. See #8371, where we do this for Function.comp
and Function.flip
.This change in Lean may require further changes down the line (e.g. adding the !f
syntax, and/or upstreaming the special treatment for Function.comp
and Function.flip
, and/or removing this special treatment). Please keep an open and skeptical mind about these changes!
Co-authored-by: leanprover-community-mathlib4-bot <leanprover-community-mathlib4-bot@users.noreply.github.com> Co-authored-by: Scott Morrison <scott.morrison@gmail.com> Co-authored-by: Eric Wieser <wieser.eric@gmail.com> Co-authored-by: Mauricio Collares <mauricio@collares.org>
@@ -79,10 +79,16 @@ instance : MvQPF (Comp F G) where
abs := Comp.mk ∘ (map fun i ↦ abs) ∘ abs ∘ MvPFunctor.comp.get
repr {α} := MvPFunctor.comp.mk ∘ repr ∘
(map fun i ↦ (repr : G i α → (fun i : Fin2 n ↦ Obj (P (G i)) α) i)) ∘ Comp.get
- abs_repr := by intros; simp only [(· ∘ ·), comp.get_mk, abs_repr, map_map,
- TypeVec.comp, MvFunctor.id_map', Comp.mk_get]
- abs_map := by intros; simp only [(· ∘ ·)]; rw [← abs_map]
- simp only [comp.get_map, map_map, TypeVec.comp, abs_map, map_mk]
+ abs_repr := by
+ intros
+ simp (config := { unfoldPartialApp := true }) only [Function.comp_def, comp.get_mk, abs_repr,
+ map_map, TypeVec.comp, MvFunctor.id_map', Comp.mk_get]
+ abs_map := by
+ intros
+ simp only [(· ∘ ·)]
+ rw [← abs_map]
+ simp (config := { unfoldPartialApp := true }) only [comp.get_map, map_map, TypeVec.comp,
+ abs_map, map_mk]
end Comp
@@ -40,15 +40,15 @@ variable {F G} {α β : TypeVec.{u} m} (f : α ⟹ β)
instance [I : Inhabited (F fun i : Fin2 n ↦ G i α)] : Inhabited (Comp F G α) := I
/-- Constructor for functor composition -/
-protected def mk (x : F fun i ↦ G i α) : (Comp F G) α := x
+protected def mk (x : F fun i ↦ G i α) : Comp F G α := x
#align mvqpf.comp.mk MvQPF.Comp.mk
/-- Destructor for functor composition -/
-protected def get (x : (Comp F G) α) : F fun i ↦ G i α := x
+protected def get (x : Comp F G α) : F fun i ↦ G i α := x
#align mvqpf.comp.get MvQPF.Comp.get
@[simp]
-protected theorem mk_get (x : (Comp F G) α) : Comp.mk (Comp.get x) = x := rfl
+protected theorem mk_get (x : Comp F G α) : Comp.mk (Comp.get x) = x := rfl
#align mvqpf.comp.mk_get MvQPF.Comp.mk_get
@[simp]
Type _
and Sort _
(#6499)
We remove all possible occurences of Type _
and Sort _
in favor of Type*
and Sort*
.
This has nice performance benefits.
@@ -22,7 +22,7 @@ namespace MvQPF
open MvFunctor
-variable {n m : ℕ} (F : TypeVec.{u} n → Type _) [fF : MvFunctor F] [q : MvQPF F]
+variable {n m : ℕ} (F : TypeVec.{u} n → Type*) [fF : MvFunctor F] [q : MvQPF F]
(G : Fin2 n → TypeVec.{u} m → Type u) [fG : ∀ i, MvFunctor <| G i] [q' : ∀ i, MvQPF <| G i]
/-- Composition of an `n`-ary functor with `n` `m`-ary
@@ -2,15 +2,12 @@
Copyright (c) 2018 Jeremy Avigad. All rights reserved.
Released under Apache 2.0 license as described in the file LICENSE.
Authors: Jeremy Avigad, Simon Hudon
-
-! This file was ported from Lean 3 source module data.qpf.multivariate.constructions.comp
-! leanprover-community/mathlib commit dc6c365e751e34d100e80fe6e314c3c3e0fd2988
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
-/
import Mathlib.Data.PFunctor.Multivariate.Basic
import Mathlib.Data.QPF.Multivariate.Basic
+#align_import data.qpf.multivariate.constructions.comp from "leanprover-community/mathlib"@"dc6c365e751e34d100e80fe6e314c3c3e0fd2988"
+
/-!
# The composition of QPFs is itself a QPF
The unported dependencies are