Merge branch 'develop' into main

OHDSI · Sep 19, 2023 · 85bae99 · 85bae99
2 parents f6dbbcf + acb99c3
commit 85bae99
Show file tree

Hide file tree

Showing 39 changed files with 127 additions and 122 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -4,11 +4,7 @@ Bug Fix:
 
 1. Added support for newer API to OhdsiShinyModules (while maintaining support for old version)
 
-CohortDiagnostics 3.2.3
-=======================
-Bug Fix:
-
-1. Resolved issue with incidence rates sometimes exporting as null/infinite by setting to 0 in all error cases
+2. Resolved issue with incidence rates sometimes exporting as null/infinite by setting to 0 in all error cases
 
 
 CohortDiagnostics 3.2.3

diff --git a/R/IncidenceRates.R b/R/IncidenceRates.R
@@ -166,8 +166,8 @@ getIncidenceRate <- function(connectionDetails = NULL,
   result$incidenceRate <-
     1000 * result$cohortCount / result$personYears
   result$incidenceRate[is.nan(result$incidenceRate) |
-                         is.infinite(result$incidenceRate) |
-                         is.null(result$incidenceRate)] <- 0
+    is.infinite(result$incidenceRate) |
+    is.null(result$incidenceRate)] <- 0
   delta <- Sys.time() - start
   ParallelLogger::logInfo(paste(
     "Computing incidence rates took",

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/articles/CreatingAStudyPackage.html b/docs/articles/CreatingAStudyPackage.html
diff --git a/docs/articles/DatabaseModeInDiagnosticsExplorer.html b/docs/articles/DatabaseModeInDiagnosticsExplorer.html
diff --git a/docs/articles/RunningCohortDiagnostics.html b/docs/articles/RunningCohortDiagnostics.html
diff --git a/docs/articles/ViewingResultsUsingDiagnosticsExplorer.html b/docs/articles/ViewingResultsUsingDiagnosticsExplorer.html