From 8cd9060ed42519baa65fb415bb34c74202a49cd5 Mon Sep 17 00:00:00 2001 From: Patrick Breheny Date: Fri, 14 Feb 2020 12:08:02 -0600 Subject: [PATCH] Version 3.2.2 --- DESCRIPTION | 5 +++-- NEWS | 6 ++++++ man/grpreg-package.Rd | 2 +- man/grpreg.Rd | 2 +- man/grpsurv.Rd | 2 +- src/gdfit_gaussian.c | 3 +-- src/lcdfit_binomial.c | 3 +-- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 287332e..9646c97 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,7 +3,7 @@ Title: Regularization Paths for Regression Models with Grouped Covariates Version: 3.2.2 Date: 2020-02-14 Authors@R: c( - person("Patrick", "Breheny", role=c("aut","cre"), email="patrick-breheny@uiowa.edu", comment=c(ORCID="000-0002-0650-1119")), + person("Patrick", "Breheny", role=c("aut","cre"), email="patrick-breheny@uiowa.edu", comment=c(ORCID="0000-0002-0650-1119")), person("Yaohui", "Zeng", role="ctb")) Depends: R (>= 3.1.0) Imports: Matrix @@ -18,4 +18,5 @@ BugReports: http://github.com/pbreheny/grpreg/issues License: GPL-3 URL: http://pbreheny.github.io/grpreg, https://github.com/pbreheny/grpreg LazyData: TRUE -RoxygenNote: 6.1.1 +RoxygenNote: 7.0.2 +Encoding: UTF-8 diff --git a/NEWS b/NEWS index ef19708..ac2c670 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +# ncvreg 3.2.2 (2020-02-14) + * Change: Better error detection for ill-conditioned, unpenalized matrices + * Fixed: loss.grpsurv now works for total=FALSE + * Internal: Lots of internal changes for cleaner, more reliable code + * New version numbering system + # grpreg 3.2-1 (2019-02-26) * Change: Cross-validation now balances censoring across folds for survival models diff --git a/man/grpreg-package.Rd b/man/grpreg-package.Rd index 6dcbf2c..5fedd47 100644 --- a/man/grpreg-package.Rd +++ b/man/grpreg-package.Rd @@ -72,7 +72,7 @@ nonconvex penalized linear and logistic regression models with grouped predictors. \emph{Statistics and Computing}, \strong{25}: 173-187. - \url{http://www.springerlink.com/openurl.asp?genre=article&id=doi:10.1007/s11222-013-9424-2} + \url{http://dx.doi.org/10.1007/s11222-013-9424-2} \item Breheny, P. (2015) The group exponential lasso for bi-level variable selection. \emph{Biometrics}, \strong{71}: 731-740. diff --git a/man/grpreg.Rd b/man/grpreg.Rd index 0dd3646..8260c9f 100644 --- a/man/grpreg.Rd +++ b/man/grpreg.Rd @@ -202,7 +202,7 @@ tau = 1/3, group.multiplier, warn=TRUE, returnX = FALSE, ...) \item Breheny, P. and Huang, J. (2015) Group descent algorithms for nonconvex penalized linear and logistic regression models with grouped predictors. \emph{Statistics and Computing}, \strong{25}: 173-187. - \url{http://www.springerlink.com/openurl.asp?genre=article&id=doi:10.1007/s11222-013-9424-2} + \url{http://dx.doi.org/10.1007/s11222-013-9424-2} \item Breheny, P. (2015) The group exponential lasso for bi-level variable selection. \emph{Biometrics}, \strong{71}: 731-740. diff --git a/man/grpsurv.Rd b/man/grpsurv.Rd index 6003f65..9a8c682 100644 --- a/man/grpsurv.Rd +++ b/man/grpsurv.Rd @@ -133,7 +133,7 @@ not correspond to the ith row of \code{X}): \item Breheny, P. and Huang, J. (2015) Group descent algorithms for nonconvex penalized linear and logistic regression models with grouped predictors. \emph{Statistics and Computing}, \strong{25}: 173-187. - \url{http://www.springerlink.com/openurl.asp?genre=article&id=doi:10.1007/s11222-013-9424-2} + \url{http://dx.doi.org/10.1007/s11222-013-9424-2} \item Breheny, P. (2015) The group exponential lasso for bi-level variable selection. \emph{Biometrics}, \strong{71}: 731-740. diff --git a/src/gdfit_gaussian.c b/src/gdfit_gaussian.c index 57ca6ac..ff91164 100644 --- a/src/gdfit_gaussian.c +++ b/src/gdfit_gaussian.c @@ -292,7 +292,7 @@ SEXP gdfit_gaussian(SEXP X_, SEXP y_, SEXP penalty_, SEXP K1_, SEXP K0_, for (int j=0; j