cpp updates

Author: aaronolsen

src/equalizeImageHist.cpp

@@ -11,11 +11,13 @@ Rcpp::NumericMatrix equalizeImageHist(Rcpp::NumericMatrix mat) {
 	int nrow = mat.nrow();
 	int ncol = mat.ncol();
 	int min_cdf = 1;
-	std::pointer_to_unary_function <double,double> roundObject (round) ;
 
-	// MULTIPLY BY 255 AND ROUND TO CREATE BINS
-	std::transform(mat.begin(), mat.end(), mat.begin(), std::bind1st(std::multiplies<double>(), 255));
-	std::transform(mat.begin(), mat.end(), mat.begin(), roundObject);
+	// Multiply by 255 and round to create bins
+	for (i = 0; i < ncol; i++) {
+		for (j = 0; j < nrow; j++) {
+			mat(j,i) = std::round(mat(j,i) * 255);
+		}
+	}
 
 	// COUNT INSTANCES OF EACH PIXEL VALUE (FREQUENCY HISTOGRAM)
 	for (i = 0; i < ncol; i++) {
@@ -50,7 +52,11 @@ Rcpp::NumericMatrix equalizeImageHist(Rcpp::NumericMatrix mat) {
 	}
 
 	// DIVIDE BY 255 TO RESTORE ORIGINAL 0->1 VALUES
-	std::transform(mat.begin(), mat.end(), mat.begin(), std::bind1st(std::multiplies<double>(), 0.00392156862));
+	for (i = 0; i < ncol; i++) {
+		for (j = 0; j < nrow; j++) {
+			mat(j,i) = mat(j,i) * 0.00392156862;
+		}
+	}
 
 	//Rcpp::Rcout << "Print text" << std::endl;
 

src/findCornerSubPix.cpp

@@ -59,11 +59,22 @@ Rcpp::NumericMatrix findCornerSubPix(Rcpp::NumericMatrix image, Rcpp::IntegerMat
 
 	// CREATE WINDOW INDICES FOR ITERATING THROUGH SUBMATRIX
 	for(i = 0; i < win; i++) for(j = 0; j < win; j++) *(wvec.begin()+i+j*win) = i+j*nrow_img;
-	std::transform(wvec.begin(), wvec.end(), wvec.begin(), std::bind1st(std::plus<int>(), -*(wvec.begin()+((win_win)/2))));
+	//for(i = 0; i < wvec.size(); i++) Rcpp::Rcout << wvec[i] << std::endl;
+
+	// Subtract constant
+	int sub_cons = *(wvec.begin()+((win_win)/2));
+	for(i = 0; i < win_win; i++) wvec[i] = wvec[i] - sub_cons;
+
+	//for(i = 0; i < wvec.size(); i++) Rcpp::Rcout << wvec[i] << ',';
+	//Rcpp::Rcout << win_win << std::endl;
+	//Rcpp::Rcout << wvec.size() << std::endl;
 
 	// CREATE KERNEL INDICES FOR ITERATING THROUGH WINDOW
 	for(i = 0; i < 3; i++) for(j = 0; j < 3; j++) *(kvec.begin()+i+j*3) = i+j*nrow_img;
-	std::transform(kvec.begin(), kvec.end(), kvec.begin(), std::bind1st(std::plus<int>(), -*(kvec.begin()+4)));
+
+	// Subtract constant
+	sub_cons = *(kvec.begin()+4);
+	for(i = 0; i < 9; i++) kvec[i] = kvec[i] - sub_cons;
 
 	// CREATE X AND Y KERNEL MULTIPLIER VECTORS
 	for(i=0; i < 3; i++) for(j = 0, k=-1; j < 3; j++, k++) *(kmlt_x.begin()+i+j*3) = k;

src/thresholdImageMatrix.cpp

@@ -16,7 +16,7 @@ Rcpp::IntegerMatrix thresholdImageMatrix(Rcpp::NumericMatrix mat, Rcpp::NumericM
 	std::map<int, int> tab;
 	int nrow = mat.nrow();
 	int ncol = mat.ncol();
-	std::pointer_to_unary_function <double,double> roundObject (round) ;
+	//std::pointer_to_unary_function <double,double> roundObject (round) ;
 
 	// CREATE EMPTY INTEGER MATRIX
 	Rcpp::IntegerMatrix mat_int(nrow, ncol);
@@ -25,12 +25,19 @@ Rcpp::IntegerMatrix thresholdImageMatrix(Rcpp::NumericMatrix mat, Rcpp::NumericM
 	// COPY MATRIX
 	std::copy(mat.begin(), mat.end(), mat_num.begin());
 
-	// MULTIPLY BY 255 AND ROUND TO CREATE BINS
-	std::transform(mat_num.begin(), mat_num.end(), mat_num.begin(), std::bind1st(std::multiplies<double>(), 255));
-	std::transform(mat_num.begin(), mat_num.end(), mat_num.begin(), roundObject);
+	// Multiply by 255 and round to create bins
+	for (i = 0; i < ncol; i++) {
+		for (j = 0; j < nrow; j++) {
+			mat_num(j,i) = std::round(mat_num(j,i) * 255);
+		}
+	}
 
-	std::transform(thresh_mat.begin(), thresh_mat.end(), thresh_mat.begin(), std::bind1st(std::multiplies<double>(), 255));
-	std::transform(thresh_mat.begin(), thresh_mat.end(), thresh_mat.begin(), roundObject);
+	// Multiply by 255 and round to create bins
+	for (i = 0; i < thresh_mat.ncol(); i++) {
+		for (j = 0; j < thresh_mat.nrow(); j++) {
+			thresh_mat(j,i) = std::round(thresh_mat(j,i) * 255);
+		}
+	}
 
     int idelta = type == 1 ? ceil(delta) : floor(delta);
 //	Rcpp::Rcout << "idelta: " << idelta << std::endl;