Merge branch 'develop' into paper

ocbe-uio · Nov 7, 2023 · 2329cdf · 2329cdf
2 parents 3dd0e8c + a84b408
commit 2329cdf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: permChacko
 Title: Chacko Test for Order-Restriction with Permutation
-Version: 0.1.0.9013
+Version: 0.1.0.9014
 Authors@R:
     c(
         person(

diff --git a/R/orderingProcess.R b/R/orderingProcess.R
@@ -18,15 +18,15 @@ orderingProcess <- function(x_t, verbosity = 0) {
 
       if (verbosity >= 2L && i < length(x) - 1L) {
         message("\nNew values and weights")
-        print(t(cbind("x" = x, "t" = t)))
+        print(cbind("x" = x, "t" = t))
       }
     }
     i <- i + 1L
   }
   out <- cbind("x" = x, "t" = t)
   if (verbosity >= 1L) {
     message("\n\nFinal vector")
-    print(t(out))
+    print(out)
   }
   return(out)
 }
diff --git a/R/reduceVector.R b/R/reduceVector.R
@@ -27,7 +27,7 @@ reduceVector <- function(x, verbosity = 0L) {
   while (nrow(x_t) > 1L && isMonotoneIncreasing(x_t[, "x"])) {
     if (verbosity >= 1L) {
       message("Vector needs reduction\nInitial vector")
-      print(t(x_t))
+      print(x_t)
     }
     reductions <- reductions + 1L
     x_t <- orderingProcess(x_t, verbosity)

diff --git a/tests/testthat/test-print-and-summary.R b/tests/testthat/test-print-and-summary.R
@@ -3,8 +3,7 @@ set.seed(778566)
 test_that("print.reduced_vector() works as expected", {
   expect_output(reduceVector(rpois(13, 8)), NA)
   expect_output(
-    suppressMessages(reduceVector(rpois(11, 8), verbosity = 1)),
-    "8\\.00    1  2\\.0"
+    suppressMessages(reduceVector(rpois(11, 8), verbosity = 1)), "7\\.25 8"
   )
   x <- reduceVector(rpois(6, 6))
   expect_output(print(x), "Reduced vector : 4\\t4\\t4\\t5\\t8")