Skip to content

Commit

Permalink
manually merge develop -> time_varying
Browse files Browse the repository at this point in the history
  • Loading branch information
jianxiaoyang committed Nov 1, 2023
2 parents 1c0ed8f + 710dcb0 commit 4ac5cac
Show file tree
Hide file tree
Showing 79 changed files with 5,578 additions and 8,310 deletions.
3 changes: 0 additions & 3 deletions CRAN-SUBMISSION

This file was deleted.

5 changes: 4 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Cyclops
Type: Package
Title: Cyclic Coordinate Descent for Logistic, Poisson and Survival Analysis
Version: 3.3.1.999
Version: 3.4.0
Authors@R: c(
person("Marc A.", "Suchard", email = "[email protected]", role = c("aut","cre")),
person("Martijn J.", "Schuemie", role = "aut"),
Expand Down Expand Up @@ -52,4 +52,7 @@ Suggests:
ggplot2,
microbenchmark,
cmprsk
NeedsCompilation: yes
RoxygenNote: 7.2.3
Roxygen: list(markdown = TRUE)
Encoding: UTF-8
7 changes: 7 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
develop
==============

Changes:

1. none yet

Cyclops v3.4.0
==============

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Cyclops
=======

[![Build Status](https://github.com/ohdsi/Cyclops/workflows/R-CMD-check/badge.svg)](https://github.com/OHDSI/Cyclops/actions?query=workflow%3AR-CMD-check)
[![codecov.io](https://app.codecov.io/github/OHDSI/Cyclops/coverage.svg?branch=main)](https://app.codecov.io/github/OHDSI/Cyclops?branch=main)
[![Build Status](https://github.com/ohdsi/Cyclops/actions/workflows/R_CMD_check_Hades.yaml/badge.svg)](https://github.com/OHDSI/Cyclops/actions?query=workflow%3AR-CMD-check)
[![codecov.io](https://codecov.io/github/OHDSI/Cyclops/coverage.svg?branch=main)](https://codecov.io/github/OHDSI/Cyclops?branch=main)
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/Cyclops)](https://CRAN.R-project.org/package=Cyclops)
[![CRAN_Status_Badge](https://cranlogs.r-pkg.org/badges/Cyclops)](https://cran.r-project.org/package=Cyclops)

Expand Down
13 changes: 3 additions & 10 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
## Resubmission after VALGRIND feedback from Brian Ripley
## Submission of v3.4.0

* fixed VALGRIND uninitialized value (UB) issue; variable 'priorType' was uninitialized,
specifically in:

==2293460== Conditional jump or move depends on uninitialised value(s)
==2293460== at 0x22CE4848: bsccs::CyclicCoordinateDescent::computeAsymptoticPrecisionMatrix() (packages/tests-vg/Cyclops/src/cyclops/CyclicCoordinateDescent.cpp:1335)
* fixed use of deprecated `$` function in `dbplyr` using CRAN errors

* fixed VALGRIND memory leak issue; was caused by calls to '::Rf_error()' instead of
'Rcpp::stop()' when handling some error edge-cases

## Test environments
* local OS X install, R 4.1
* local OS X install, R 4.3
* r-devel-valgrind docker container
* ubuntu 20.04 (via gh-actions: devel and release)
* win-builder (devel and release)
Expand Down
119 changes: 37 additions & 82 deletions docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4ac5cac

Please sign in to comment.