update to remove use of deprecated std:: function

jaredhuling · Jun 2, 2020 · 8fef0ab · 8fef0ab
1 parent b215dc6
commit 8fef0ab
Show file tree

Hide file tree

Showing 15 changed files with 145 additions and 48 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -33,7 +33,7 @@ Imports:
 LinkingTo: Rcpp,
     RcppEigen,
     RcppNumerical
-RoxygenNote: 6.1.0
+RoxygenNote: 7.1.0
 Suggests:
     knitr,
     rmarkdown

diff --git a/man/cv.vennLasso.Rd b/man/cv.vennLasso.Rd
diff --git a/man/estimate.hier.sparsity.param.Rd b/man/estimate.hier.sparsity.param.Rd
diff --git a/man/genHierSparseBeta.Rd b/man/genHierSparseBeta.Rd
diff --git a/man/genHierSparseData.Rd b/man/genHierSparseData.Rd
diff --git a/man/oglasso.Rd b/man/oglasso.Rd
diff --git a/man/plot.Rd b/man/plot.Rd
diff --git a/man/plotVenn.Rd b/man/plotVenn.Rd
diff --git a/man/predict.Rd b/man/predict.Rd
diff --git a/man/predict.cv.vennLasso.Rd b/man/predict.cv.vennLasso.Rd
diff --git a/man/vennLasso.Rd b/man/vennLasso.Rd
diff --git a/src/DataStd.h b/src/DataStd.h
@@ -143,12 +143,16 @@ class DataStd
                     scaleX[i] = std::sqrt(ss - s * s / n) * n_invsqrt;
                     standardize_vec_avx<double>(begin, n, meanX[i], 1.0 / scaleX[i]);
     #else
-                    double *begin = &X(0, i);
-                    double *end = begin + n;
+                    // double *begin = &X(0, i);
+                    // double *end = begin + n;
+                    // meanX[i] = X.col(i).mean();
+                    // std::transform(begin, end, begin, std::bind2nd(std::minus<double>(), meanX[i]));
+                    // scaleX[i] = X.col(i).norm() * n_invsqrt;
+                    // std::transform(begin, end, begin, std::bind2nd(std::multiplies<double>(), 1.0 / scaleX[i]));
                     meanX[i] = X.col(i).mean();
-                    std::transform(begin, end, begin, std::bind2nd(std::minus<double>(), meanX[i]));
+                    X.col(i).array() -= meanX[i];
                     scaleX[i] = X.col(i).norm() * n_invsqrt;
-                    std::transform(begin, end, begin, std::bind2nd(std::multiplies<double>(), 1.0 / scaleX[i]));
+                    X.col(i).array() /= scaleX[i];
     #endif
                 }
                 break;

diff --git a/src/FADMMBase.h b/src/FADMMBase.h
@@ -4,6 +4,7 @@
 #include <RcppEigen.h>
 #include "Linalg/BlasWrapper.h"
 
+// [[Rcpp::plugins(cpp17)]]
 
 // General problem setting
 //   minimize f(x) + g(z)

diff --git a/src/Makevars b/src/Makevars
@@ -11,3 +11,4 @@ PKG_CXXFLAGS = -DNDEBUG
 ##PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
+CXX_STD = CXX17
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -11,3 +11,4 @@ PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
 PKG_CPPFLAGS = -I. -DNDEBUG
 
+CXX_STD = CXX17
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ PKG_CXXFLAGS = -DNDEBUG
		##PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
		PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

		CXX_STD = CXX17
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

		PKG_CPPFLAGS = -I. -DNDEBUG

		CXX_STD = CXX17