From eacabc1f0edcf7b06726cd3a3c34eadf8bf5e8e3 Mon Sep 17 00:00:00 2001
From: Patrick Breheny <patrick-breheny@uiowa.edu>
Date: Sat, 7 Apr 2018 07:19:26 -0500
Subject: [PATCH] Changing | to ||

---
 src/gdfit_binomial.c  | 4 ++--
 src/gdfit_cox.c       | 4 ++--
 src/gdfit_gaussian.c  | 4 ++--
 src/gdfit_poisson.c   | 4 ++--
 src/lcdfit_binomial.c | 2 +-
 src/lcdfit_cox.c      | 2 +-
 src/lcdfit_gaussian.c | 2 +-
 src/lcdfit_poisson.c  | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/gdfit_binomial.c b/src/gdfit_binomial.c
index 0fbcb95..173a055 100644
--- a/src/gdfit_binomial.c
+++ b/src/gdfit_binomial.c
@@ -28,7 +28,7 @@ void gd_binomial(double *b, double *x, double *r, double *eta, int g, int *K1, i
   if (strcmp(penalty, "grLasso")==0) len = S(v * z_norm, lam1) / (v * (1 + lam2));
   if (strcmp(penalty, "grMCP")==0) len = F(v * z_norm, lam1, lam2, gamma) / v;
   if (strcmp(penalty, "grSCAD")==0) len = Fs(v * z_norm, lam1, lam2, gamma) / v;
-  if (len != 0 | a[K1[g]] != 0) {
+  if (len != 0 || a[K1[g]] != 0) {
     // If necessary, update b and r
     for (int j=K1[g]; j<K1[g+1]; j++) {
       b[l*p+j] = len * z[j-K1[g]] / z_norm;
@@ -133,7 +133,7 @@ SEXP gdfit_binomial(SEXP X_, SEXP y_, SEXP penalty_, SEXP K1_, SEXP K0_, SEXP la
 	  nv = nv + (K1[g+1]-K1[g]);
 	}
       }
-      if (ng > gmax | nv > dfmax | tot_iter == max_iter) {
+      if (ng > gmax || nv > dfmax || tot_iter == max_iter) {
 	for (int ll=l; ll<L; ll++) INTEGER(iter)[ll] = NA_INTEGER;
         break;
       }
diff --git a/src/gdfit_cox.c b/src/gdfit_cox.c
index a5332a5..df7e490 100644
--- a/src/gdfit_cox.c
+++ b/src/gdfit_cox.c
@@ -26,7 +26,7 @@ void gd_cox(double *b, double *x, double *r, double *eta, double v, int g,
   if (strcmp(penalty, "grLasso")==0) len = S(v * z_norm, lam1) / (v * (1 + lam2));
   if (strcmp(penalty, "grMCP")==0) len = F(v * z_norm, lam1, lam2, gamma) / v;
   if (strcmp(penalty, "grSCAD")==0) len = Fs(v * z_norm, lam1, lam2, gamma) / v;
-  if (len != 0 | a[K1[g]] != 0) {
+  if (len != 0 || a[K1[g]] != 0) {
     // If necessary, update b and r
     for (int j=K1[g]; j<K1[g+1]; j++) {
       b[l*p+j] = len * z[j-K1[g]] / z_norm;
@@ -128,7 +128,7 @@ SEXP gdfit_cox(SEXP X_, SEXP d_, SEXP penalty_, SEXP K1_, SEXP K0_, SEXP lambda,
 	  nv = nv + (K1[g+1]-K1[g]);
 	}
       }
-      if (ng > gmax | nv > dfmax | tot_iter == max_iter) {
+      if (ng > gmax || nv > dfmax || tot_iter == max_iter) {
         for (int ll=l; ll<L; ll++) INTEGER(iter)[ll] = NA_INTEGER;
         break;
       }
diff --git a/src/gdfit_gaussian.c b/src/gdfit_gaussian.c
index 58298af..994df2c 100644
--- a/src/gdfit_gaussian.c
+++ b/src/gdfit_gaussian.c
@@ -33,7 +33,7 @@ void gd_gaussian(double *b, double *x, double *r, int g, int *K1, int *K,
   if (strcmp(penalty, "grLasso")==0) len = S(z_norm, lam1) / (1+lam2);
   if (strcmp(penalty, "grMCP")==0) len = F(z_norm, lam1, lam2, gamma);
   if (strcmp(penalty, "grSCAD")==0) len = Fs(z_norm, lam1, lam2, gamma);
-  if (len != 0 | a[K1[g]] != 0) {
+  if (len != 0 || a[K1[g]] != 0) {
     // If necessary, update beta and r
     for (int j=K1[g]; j<K1[g+1]; j++) {
       b[l*p+j] = len * z[j-K1[g]] / z_norm;
@@ -343,7 +343,7 @@ SEXP gdfit_gaussian(SEXP X_, SEXP y_, SEXP penalty_, SEXP K1_, SEXP K0_,
       	  nv = nv + (K1[g+1]-K1[g]);
       	}
       }
-      if (ng > gmax | nv > dfmax | tot_iter == max_iter) {
+      if (ng > gmax || nv > dfmax || tot_iter == max_iter) {
         for (int ll=l; ll<L; ll++) INTEGER(iter)[ll] = NA_INTEGER;
         break;
       }
diff --git a/src/gdfit_poisson.c b/src/gdfit_poisson.c
index ccac099..646ff9b 100644
--- a/src/gdfit_poisson.c
+++ b/src/gdfit_poisson.c
@@ -28,7 +28,7 @@ void gd_poisson(double *b, double *x, double *r, double v, double *eta, int g, i
   if (strcmp(penalty, "grLasso")==0) len = S(v * z_norm, lam1) / (v * (1 + lam2));
   if (strcmp(penalty, "grMCP")==0) len = F(v * z_norm, lam1, lam2, gamma) / v;
   if (strcmp(penalty, "grSCAD")==0) len = Fs(v * z_norm, lam1, lam2, gamma) / v;
-  if (len != 0 | a[K1[g]] != 0) {
+  if (len != 0 || a[K1[g]] != 0) {
     // If necessary, update b and r
     for (int j=K1[g]; j<K1[g+1]; j++) {
       b[l*p+j] = len * z[j-K1[g]] / z_norm;
@@ -132,7 +132,7 @@ SEXP gdfit_poisson(SEXP X_, SEXP y_, SEXP penalty_, SEXP K1_, SEXP K0_, SEXP lam
 	  nv = nv + (K1[g+1]-K1[g]);
 	}
       }
-      if (ng > gmax | nv > dfmax | tot_iter == max_iter) {
+      if (ng > gmax || nv > dfmax || tot_iter == max_iter) {
 	for (int ll=l; ll<L; ll++) INTEGER(iter)[ll] = NA_INTEGER;
         break;
       }
diff --git a/src/lcdfit_binomial.c b/src/lcdfit_binomial.c
index 487aa99..5c31e3a 100644
--- a/src/lcdfit_binomial.c
+++ b/src/lcdfit_binomial.c
@@ -218,7 +218,7 @@ SEXP lcdfit_binomial(SEXP X_, SEXP y_, SEXP penalty_, SEXP K1_, SEXP K0_, SEXP l
 	}
 	if (nv != nv_old) ng++;
       }
-      if (ng > gmax | nv > dfmax | tot_iter == max_iter) {
+      if (ng > gmax || nv > dfmax || tot_iter == max_iter) {
 	for (int ll=l; ll<L; ll++) INTEGER(iter)[ll] = NA_INTEGER;
         break;
       }
diff --git a/src/lcdfit_cox.c b/src/lcdfit_cox.c
index 9402cfb..e3d1c33 100644
--- a/src/lcdfit_cox.c
+++ b/src/lcdfit_cox.c
@@ -237,7 +237,7 @@ SEXP lcdfit_cox(SEXP X_, SEXP d_, SEXP penalty_, SEXP K1_, SEXP K0_,
 	}
 	if (nv != nv_old) ng++;
       }
-      if (ng > gmax | nv > dfmax | tot_iter == max_iter) {
+      if (ng > gmax || nv > dfmax || tot_iter == max_iter) {
 	for (int ll=l; ll<L; ll++) INTEGER(iter)[ll] = NA_INTEGER;
         break;
       }
diff --git a/src/lcdfit_gaussian.c b/src/lcdfit_gaussian.c
index 1c2b018..b3a627e 100644
--- a/src/lcdfit_gaussian.c
+++ b/src/lcdfit_gaussian.c
@@ -190,7 +190,7 @@ SEXP lcdfit_gaussian(SEXP X_, SEXP y_, SEXP penalty_, SEXP K1_, SEXP K0_, SEXP l
 	}
 	if (nv != nv_old) ng++;
       }
-      if (ng > gmax | nv > dfmax | tot_iter == max_iter) {
+      if (ng > gmax || nv > dfmax || tot_iter == max_iter) {
 	for (int ll=l; ll<L; ll++) INTEGER(iter)[ll] = NA_INTEGER;
         break;
       }
diff --git a/src/lcdfit_poisson.c b/src/lcdfit_poisson.c
index cd32dba..566ec8d 100644
--- a/src/lcdfit_poisson.c
+++ b/src/lcdfit_poisson.c
@@ -217,7 +217,7 @@ SEXP lcdfit_poisson(SEXP X_, SEXP y_, SEXP penalty_, SEXP K1_, SEXP K0_, SEXP la
 	}
 	if (nv != nv_old) ng++;
       }
-      if (ng > gmax | nv > dfmax | tot_iter == max_iter) {
+      if (ng > gmax || nv > dfmax || tot_iter == max_iter) {
 	for (int ll=l; ll<L; ll++) INTEGER(iter)[ll] = NA_INTEGER;
         break;
       }