Merge branch 'develop' into edo_diagnostic

OHDSI · Sep 30, 2024 · 83d8561 · 83d8561
2 parents bacd803 + b7eb2de
commit 83d8561
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: SelfControlledCaseSeries
 Type: Package
 Title: Self-Controlled Case Series
-Version: 5.3.0
-Date: 2024-08-15
+Version: 5.3.1
+Date: 2024-09-30
 Authors@R: c(
   person("Martijn", "Schuemie", , "[email protected]", role = c("aut", "cre")),
 	person("Patrick", "Ryan", role = c("aut")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,11 @@
+SelfControlledCaseSeries 5.3.1
+==============================
+
+Bugfixes
+
+1. Fixed (near) infinite loop when using end-of-observation dependence correction and weighting function is poorly integrable. 
+
+
 SelfControlledCaseSeries 5.3.0
 ==============================
 

diff --git a/src/NumericIntegration.cpp b/src/NumericIntegration.cpp
@@ -55,7 +55,8 @@ double NumericIntegration::recursiveIntegerate(IntegrableFunction& f, const doub
   double i2 = quart/3.0*(fStart+4.0*(fMidL+fMidR)+2.0*fMiddle+fEnd);
   i1 = (16.0 * i2 - i1) / 15.0;
   double q = 0;
-  if ((std::abs(i1-i2) <= std::abs(is)) || (middle <= start) || (end <= middle)) {
+  double epsilon = 1e-5;
+  if ((std::abs(i1-i2) <= std::abs(is)) || (middle - start < epsilon) || (end - middle < epsilon)) {
     q = i1;
   } else {
     if(count < 100) {