diff --git a/.devel/sphinx/conf.py b/.devel/sphinx/conf.py index 12f59403..e4f90f10 100644 --- a/.devel/sphinx/conf.py +++ b/.devel/sphinx/conf.py @@ -1,4 +1,4 @@ -# Copyleft (C) 2020-2022, Marek Gagolewski +# Copyleft (C) 2020-2023, Marek Gagolewski # Configuration file for the Sphinx documentation builder. import sphinx_rtd_theme @@ -7,7 +7,7 @@ pkg_name = "genieclust" pkg_title = "genieclust" pkg_version = genieclust.__version__ -copyright_year = "2018–2022" +copyright_year = "2018–2023" html_baseurl = "https://genieclust.gagolewski.com/" github_url = "https://github.com/gagolews/genieclust/" github_star_repo = "gagolews/genieclust" diff --git a/.devel/sphinx/news.md b/.devel/sphinx/news.md index 243a75a2..1b00db2d 100644 --- a/.devel/sphinx/news.md +++ b/.devel/sphinx/news.md @@ -1,9 +1,9 @@ # What Is New in *genieclust* -## 1.1.2.9xxx (under development) +## 1.1.3 (2023-01-17) -* [R] `mst.default` throws an error if any element in the input matrix +* [R] `mst.default` now throws an error if any element in the input matrix is missing/infinite. * [Python] Fixed call to `mlpack.emst` that no longer worked diff --git a/DESCRIPTION b/DESCRIPTION index ebd6c8d5..1452d611 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: genieclust Type: Package Title: Fast and Robust Hierarchical Clustering with Noise Points Detection -Version: 1.1.2.9001 -Date: 2022-11-15 +Version: 1.1.3 +Date: 2023-01-17 Authors@R: c( person("Marek", "Gagolewski", role = c("aut", "cre", "cph"), diff --git a/LICENSE b/LICENSE index 0a548e2f..ce8276fa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ genieclust package for R and Python -Copyleft (C) 2018-2022, Marek Gagolewski +Copyleft (C) 2018-2023, Marek Gagolewski This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License diff --git a/Makefile b/Makefile index b8447d5e..92bd64a3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyleft (C) 2020-2022, Marek Gagolewski +# Copyleft (C) 2020-2023, Marek Gagolewski .PHONY: python py-test py-check r r-check r r-build sphinx docs clean @@ -49,7 +49,7 @@ r: r-autoconf r-test: r Rscript -e 'source(".devel/tinytest.R")' -r-build: +r-build: r-autoconf cd .. && R CMD build ${PKGNAME} r-check: stop-on-utf8 r-build diff --git a/NEWS b/NEWS index 243a75a2..1b00db2d 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,9 @@ # What Is New in *genieclust* -## 1.1.2.9xxx (under development) +## 1.1.3 (2023-01-17) -* [R] `mst.default` throws an error if any element in the input matrix +* [R] `mst.default` now throws an error if any element in the input matrix is missing/infinite. * [Python] Fixed call to `mlpack.emst` that no longer worked diff --git a/R/gclust.R b/R/gclust.R index e58b063e..2a1944aa 100644 --- a/R/gclust.R +++ b/R/gclust.R @@ -2,7 +2,7 @@ # ############################################################################ # # # -# Copyleft (C) 2020-2022, Marek Gagolewski # +# Copyleft (C) 2020-2023, Marek Gagolewski # # # # # # This program is free software: you can redistribute it and/or modify # diff --git a/R/genieclust-package.R b/R/genieclust-package.R index 9224dec5..985dcb04 100644 --- a/R/genieclust-package.R +++ b/R/genieclust-package.R @@ -2,7 +2,7 @@ # ############################################################################ # # # -# Copyleft (C) 2020-2022, Marek Gagolewski # +# Copyleft (C) 2020-2023, Marek Gagolewski # # # # # # This program is free software: you can redistribute it and/or modify # diff --git a/R/mst.R b/R/mst.R index 12487e01..5ebea3f4 100644 --- a/R/mst.R +++ b/R/mst.R @@ -2,7 +2,7 @@ # ############################################################################ # # # -# Copyleft (C) 2020-2022, Marek Gagolewski # +# Copyleft (C) 2020-2023, Marek Gagolewski # # # # # # This program is free software: you can redistribute it and/or modify # diff --git a/README.md b/README.md index c878027a..c6be2acf 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,7 @@ Any contributions are welcome (e.g., Julia, Matlab, ...). ## License -Copyright (C) 2018–2022 Marek Gagolewski +Copyright (C) 2018–2023 Marek Gagolewski This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License Version 3, 19 @@ -188,6 +188,7 @@ Originally distributed under the GNU Affero General Public License Version 3. Gagolewski M., genieclust: Fast and robust hierarchical clustering, *SoftwareX* **15**, 2021, 100722. [DOI: 10.1016/j.softx.2021.100722](https://doi.org/10.1016/j.softx.2021.100722). +. Gagolewski M., Bartoszuk M., Cena A., Genie: A new, fast, and outlier-resistant hierarchical clustering algorithm, *Information @@ -202,10 +203,10 @@ Gagolewski M., *Adjusted asymmetric accuracy: A well-behaving external cluster validity measure*, under review (preprint), [DOI: 10.48550/arXiv.2209.02935](https://doi.org/10.48550/arXiv.2209.02935). -Gagolewski M., *A Framework for Benchmarking Clustering Algorithms*, -2022, , -[DOI: 10.48550/arXiv.2209.09493](https://doi.org/10.48550/arXiv.2209.09493), -under review (preprint). +Gagolewski M., A Framework for Benchmarking Clustering Algorithms, +*SoftwareX* **20**, 2022, 101270. +[DOI: 10.1016/j.softx.2022.101270](https://doi.org/10.1016/j.softx.2022.101270). +. Campello R.J.G.B., Moulavi D., Sander J., Density-based clustering based on hierarchical density estimates, diff --git a/docs/_images/genieclust_plots-1.png b/docs/_images/genieclust_plots-1.png index 425cb116..5633106a 100644 Binary files a/docs/_images/genieclust_plots-1.png and b/docs/_images/genieclust_plots-1.png differ diff --git a/docs/_images/genieclust_plots-2.png b/docs/_images/genieclust_plots-2.png index f1dd9ed3..f94fcfd1 100644 Binary files a/docs/_images/genieclust_plots-2.png and b/docs/_images/genieclust_plots-2.png differ diff --git a/docs/_images/genieclust_plots-3.png b/docs/_images/genieclust_plots-3.png index 033d8f9b..f8fb8c21 100644 Binary files a/docs/_images/genieclust_plots-3.png and b/docs/_images/genieclust_plots-3.png differ diff --git a/docs/_images/genieclust_plots-4.png b/docs/_images/genieclust_plots-4.png index 0e733bfb..7d7e10cf 100644 Binary files a/docs/_images/genieclust_plots-4.png and b/docs/_images/genieclust_plots-4.png differ diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index ad675b93..fd8f8380 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '1.1.2', + VERSION: '1.1.3', LANGUAGE: 'en', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/genieclust.html b/docs/genieclust.html index 1bd2419c..a9e99051 100644 --- a/docs/genieclust.html +++ b/docs/genieclust.html @@ -78,7 +78,7 @@
- Python and R Package
v1.1.2 + Python and R Package
v1.1.3