diff --git a/R/RcppExports.R b/R/RcppExports.R index 7f504c05b..9eba96351 100644 --- a/R/RcppExports.R +++ b/R/RcppExports.R @@ -61,10 +61,6 @@ FastLogVMR <- function(mat, display_progress) { .Call('_Seurat_FastLogVMR', PACKAGE = 'Seurat', mat, display_progress) } -RowSumOfSquares <- function(x) { - .Call('_Seurat_RowSumOfSquares', PACKAGE = 'Seurat', x) -} - RowVar <- function(x) { .Call('_Seurat_RowVar', PACKAGE = 'Seurat', x) } diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp index cd2d3d714..b7fc6d1ea 100644 --- a/src/RcppExports.cpp +++ b/src/RcppExports.cpp @@ -205,17 +205,6 @@ BEGIN_RCPP return rcpp_result_gen; END_RCPP } -// RowSumOfSquares -NumericVector RowSumOfSquares(const NumericMatrix x); -RcppExport SEXP _Seurat_RowSumOfSquares(SEXP xSEXP) { -BEGIN_RCPP - Rcpp::RObject rcpp_result_gen; - Rcpp::RNGScope rcpp_rngScope_gen; - Rcpp::traits::input_parameter< const NumericMatrix >::type x(xSEXP); - rcpp_result_gen = Rcpp::wrap(RowSumOfSquares(x)); - return rcpp_result_gen; -END_RCPP -} // RowVar NumericVector RowVar(Eigen::Map x); RcppExport SEXP _Seurat_RowVar(SEXP xSEXP) { @@ -301,7 +290,6 @@ static const R_CallMethodDef CallEntries[] = { {"_Seurat_SparseRowVar2", (DL_FUNC) &_Seurat_SparseRowVar2, 3}, {"_Seurat_SparseRowVarStd", (DL_FUNC) &_Seurat_SparseRowVarStd, 5}, {"_Seurat_FastLogVMR", (DL_FUNC) &_Seurat_FastLogVMR, 2}, - {"_Seurat_RowSumOfSquares", (DL_FUNC) &_Seurat_RowSumOfSquares, 1}, {"_Seurat_RowVar", (DL_FUNC) &_Seurat_RowVar, 1}, {"_Seurat_RunModularityClusteringCpp", (DL_FUNC) &_Seurat_RunModularityClusteringCpp, 9}, {"_Seurat_ComputeSNN", (DL_FUNC) &_Seurat_ComputeSNN, 2}, diff --git a/src/data_manipulation.cpp b/src/data_manipulation.cpp index 37d33f131..47f24028f 100644 --- a/src/data_manipulation.cpp +++ b/src/data_manipulation.cpp @@ -373,22 +373,6 @@ Eigen::VectorXd FastLogVMR(Eigen::SparseMatrix mat, bool display_progre return(rowdisp); } -/* Calculates the row sums of squared values without using additional memory */ -//[[Rcpp::export]] -NumericVector RowSumOfSquares(const NumericMatrix x){ - int nrow = x.nrow(), ncol = x.ncol(); - NumericVector out(nrow); - - for (int i = 0; i < nrow; i++) { - double total = 0; - for (int j = 0; j < ncol; j++) { - total += pow(x(i, j), 2); - } - out[i] = total; - } - return out; -} - /* Calculates the variance of rows of a matrix */ //[[Rcpp::export]] NumericVector RowVar(Eigen::Map x){ diff --git a/src/data_manipulation.h b/src/data_manipulation.h index f28894099..c0d72a565 100644 --- a/src/data_manipulation.h +++ b/src/data_manipulation.h @@ -44,7 +44,6 @@ NumericVector SparseRowVarStd(Eigen::SparseMatrix mat, NumericVector sd, double vmax, bool display_progress); -NumericVector RowSumOfSquares(const NumericMatrix x); NumericVector RowVar(Eigen::Map x); //----------------------------------------------------