Fix order of k and method in hierarchical results (#57)

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 5.5.7.9000
+* For `compare_clusterings`, fixed a bug that caused the order of columns "k" and "method" to be wrong in the data frame with results for hierarchical configurations.
+
 ## Version 5.5.7
 * Series order is now preserved in plots of included shiny apps.
 * The optimization in `sdtw_cent` now uses `stats::optim` by default.

DESCRIPTION

@@ -12,7 +12,7 @@ Description: Time series clustering along with optimized techniques related
     All included distance functions have custom loops optimized for the 
     calculation of cross-distance matrices, including parallelization support.
     Several cluster validity indices are included.
-Version: 5.5.7
+Version: 5.5.7.9000
 Depends:
     R (>= 3.3.0),
     methods,
@@ -46,7 +46,7 @@ Suggests:
     knitr,
     rmarkdown,
     testthat
-Date: 2022-01-13
+Date: 2022-01-15
 Author: Alexis Sarda-Espinosa
 Maintainer: Alexis Sarda <[email protected]>
 BugReports: https://github.com/asardaes/dtwclust/issues

R/CLUSTERING-compare-clusterings.R

@@ -876,7 +876,7 @@ compare_clusterings <- function(series = NULL, types = c("p", "h", "f", "t"),
                     this_config <- config[i, , drop = FALSE]
                     method <- unlist(this_config$method)
                     this_config <- this_config[setdiff(names(this_config), c("k", "method"))]
-                    df <- expand.grid(k = k, method = method, stringsAsFactors = FALSE)
+                    df <- expand.grid(method = method, k = k, stringsAsFactors = FALSE)[c("k", "method")]
                     make_unique_ids(df, this_config) # see EOF
                 })
             },

cran-comments.md

@@ -1,8 +1,5 @@
 
-## Update to version 5.5.7
-* Addressed upcoming archival of nloptr.
-* Account or potential archival of bigmemory.
-* Minor bug fixes and documentation updates.
+## Update to version
 
 ## Test environments
 * Local GNU/Linux, R release

inst/NEWS.Rd

@@ -7,10 +7,8 @@
     Full changelog available at \url{https://github.com/asardaes/dtwclust/blob/master/CHANGELOG.md}
 }
 
-\section{Changes in version 5.5.7}{
+\section{Changes in version 5.5.7.9000}{
 \itemize{
-    \item Series order is now preserved in plots of included shiny apps.
-    \item The optimization in \code{sdtw_cent} now uses \code{stats::optim} by default.
-    \item Dropped strong dependency on \code{bigmemory} in case it is archived. It can still be used if available.
+    \item For \code{compare_clusterings}, fixed a bug that caused the order of columns "k" and "method" to be wrong in the data frame with results for hierarchical configurations.
 }
 }