Fix new partitional/fuzzy loop

asardaes · Sep 11, 2017 · 5401571 · 5401571
1 parent cd75827
commit 5401571
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,9 @@
 # Changelog
 
-## Version 4.1.0
+## Version 4.1.1
 * Added some fuzzy cluster validity indices to `cvi`.
 * When using `TADPole` clustering through `tsclust`, custom parameters can now be passed to a custom centroid function if provided.
-* Modified the partitional/fuzzy loops, which were doing an extra iteration. Previous version still available for backwards compatibility.
+* Modified the partitional/fuzzy loops, which were doing an extra iteration. Previous version still available for backwards compatibility. This modification was wrong in version 4.1.0.
 
 ## Version 4.0.3
 * Deactivating PAM precomputation will no longer use sparse matrices by default, explicitly set `pam.sparse` to `TRUE` if you want this functionality.

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: dtwclust
 Type: Package
 Title: Time Series Clustering Along with Optimizations for the Dynamic Time
     Warping Distance
-Version: 4.1.0
+Version: 4.1.1
 Date: 2017-09-11
 Depends:
     R (>= 3.2.0),

diff --git a/R/partitional.R b/R/partitional.R
@@ -83,7 +83,6 @@ pfclust <- function (x, k, family, control, fuzzy = FALSE, cent, trace = FALSE,
         }
 
         iter <- iter + 1L
-        clustold <- dmi[,2L]
         if (control$version > 1L)
             centroids <- do.call(family@allcent,
                                  enlist(x = x,
@@ -93,6 +92,7 @@ pfclust <- function (x, k, family, control, fuzzy = FALSE, cent, trace = FALSE,
                                         cl_old = clustold,
                                         dots = subset_dots(args$cent, family@allcent)),
                                  TRUE)
+        clustold <- dmi[,2L]
     }
 
     if (iter > control$iter.max) {

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,6 +1,6 @@
-## Update to version 4.1.0
-* Added more cluster validity indices
-* Minor fixes
+## Update to version 4.1.1
+Short-term update: a modification introduced in v4.1.0 produces erroneous clustering results due to wrong logic.
+Sorry for that.
 
 ## Test environments
 * Local GNU/Linux, R 3.4.1

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -7,10 +7,10 @@
     Full changelog available at \url{https://github.com/asardaes/dtwclust/blob/master/CHANGELOG.md}
 }
 
-\section{Changes in version 4.1.0}{
+\section{Changes in version 4.1.1}{
     \itemize{
         \item Added some fuzzy cluster validity indices to \code{cvi}.
         \item When using \code{TADPole} clustering through \code{tsclust}, custom parameters can now be passed to a custom centroid function if provided.
-        \item Modified the partitional/fuzzy loops, which were doing an extra iteration. Previous version still available for backwards compatibility.
+        \item Modified the partitional/fuzzy loops, which were doing an extra iteration. Previous version still available for backwards compatibility. This modification was wrong in version 4.1.0.
     }
 }