Bump version

asardaes · May 12, 2018 · a965628 · a965628
1 parent 70a318a
commit a965628
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,13 @@
 # Changelog
 
-## Version 5.3.1.9000
+## Version 5.4.0
 * Added another helper for `compare_clusterings`: `cvi_evaluators`.
 * Fixed the calculation of SF and CH CVIs for hierarchical clustering with default centroid extraction.
 * The data frames passed to `pick.clus` in `compare_clusterings` now also contain the configurations' data instead of just the scores. This will require adjustment of existing `pick.clus` functions.
 * The `centroids` in the objects returned by `tsclust` now have an attribute `series_id` if said centroids were extracted from the provided series without modification. It is an integer vector indicating which series were chosen as centroids.
 * Improved warning messages in `compare_clusterings`.
-* Multi-threading parallelization is now more medium-grained to hopefully balance load a bit better.
+* Multi-threaded parallelization is now more medium-grained to hopefully balance load a bit better.
+* Minor updates to parallelization vignette.
 
 ## Version 5.3.1
 * Added parameter `no.expand` to `compare_clusterings_configs`.

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: 5.3.1.9000
+Version: 5.4.0
 Date: 2018-05-10
 Depends:
     R (>= 3.2.0),
@@ -48,10 +48,11 @@ Description: Time series clustering along with optimized techniques related
     Implementations of partitional, hierarchical, fuzzy, k-Shape and TADPole
     clustering are available. Functionality can be easily extended with
     custom distance measures and centroid definitions. Implementations of
-    DTW barycenter averaging and a distance based on global alignment kernels
-    are also provided. All included distance functions have custom loops
-    optimized for the calculation of cross-distance matrices, including
-    parallelization support. Several cluster validity indices are included.
+    DTW barycenter averaging, a distance based on global alignment kernels,
+    and the soft-DTW distance and centroid routines are also provided. 
+    All included distance functions have custom loops optimized for the 
+    calculation of cross-distance matrices, including parallelization support.
+    Several cluster validity indices are included.
 URL: https://github.com/asardaes/dtwclust
 BugReports: https://github.com/asardaes/dtwclust/issues
 License: GPL-3

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,5 +1,5 @@
 
-## Update to version 5.3.1.9000
+## Update to version 5.4.0
 * New function, parallelization optimizations and bug fixes.
 
 ## Test environments

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -7,13 +7,14 @@
     Full changelog available at \url{https://github.com/asardaes/dtwclust/blob/master/CHANGELOG.md}
 }
 
-\section{Changes in version 5.3.1.9000}{
+\section{Changes in version 5.4.0}{
 \itemize{
     \item Added another helper for \code{compare_clusterings}: \code{cvi_evaluators}.
     \item Fixed the calculation of SF and CH CVIs for hierarchical clustering with default centroid extraction.
     \item The data frames passed to \code{pick.clus} in \code{compare_clusterings} now also contain the configurations' data instead of just the scores. This will require adjustment of existing \code{pick.clus} functions.
     \item The \code{centroids} in the objects returned by \code{tsclust} now have an attribute \code{series_id} if said centroids were extracted from the provided series without modification. It is an integer vector indicating which series were chosen as centroids.
     \item Improved warning messages in \code{compare_clusterings}.
-    \item Multi-threading parallelization is now more medium-grained to hopefully balance load a bit better.
+    \item Multi-threaded parallelization is now more medium-grained to hopefully balance load a bit better.
+    \item Minor updates to parallelization vignette.
 }
 }
diff --git a/src/utils/UndirectedGraph.cpp b/src/utils/UndirectedGraph.cpp
@@ -130,7 +130,7 @@ void UndirectedGraph::dfs(const std::shared_ptr<Vertex>& vertex) {
     // ids start with 1 due to R
     if (visited_[vertex->id - 1])
         return;
-    visited_[vertex->id- 1] = true;
+    visited_[vertex->id - 1] = true;
     for (auto neighbor : vertex->neighbors)
         dfs(neighbor.lock());
 }

diff --git a/vignettes/parallelization-considerations.Rmd b/vignettes/parallelization-considerations.Rmd
@@ -66,7 +66,7 @@ Some packages that provide backends are:
 - `doFuture`
 - `doMPI`
 
-See also [this CRAN view](https://cran.r-project.org/web/views/HighPerformanceComputing.html).
+See also [this CRAN view](https://CRAN.R-project.org/view=HighPerformanceComputing).
 
 The `dtwclust` functions that use `RcppParallel` are: