diff --git a/DESCRIPTION b/DESCRIPTION index d49fce2a..200f61c4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: Cyclops Type: Package Title: Cyclic Coordinate Descent for Logistic, Poisson and Survival Analysis -Version: 3.4.1 +Version: 3.5.0 Authors@R: c( person("Marc A.", "Suchard", email = "msuchard@ucla.edu", role = c("aut","cre")), person("Martijn J.", "Schuemie", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 55c8968d..56f2259e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,8 +1,9 @@ -develop +Cyclops v3.5.0 ============== -1. make `maxResets` a function parameter -2. provide optional (`optimalWarmStart = FALSE`) more parallelization when profiling likelihood +1. provide optional (`optimalWarmStart = FALSE`) more parallelization when profiling likelihood +2. make `maxResets` a function parameter +3. ensure compatibility with R v4.4 Cyclops v3.4.1 ============== diff --git a/R/DataManagement.R b/R/DataManagement.R index 16e6eae6..dec0b050 100644 --- a/R/DataManagement.R +++ b/R/DataManagement.R @@ -63,11 +63,11 @@ #' @param time #' Currently undocumented #' @param dx -#' Optional dense \code{"\link{Matrix}"} of covariates +#' Optional dense \code{"\link[Matrix]{Matrix}"} of covariates #' @param sx -#' Optional sparse \code{"\link{Matrix}"} of covariates +#' Optional sparse \code{"\link[Matrix]{Matrix}"} of covariates #' @param ix -#' Optional \{0,1\} \code{"\link{Matrix}"} of covariates +#' Optional \{0,1\} \code{"\link[Matrix]{Matrix}"} of covariates #' @param model #' Currently undocumented #' @param method diff --git a/R/cyclops.R b/R/cyclops.R index 9ca66fb6..022ad717 100644 --- a/R/cyclops.R +++ b/R/cyclops.R @@ -29,7 +29,6 @@ #' on computational optimization and fine-scale parallelization to yield #' efficient inference in massive datasets. #' -#' @docType package #' @name cyclops #' @import Rcpp Matrix dplyr #' @@ -38,7 +37,7 @@ #' @importFrom rlang .data #' #' @useDynLib Cyclops, .registration = TRUE -NULL +"_PACKAGE" .onUnload <- function (libpath) { library.dynam.unload("Cyclops", libpath) diff --git a/man/createCyclopsData.Rd b/man/createCyclopsData.Rd index 8b4c43b4..136e1bf4 100644 --- a/man/createCyclopsData.Rd +++ b/man/createCyclopsData.Rd @@ -54,11 +54,11 @@ createCyclopsData( \item{type}{Currently undocumented} -\item{dx}{Optional dense \code{"\link{Matrix}"} of covariates} +\item{dx}{Optional dense \code{"\link[Matrix]{Matrix}"} of covariates} -\item{sx}{Optional sparse \code{"\link{Matrix}"} of covariates} +\item{sx}{Optional sparse \code{"\link[Matrix]{Matrix}"} of covariates} -\item{ix}{Optional \{0,1\} \code{"\link{Matrix}"} of covariates} +\item{ix}{Optional \{0,1\} \code{"\link[Matrix]{Matrix}"} of covariates} \item{model}{Currently undocumented}