minor improvements

R/AnsariBradley.R

@@ -89,4 +89,4 @@ AnsariBradley <- R6Class(
             private$.p_value <- get_p_continous(z, "norm", private$.side)
         }
     )
-)
+)

R/Friedman.R

@@ -65,4 +65,4 @@ Friedman <- R6Class(
             )
         }
     )
-)
+)

R/KolmogorovSmirnov.R

@@ -48,4 +48,4 @@ KolmogorovSmirnov <- R6Class(
             private$.side <- "r"
         }
     )
-)
+)

R/Page.R

@@ -64,4 +64,4 @@ Page <- R6Class(
             private$.p_value <- get_p_continous(z, "norm", private$.side)
         }
     )
-)
+)

R/RCBDOneWay.R

@@ -69,5 +69,4 @@ RCBDOneWay <- R6Class(
             )
         }
     )
-)
-
+)

R/do_call.R

@@ -27,4 +27,4 @@ do_call <- function(func, default = list(), fixed = list(), ...) {
     # All arguments will be evaluated within the `args` environment.
     # https://stackoverflow.com/a/25371509/23137996
     eval(as.call(c(func, lapply(`names<-`(...args, ...args), as.name))), args)
-}
+}

R/pmt.R

@@ -164,8 +164,8 @@ pmts <- function(
 #' rcpp <- define_pmt(
 #'     inherit = "twosample", n_permu = 1e5,
 #'     statistic = "[](const auto& x, const auto& y) {
-#'         auto m = x.size();
-#'         auto n = y.size();
+#'         auto m = x.length();
+#'         auto n = y.length();
 #'         return [=](const auto& x, const auto& y) {
 #'             return sum(x) / m - sum(y) / n;
 #'         };
@@ -176,9 +176,9 @@ pmts <- function(
 #' # rcpp <- define_pmt(
 #' #     inherit = "twosample", n_permu = 1e5,
 #' #     statistic = "[](const NumericVector& x, const NumericVector& y) {
-#' #         R_xlen_t m = x.size();
-#' #         R_xlen_t n = y.size();
-#' #         return [=](const NumericVector& x, const NumericVector& y) -> double {
+#' #         R_xlen_t m = x.length();
+#' #         R_xlen_t n = y.length();
+#' #         return [m, n](const NumericVector& x, const NumericVector& y) -> double {
 #' #             return sum(x) / m - sum(y) / n;
 #' #         };
 #' #     }"

inst/include/pmt/permutation.hpp

@@ -3,6 +3,9 @@
 #include <algorithm>
 #include <iterator>
 
+template <typename T>
+using diff_t = typename std::iterator_traits<T>::difference_type;
+
 template <typename T>
 T rand_int(T n)
 {
@@ -12,12 +15,10 @@ T rand_int(T n)
 template <typename T>
 void random_shuffle(T first, T last)
 {
-    using diff_t = typename std::iterator_traits<T>::difference_type;
-
-    diff_t n = std::distance(first, last);
+    diff_t<T> n = std::distance(first, last);
 
-    for (diff_t i = 0; i < n - 1; i++) {
-        diff_t j = i + rand_int(n - i);
+    for (diff_t<T> i = 0; i < n - 1; i++) {
+        diff_t<T> j = i + rand_int(n - i);
         std::iter_swap(first + i, first + j);
     }
 }
@@ -33,10 +34,10 @@ double n_permutation(T first, T last)
 {
     double A = 1.0;
 
-    typename std::iterator_traits<T>::difference_type rep = 0;
+    diff_t<T> rep = 0;
 
     auto val = *first;
-    for (auto it = first; it != last; it++) {
+    for (T it = first; it != last; it++) {
         A *= std::distance(first, it) + 1;
         if (*it == val) {
             A /= ++rep;
@@ -50,19 +51,19 @@ double n_permutation(T first, T last)
 }
 
 template <typename T>
-auto random_shuffle(T& v)
+auto random_shuffle(T&& v)
 {
     return random_shuffle(v.begin(), v.end());
 }
 
 template <typename T>
-auto next_permutation(T& v)
+auto next_permutation(T&& v)
 {
     return next_permutation(v.begin(), v.end());
 }
 
 template <typename T>
-auto n_permutation(const T& v)
+auto n_permutation(T&& v)
 {
     return n_permutation(v.begin(), v.end());
 }