edit github actions

JorisChau · Apr 17, 2024 · e639ea8 · e639ea8
1 parent 2265c20
commit e639ea8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 25 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -34,12 +34,12 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest, r: 'devel'}
+          - {os: macOS-latest, r: 'next'}
           - {os: macOS-latest, r: 'release'}
-          - {os: windows-latest, r: 'devel', rtools: '44', http-user-agent: 'release'}
+          - {os: windows-latest, r: 'next', rtools: '44', http-user-agent: 'release'}
           - {os: windows-latest, r: 'release', rtools: '43'}
           - {os: windows-latest, r: 'oldrel', rtools: '42'}
-          - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest, r: 'next', http-user-agent: 'release'}
           - {os: ubuntu-latest, r: 'release'}
           - {os: ubuntu-latest, r: 'oldrel'}
 

diff --git a/src/nls.c b/src/nls.c
@@ -1000,12 +1000,6 @@ static void gsl_multistart_driver(pdata *pars,
                 gsl_vector_memcpy(pars->mpopt1, (pars->w)->x);
             }
         }
-
-        if (0 && verbose)
-        {
-            Rprintf("det %d = %g%s", nn, det_jtj, nn < (mpars->n - 1) ? ", " : "\n");
-            Rprintf("ssr %d = %g%s", nn, REAL_ELT(mssr, nn), nn < (mpars->n - 1) ? ", " : "\n");
-        }
     }
 
     /* reduce sample points */
@@ -1069,7 +1063,7 @@ static void gsl_multistart_driver(pdata *pars,
             {
                 if (pmin < 0.9 * l0 || (mpars->luchange)[k] > 4) // enlarge
                 {
-                    (mpars->start)[2 * k] = l0 < 0 ? gsl_max(l0 / pow(-1e-5 * (l0 - 1.0), 0.1) - 1.0, -1.0E5) : -0.01;
+                    (mpars->start)[2 * k] = l0 < 0 ? gsl_max(l0 / pow(-1e-5 * (l0 - 1.0), 0.1) - 1.0, -1.0E5) : -0.1;
                     if (pars->lu)
                         (mpars->start)[2 * k] = gsl_max((mpars->start)[2 * k], gsl_matrix_get(pars->lu, 0, k));
                     (mpars->maxlims)[2 * k] = gsl_min((mpars->start)[2 * k], (mpars->maxlims)[2 * k]);
@@ -1111,14 +1105,6 @@ static void gsl_multistart_driver(pdata *pars,
                 (mpars->luchange)[k] = (luchange_add > 0) ? (mpars->luchange)[k] + 1 : 0;
             }
         }
-
-        if (1 && verbose)
-        {
-            Rprintf("mssr*0:%g, mssr*1: %g, dtol: %g", (mpars->mssropt)[0], (mpars->mssropt)[1], (mpars->dtol));
-            Rprintf("{lwr, upr} = {");
-            for (R_len_t k = 0; k < p; k++)
-                Rprintf("(%g, %g)%s", (mpars->start)[2 * k], (mpars->start)[2 * k + 1], k < (p - 1) ? "" : "}\n");
-        }
     }
 
     /* local optimization stage */
@@ -1168,13 +1154,13 @@ static void gsl_multistart_driver(pdata *pars,
 
                 // (mpars->mpopt)->mpcount += 1;
 
-                if (0 && verbose)
-                {
-                    Rprintf("mssr*0:%g, mssr*1: %g, mchisq1: %g, det(JTJ): %g, rejectscale: %g\n", (mpars->mssropt)[0], (mpars->mssropt)[1], mchisq1, det_jtj, mpars->rejectscl);
-                    Rprintf("{opt, lwr, upr} = {");
-                    for (R_len_t k = 0; k < p; k++)
-                        Rprintf("(%g, %g, %g)%s", gsl_vector_get((pars->w)->x, k), (mpars->start)[2 * k], (mpars->start)[2 * k + 1], k < (p - 1) ? "" : "}\n");
-                }
+                // if (0 && verbose)
+                // {
+                //     Rprintf("mssr*0:%g, mssr*1: %g, mchisq1: %g, det(JTJ): %g, rejectscale: %g\n", (mpars->mssropt)[0], (mpars->mssropt)[1], mchisq1, det_jtj, mpars->rejectscl);
+                //     Rprintf("{opt, lwr, upr} = {");
+                //     for (R_len_t k = 0; k < p; k++)
+                //         Rprintf("(%g, %g, %g)%s", gsl_vector_get((pars->w)->x, k), (mpars->start)[2 * k], (mpars->start)[2 * k + 1], k < (p - 1) ? "" : "}\n");
+                // }
 
                 if (mchisq1 < (double)GSL_POSINF && ((mpars->nsp) == 0 || mchisq1 < 0.99 * (mpars->mssropt)[0]) && (det_jtj > (mpars->dtol) || mchisq1 < (2 * ftol)))
                 {