Commit d57e5e61 authored by Ilya Korsunsky's avatar Ilya Korsunsky
Browse files

std::vector

parent 8ed3e9e1
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -161,24 +161,24 @@ BEGIN_RCPP
END_RCPP
}
// collapse_mats
arma::cube collapse_mats(vector<arma::mat> mat_list, unsigned n);
arma::cube collapse_mats(std::vector<arma::mat> mat_list, unsigned n);
RcppExport SEXP _presto_collapse_mats(SEXP mat_listSEXP, SEXP nSEXP) {
BEGIN_RCPP
    Rcpp::RObject rcpp_result_gen;
    Rcpp::RNGScope rcpp_rngScope_gen;
    Rcpp::traits::input_parameter< vector<arma::mat> >::type mat_list(mat_listSEXP);
    Rcpp::traits::input_parameter< std::vector<arma::mat> >::type mat_list(mat_listSEXP);
    Rcpp::traits::input_parameter< unsigned >::type n(nSEXP);
    rcpp_result_gen = Rcpp::wrap(collapse_mats(mat_list, n));
    return rcpp_result_gen;
END_RCPP
}
// collapse_vecs
arma::mat collapse_vecs(vector<arma::vec> vec_list, unsigned n);
arma::mat collapse_vecs(std::vector<arma::vec> vec_list, unsigned n);
RcppExport SEXP _presto_collapse_vecs(SEXP vec_listSEXP, SEXP nSEXP) {
BEGIN_RCPP
    Rcpp::RObject rcpp_result_gen;
    Rcpp::RNGScope rcpp_rngScope_gen;
    Rcpp::traits::input_parameter< vector<arma::vec> >::type vec_list(vec_listSEXP);
    Rcpp::traits::input_parameter< std::vector<arma::vec> >::type vec_list(vec_listSEXP);
    Rcpp::traits::input_parameter< unsigned >::type n(nSEXP);
    rcpp_result_gen = Rcpp::wrap(collapse_vecs(vec_list, n));
    return rcpp_result_gen;
+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ using namespace std;


// [[Rcpp::export]]
arma::cube collapse_mats(vector<arma::mat> mat_list, unsigned n) {
arma::cube collapse_mats(std::vector<arma::mat> mat_list, unsigned n) {
//     arma::cube result = arma::zeros<arma::cube>(10, 10, n);
    arma::cube result = arma::zeros<arma::cube>(mat_list[0].n_rows, mat_list[0].n_cols, n);
    for (int i = 0; i < n; i++) {
@@ -24,7 +24,7 @@ arma::cube collapse_mats(vector<arma::mat> mat_list, unsigned n) {


// [[Rcpp::export]]
arma::mat collapse_vecs(vector<arma::vec> vec_list, unsigned n) {
arma::mat collapse_vecs(std::vector<arma::vec> vec_list, unsigned n) {
//     arma::cube result = arma::zeros<arma::cube>(10, 10, n);
    arma::mat result = arma::zeros<arma::mat>(vec_list[0].n_elem, n);
    for (int i = 0; i < n; i++) {