*_gaussian.c: Changed < to <= for convergence check; fixes #46

pbreheny · Aug 11, 2021 · 1f9b9a0 · 1f9b9a0
1 parent 989b6dc
commit 1f9b9a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.version.json b/.version.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
   "label": "GitHub",
-  "message": "3.4.0",
+  "message": "3.4.0.1",
   "color": "blue"
 }
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: grpreg
 Title: Regularization Paths for Regression Models with Grouped Covariates
-Version: 3.4.0
-Date: 2021-07-22
+Version: 3.4.0.1
+Date: 2021-08-11
 Authors@R: c(
   person("Patrick", "Breheny", role=c("aut","cre"), email="[email protected]", comment=c(ORCID="0000-0002-0650-1119")),
   person("Yaohui", "Zeng", role="ctb"),

diff --git a/src/gdfit_gaussian.c b/src/gdfit_gaussian.c
@@ -395,10 +395,10 @@ SEXP gdfit_gaussian(SEXP X_, SEXP y_, SEXP penalty_, SEXP K1_, SEXP K0_,
               gd_gaussian(b, X, r, g, K1, K, n, l, p, penalty, l1, l2, gamma, df, a, &maxChange);
             }
           }
-          
+
           // Check convergence
           for (int j=0; j<p; j++) a[j] = b[l*p+j];
-          if (maxChange < eps*sdy) break;
+          if (maxChange <= eps*sdy) break;
         }
         // Scan for violations in strong set
         violations = check_strong_set(e2, e, xTr, X, r, K1, K, lam[l], n, J, m);

diff --git a/src/lcdfit_gaussian.c b/src/lcdfit_gaussian.c
@@ -223,7 +223,7 @@ SEXP lcdfit_gaussian(SEXP X_, SEXP y_, SEXP penalty_, SEXP K1_, SEXP K0_, SEXP l
 
         // Check for convergence      
         for (int j=0; j<p; j++) a[j] = b[l*p+j];
-        if (maxChange < eps*sdy) break;
+        if (maxChange <= eps*sdy) break;
       }
 
       // Scan for violations