Merge b0175c3 into 74b25d1

Project.toml

@@ -10,7 +10,7 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 StatsModels = "3eaba693-59b7-5ba5-a881-562e759f1c8d"
 
 [compat]
-Distributions = "0.20, 0.21, 0.22, 0.23"
+Distributions = "0.20, 0.21, 0.22, 0.23, 0.24"
 PositiveFactorizations = "0.2"
 StatsBase = "0.30, 0.31, 0.32, 0.33"
 StatsModels = "0.6"

test/runtests.jl

@@ -186,7 +186,7 @@ end
 
 
 @testset "Cox" begin
-    rossi = CSV.read(joinpath(@__DIR__, "data", "rossi.csv"))
+    rossi = CSV.read(joinpath(@__DIR__, "data", "rossi.csv"), DataFrame)
     rossi.event = EventTime.(rossi.week, rossi.arrest .== 1)
 
     outcome = coxph(@formula(event ~ fin + age + race + wexp + mar + paro + prio), rossi; tol=1e-8)
@@ -244,14 +244,14 @@ end
     @test coeftable(outcome_fin).rownms == ["fin"]
     outcome_finrace = coxph(@formula(event ~ fin * race), rossi; tol=1e-8)
     @test coeftable(outcome_finrace).rownms == ["fin", "race","fin & race"]
-    categorical!(rossi, :fin)
+    transform!(rossi, :fin => categorical, renamecols = false)
     outcome_fincat = coxph(@formula(event ~ fin), rossi; tol=1e-8)
     @test coeftable(outcome_fincat).rownms == ["fin: 1"]
     @test coef(outcome_fin) ≈ coef(outcome_fincat) atol=1e-8
     outcome_fincatrace = coxph(@formula(event ~ fin * race), rossi; tol=1e-8)
     @test coeftable(outcome_fincatrace).rownms == ["fin: 1", "race","fin: 1 & race"]
     @test coef(outcome_fincatrace) ≈ coef(outcome_finrace) atol=1e-8
-    categorical!(rossi, :race)
+    transform!(rossi, :race => categorical, renamecols = false)
     outcome_fincatracecat = coxph(@formula(event ~ fin * race), rossi; tol=1e-8)
     @test coeftable(outcome_fincatracecat).rownms == ["fin: 1", "race: 1","fin: 1 & race: 1"]
     @test coef(outcome_fincatracecat) ≈ coef(outcome_finrace) atol=1e-8