improved association_pmt & table_pmt

qddyy · Dec 9, 2024 · 1d9d36d · 1d9d36d
1 parent 0fbcb65
commit 1d9d36d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/inst/include/pmt/impl_association_pmt.hpp b/inst/include/pmt/impl_association_pmt.hpp
@@ -1,6 +1,6 @@
 template <typename T, typename U>
 NumericVector impl_association_pmt(
-    const NumericVector x,
+    NumericVector x,
     NumericVector y,
     const U& statistic_func,
     const double n_permu)
@@ -16,13 +16,16 @@ NumericVector impl_association_pmt(
 
     if (!std::isnan(n_permu)) {
         if (n_permu == 0) {
+            std::sort(x.begin(), x.end());
             std::sort(y.begin(), y.end());
 
-            bar.init_statistic_permu(n_permutation(y));
+            NumericVector y_ = (n_permutation(x) < n_permutation(y)) ? x : y;
+
+            bar.init_statistic_permu(n_permutation(y_));
 
             do {
                 association_update();
-            } while (next_permutation(y));
+            } while (next_permutation(y_));
         } else {
             bar.init_statistic_permu(n_permu);
 

diff --git a/inst/include/pmt/impl_table_pmt.hpp b/inst/include/pmt/impl_table_pmt.hpp
@@ -1,6 +1,6 @@
 template <typename T, typename U>
 NumericVector impl_table_pmt(
-    const IntegerVector row,
+    IntegerVector row,
     IntegerVector col,
     const U& statistic_func,
     const double n_permu)
@@ -28,11 +28,15 @@ NumericVector impl_table_pmt(
 
     if (!std::isnan(n_permu)) {
         if (n_permu == 0) {
-            bar.init_statistic_permu(n_permutation(col));
+            std::sort(row.begin(), row.end());
+
+            IntegerVector col_ = (n_permutation(row) < n_permutation(col)) ? row : col;
+
+            bar.init_statistic_permu(n_permutation(col_));
 
             do {
                 table_update();
-            } while (next_permutation(col));
+            } while (next_permutation(col_));
         } else {
             bar.init_statistic_permu(n_permu);
 

diff --git a/src/pmt_interface.cpp b/src/pmt_interface.cpp
@@ -123,8 +123,8 @@ SEXP association_pmt(
     const bool progress)
 {
     return progress ?
-        impl_association_pmt<PermuBarShow, StatFunc<true>>(x, clone(y), statistic_func, n_permu) :
-        impl_association_pmt<PermuBarHide, StatFunc<true>>(x, clone(y), statistic_func, n_permu);
+        impl_association_pmt<PermuBarShow, StatFunc<true>>(clone(x), clone(y), statistic_func, n_permu) :
+        impl_association_pmt<PermuBarHide, StatFunc<true>>(clone(x), clone(y), statistic_func, n_permu);
 }
 
 #include "pmt/impl_table_pmt.hpp"
@@ -138,6 +138,6 @@ SEXP table_pmt(
     const bool progress)
 {
     return progress ?
-        impl_table_pmt<PermuBarShow, StatFunc<true>>(row, clone(col), statistic_func, n_permu) :
-        impl_table_pmt<PermuBarHide, StatFunc<true>>(row, clone(col), statistic_func, n_permu);
-}
+        impl_table_pmt<PermuBarShow, StatFunc<true>>(clone(row), clone(col), statistic_func, n_permu) :
+        impl_table_pmt<PermuBarHide, StatFunc<true>>(clone(row), clone(col), statistic_func, n_permu);
+}