Merge branch 'main' into pa/mmdatsets

JuliaStats · Sep 20, 2023 · 8261cd8 · 8261cd8
2 parents 7f7cb38 + 84d21f4
commit 8261cd8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MixedModels"
 uuid = "ff71e718-51f3-5ec2-a782-8ffcbfa3c316"
 author = ["Phillip Alday <[email protected]>", "Douglas Bates <[email protected]>", "Jose Bayoan Santiago Calderon <[email protected]>"]
-version = "4.22.0"
+version = "4.22.1"
 
 [deps]
 Arrow = "69666777-d1a9-59fb-9406-91d4454c9d45"
@@ -42,6 +42,7 @@ PooledArrays = "0.5, 1"
 PrecompileTools = "1"
 ProgressMeter = "1.7"
 StaticArrays = "0.11, 0.12, 1"
+Statistics = "1"
 StatsAPI = "1.5"
 StatsBase = "0.31, 0.32, 0.33, 0.34"
 StatsFuns = "0.8, 0.9, 1"

diff --git a/src/generalizedlinearmixedmodel.jl b/src/generalizedlinearmixedmodel.jl
@@ -278,7 +278,7 @@ function StatsAPI.fit!(
         optsum.final = copy(optsum.initial)
     end
     setpar! = fast ? setθ! : setβθ!
-    prog = ProgressUnknown("Minimizing"; showspeed=true)
+    prog = ProgressUnknown(; desc="Minimizing", showspeed=true)
     # start from zero for the initial call to obj before optimization
     iter = 0
     fitlog = optsum.fitlog

diff --git a/src/linearmixedmodel.jl b/src/linearmixedmodel.jl
@@ -457,7 +457,7 @@ function StatsAPI.fit!(
     end
     opt = Opt(optsum)
     optsum.REML = REML
-    prog = ProgressUnknown("Minimizing"; showspeed=true)
+    prog = ProgressUnknown(; desc="Minimizing", showspeed=true)
     # start from zero for the initial call to obj before optimization
     iter = 0
     fitlog = optsum.fitlog