From 080f0f78d301c1a2e2d69a27c2492fb3e011cdab Mon Sep 17 00:00:00 2001 From: rmflight Date: Sat, 27 Jan 2024 10:28:55 -0500 Subject: [PATCH] fixes a missed instance of rows as samples --- R/kendalltau.R | 1 - README.Rmd | 6 +++--- README.md | 16 ++++++++-------- docs/404.html | 2 +- docs/CODE_OF_CONDUCT.html | 2 +- docs/LICENSE-text.html | 2 +- docs/LICENSE.html | 2 +- docs/articles/ici-kendalltau.html | 12 ++++++------ docs/articles/index.html | 2 +- docs/authors.html | 6 +++--- docs/index.html | 18 +++++++++--------- docs/news/index.html | 2 +- docs/pkgdown.yml | 2 +- docs/reference/cor_matrix_2_long_df.html | 2 +- docs/reference/disable_logging.html | 2 +- docs/reference/enable_logging.html | 2 +- docs/reference/ici_kendalltau.html | 2 +- docs/reference/ici_kendalltau_ref.html | 2 +- docs/reference/ici_kt.html | 2 +- docs/reference/index.html | 2 +- docs/reference/kt_fast.html | 2 +- docs/reference/log_memory.html | 2 +- docs/reference/log_message.html | 2 +- docs/reference/long_df_2_cor_matrix.html | 2 +- docs/reference/pairwise_completeness.html | 2 +- docs/reference/show_progress.html | 2 +- docs/search.json | 2 +- vignettes/ici-kendalltau.Rmd | 2 +- 28 files changed, 51 insertions(+), 52 deletions(-) diff --git a/R/kendalltau.R b/R/kendalltau.R index a493b50..05bf07e 100644 --- a/R/kendalltau.R +++ b/R/kendalltau.R @@ -338,7 +338,6 @@ ici_kendalltau = function(data_matrix, return_matrix = TRUE){ do_log_memory = get("memory", envir = icikt_logger) - # assume row-wise (because that is what the description states), so need to transpose exclude_loc = matrix(FALSE, nrow = nrow(data_matrix), ncol = ncol(data_matrix)) if (is.data.frame(data_matrix)) { diff --git a/README.Rmd b/README.Rmd index a2757ab..14da6aa 100644 --- a/README.Rmd +++ b/README.Rmd @@ -59,10 +59,10 @@ The functions that implement this include: * The option `perspective` will control how the `NA` values influence ties. * When comparing samples, you likely want to use `perspective = "global"`. * `ici_kendallt`: Handles comparisons for a large matrix. - * Rows are samples, columns are features. + * Rows are features, columns are samples. * Implicitly parallel, but have to call: - * library(furrr) - * plan(multiprocess) + * `library(furrr)` + * `plan(multiprocess)` * Otherwise will only use a single core. ## Examples diff --git a/README.md b/README.md index 56fb0b6..7435e20 100644 --- a/README.md +++ b/README.md @@ -60,10 +60,10 @@ The functions that implement this include: - When comparing samples, you likely want to use `perspective = "global"`. - `ici_kendallt`: Handles comparisons for a large matrix. - - Rows are samples, columns are features. + - Rows are features, columns are samples. - Implicitly parallel, but have to call: - - library(furrr) - - plan(multiprocess) + - `library(furrr)` + - `plan(multiprocess)` - Otherwise will only use a single core. ## Examples @@ -136,10 +136,10 @@ microbenchmark( times = 5 ) #> Unit: microseconds -#> expr min lq mean median uq max -#> cor(x, y, method = "kendall") 13568.01 13818.243 14017.885 14090.436 14174.800 14437.933 -#> ici_kt(x, y, "global") 261.84 272.733 304.271 287.571 335.669 363.542 -#> ici_kt(x2, y2, "global") 14631.30 15614.509 16419.494 16340.620 17646.365 17864.673 +#> expr min lq mean median uq max +#> cor(x, y, method = "kendall") 11506.697 11670.094 12169.6628 12006.418 12482.883 13182.222 +#> ici_kt(x, y, "global") 243.866 250.125 294.6542 275.104 320.058 384.118 +#> ici_kt(x2, y2, "global") 13467.011 13739.312 14658.5050 14945.446 14987.140 16153.616 #> neval #> 5 #> 5 @@ -202,7 +202,7 @@ r_4 #> 3 s4 s4 0 1.0000000 0 1.000000 1.0000000 #> #> $run_time -#> [1] 0.0196352 +#> [1] 0.01606894 ``` ## Code of Conduct diff --git a/docs/404.html b/docs/404.html index 5c1ff30..30f4568 100644 --- a/docs/404.html +++ b/docs/404.html @@ -24,7 +24,7 @@ ICIKendallTau - 1.0.1 + 1.0.2