From d3c02c5ebd6b285d607db67f14b15edfe1e7b85d Mon Sep 17 00:00:00 2001 From: Asaf Manela Date: Tue, 25 Jun 2019 16:25:35 -0500 Subject: [PATCH] Cap StatsModels at v0.5 and require GLM v1.2 (#33) * fix deprecation warning for convTol renamed to rtol * changed [compat] to "0.7, 1" * capped StatsModels version at 0.5 * bumped version to 0.4.1 * require GLM v1.2+ for rtol argument of fit! --- Project.toml | 7 +++++-- src/Lasso.jl | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 7c19144..ec3193c 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "Lasso" uuid = "b4fcebef-c861-5a0f-a7e2-ba9dc32b180a" -version = "0.4.0" +version = "0.4.1" [deps] DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2" @@ -12,9 +12,12 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" +StatsModels = "3eaba693-59b7-5ba5-a881-562e759f1c8d" [compat] -julia = "≥ 0.7.0" +GLM = "1.2" +StatsModels = "0.4, 0.5" +julia = "0.7, 1" [extras] CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" diff --git a/src/Lasso.jl b/src/Lasso.jl index 63c8879..1157bf6 100644 --- a/src/Lasso.jl +++ b/src/Lasso.jl @@ -315,7 +315,7 @@ function build_model(X::AbstractMatrix{T}, y::FPVector, d::UnivariateDistributio # Fit to find null deviance # Maybe we should reuse this GlmResp object? nullmodel = fit(GeneralizedLinearModel, nullX(X, intercept, ω), y, d, l; - wts=wts, offset=offset, convTol=irls_tol, dofit=dofit) + wts=wts, offset=offset, rtol=irls_tol, dofit=dofit) nulldev = deviance(nullmodel) nullb0 = intercept ? coef(nullmodel)[1] : zero(T)