bool operands

rspatial · Apr 5, 2022 · c80d45d · c80d45d
1 parent ee27848
commit c80d45d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/clamp.cpp b/src/clamp.cpp
@@ -20,7 +20,7 @@ Rcpp::NumericVector do_clamp(std::vector<double> d, std::vector<double> r, bool
 		}		
 	} else {
 		for (size_t i=0; i<n; i++) {
-			if ( (d[i] < r[0]) | (d[i] > r[1])) {
+			if ( (d[i] < r[0]) || (d[i] > r[1])) {
 				val[i] = NAN;
 			} else {
 				val[i] = d[i];

diff --git a/src/reclass.cpp b/src/reclass.cpp
@@ -51,7 +51,7 @@ Rcpp::NumericVector reclassify(Rcpp::NumericVector d, Rcpp::NumericMatrix rcl, b
 				} else {
 					val[i] = d[i];
 					for (size_t j=0; j<a; j++) {
-						if ((d[i] >= rcl[j]) & (d[i] <= rcl[j+a])) {
+						if ((d[i] >= rcl[j]) && (d[i] <= rcl[j+a])) {
 							val[i] = rcl[j+b];
 							break;
 						}
@@ -83,7 +83,7 @@ Rcpp::NumericVector reclassify(Rcpp::NumericVector d, Rcpp::NumericMatrix rcl, b
 					} else {
 						val[i] = d[i];
 						for (size_t j=0; j<a; j++) {
-							if ((d[i] > rcl[j]) & (d[i] <= rcl[j+a])) {
+							if ((d[i] > rcl[j]) && (d[i] <= rcl[j+a])) {
 								val[i] = rcl[j+b];
 								break;
 							}
@@ -99,7 +99,7 @@ Rcpp::NumericVector reclassify(Rcpp::NumericVector d, Rcpp::NumericMatrix rcl, b
 					} else {
 						val[i] = d[i];
 						for (size_t j=0; j<a; j++) {
-							if ((d[i] > rcl[j]) & (d[i] <= rcl[j+a])) {
+							if ((d[i] > rcl[j]) && (d[i] <= rcl[j+a])) {
 								val[i] = rcl[j+b];
 								break;
 							}
@@ -129,7 +129,7 @@ Rcpp::NumericVector reclassify(Rcpp::NumericVector d, Rcpp::NumericMatrix rcl, b
 					} else {
 						val[i] = d[i];
 						for (size_t j=0; j<a; j++) {
-							if ((d[i] >= rcl[j]) & (d[i] < rcl[j+a])) {
+							if ((d[i] >= rcl[j]) && (d[i] < rcl[j+a])) {
 								val[i] = rcl[j+b];
 								break;
 							}
@@ -145,7 +145,7 @@ Rcpp::NumericVector reclassify(Rcpp::NumericVector d, Rcpp::NumericMatrix rcl, b
 					} else {
 						val[i] = d[i];
 						for (size_t j=0; j<a; j++) {	
-							if ((d[i] >= rcl[j]) & (d[i] < rcl[j+a])) {
+							if ((d[i] >= rcl[j]) && (d[i] < rcl[j+a])) {
 								val[i] = rcl[j+b];
 								break;
 							}