more

gagolews · Feb 3, 2025 · bbbf949 · bbbf949
1 parent e7eefc4
commit bbbf949
Show file tree

Hide file tree

Showing 136 changed files with 284 additions and 4,780 deletions.
diff --git a/.devel/roxygen2-patch.R b/.devel/roxygen2-patch.R
@@ -1,4 +1,4 @@
-# Copyleft (C) 2021-2024, Marek Gagolewski <https://www.gagolewski.com>
+# Copyleft (C) 2021-2025, Marek Gagolewski <https://www.gagolewski.com>
 # Adding author and other metadata to every Rd file;
 # There is one and only one official manual. Ad- and tracker-free.
 # Enjoy the free internet.

diff --git a/.devel/sphinx/_static/css/custom.css b/.devel/sphinx/_static/css/custom.css
@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------
-   Copyleft (C) 2021-2024, Marek Gagolewski <https://www.gagolewski.com/>
+   Copyleft (C) 2021-2025, Marek Gagolewski <https://www.gagolewski.com/>
    -------------------------------------------------------------------------- */
 
 @import url("fonts/Alegreya-fontspec.css");

diff --git a/.devel/sphinx/alphamarek.py b/.devel/sphinx/alphamarek.py
@@ -1,4 +1,4 @@
-# Copyleft (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com/>
+# Copyleft (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com/>
 
 # based on https://bitbucket.org/pybtex-devs/pybtex/src/HEAD/pybtex/style/formatting/unsrt.py
 

diff --git a/.devel/sphinx/bibliography.bib b/.devel/sphinx/bibliography.bib
@@ -45,14 +45,14 @@ @book{datawranglingpy
     publisher = {Zenodo},
     address = {Melbourne},
     url = {https://datawranglingpy.gagolewski.com/},
-    year = {2024}
+    year = {2025}
 }
 
 @book{deepr,
     author = {M. Gagolewski},
     title = {Deep {R} Programming},
     url = {https://deepr.gagolewski.com/},
-    year = {2024},
+    year = {2025},
     doi = {10.5281/zenodo.7490464},
     isbn = {978-0-6455719-2-9},
     publisher = {Zenodo},

diff --git a/.devel/sphinx/conf.py b/.devel/sphinx/conf.py
@@ -1,4 +1,4 @@
-# Copyleft (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com>
+# Copyleft (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com>
 # Configuration file for the Sphinx documentation builder.
 
 import sys, os
@@ -12,7 +12,7 @@
 pkg_name = "genieclust"
 pkg_title = "genieclust"
 pkg_version = genieclust.__version__
-copyright_year = "2018–2024"
+copyright_year = "2018–2025"
 html_baseurl = "https://genieclust.gagolewski.com/"
 html_logo = "https://www.gagolewski.com/_static/img/genieclust.png"
 html_favicon = "https://www.gagolewski.com/_static/img/genieclust.png"

diff --git a/.devel/sphinx/fix-html.sh b/.devel/sphinx/fix-html.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com/>
+# Copyright (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com/>
 
 set -e
 

diff --git a/.devel/sphinx/news.md b/.devel/sphinx/news.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.x.x (2025-xx-xx)
+
+* ...
+
+
 ## 1.1.6 (2024-08-22)
 
 * [PYTHON] The package now works with *numpy* 2.0.

diff --git a/.devel/sphinx/weave/Makefile b/.devel/sphinx/weave/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2024, Marek Gagolewski <https://www.gagolewski.com>
+# Copyright (c) 2013-2025, Marek Gagolewski <https://www.gagolewski.com>
 
 FILES_RMD = \
 	basics.Rmd              \

diff --git a/.devel/sphinx/weave/Rmd2md-patch.R b/.devel/sphinx/weave/Rmd2md-patch.R
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com/>
+# Copyright (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com/>
 
 # I only want ```{r...``` and ```{python...``` to be recognised as
 # chunks to-be processed by knitr so that they can be placed within

diff --git a/.devel/sphinx/weave/Rmd2md.sh b/.devel/sphinx/weave/Rmd2md.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com/>
+# Copyright (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com/>
 
 set -e
 

diff --git a/.devel/sphinx/weave/extract-code-comments.R b/.devel/sphinx/weave/extract-code-comments.R
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com>
+# Copyright (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com>
 
 # Moves #> comments inside Markdown *highlighted* code blocks outside
 

diff --git a/.devel/sphinx/weave/options.R b/.devel/sphinx/weave/options.R
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com>
+# Copyright (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com>
 
 options(encoding="UTF-8")
 set.seed(666)

diff --git a/.devel/sphinx/weave/pweave_custom.py b/.devel/sphinx/weave/pweave_custom.py
@@ -2,7 +2,7 @@
 
 # ########################################################################## #
 #  Marek's output hooks hacks                                                #
-#  Copyleft (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com>     #
+#  Copyleft (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com>     #
 # ########################################################################## #
 
 

diff --git a/.devel/sphinx/weave/r-figures/ssi-map-1.pdf b/.devel/sphinx/weave/r-figures/ssi-map-1.pdf
diff --git a/.devel/sphinx/weave/r-figures/ssi-map-1.png b/.devel/sphinx/weave/r-figures/ssi-map-1.png
diff --git a/.devel/sphinx/weave/r-figures/ssi-oecd-dendrogram-1.pdf b/.devel/sphinx/weave/r-figures/ssi-oecd-dendrogram-1.pdf
diff --git a/.devel/sphinx/weave/r-figures/ssi-oecd-dendrogram-1.png b/.devel/sphinx/weave/r-figures/ssi-oecd-dendrogram-1.png
diff --git a/.devel/sphinx/weave/r.Rmd b/.devel/sphinx/weave/r.Rmd
@@ -17,7 +17,6 @@ library("genieclust")
 
 
 
-
 Let's consider the [Sustainable Society Indices](http://www.ssfindex.com/)
 dataset that measures the Human, Environmental, and Economic Wellbeing
 in each country. There are seven categories on the scale $[0, 10]$.
@@ -95,7 +94,7 @@ plot(as.dendrogram(h_oecd), horiz=TRUE)
 
 
 
-Final notes:
+Conclusion:
 
 * If we are only interested in a specific partition,
 calling `genie()` directly will be slightly faster than referring to

diff --git a/.devel/sphinx/weave/r.md b/.devel/sphinx/weave/r.md
@@ -9,31 +9,26 @@ The latest stable release of the R package `genieclust` is available from the
 We can install it by calling:
 
 
-
-```r
+``` r
 install.packages("genieclust")
 ```
 
 
 Below are a few basic examples of how to interact with the package.
 
 
-
-
-```r
+``` r
 library("genieclust")
 ```
 
 
 
-
 Let's consider the [Sustainable Society Indices](http://www.ssfindex.com/)
 dataset that measures the Human, Environmental, and Economic Wellbeing
 in each country. There are seven categories on the scale $[0, 10]$.
 
 
-
-```r
+``` r
 # see https://github.com/gagolews/genieclust/tree/master/devel/sphinx/weave
 ssi <- read.csv("ssi_2016_categories.csv", comment.char="#")
 X <- as.matrix(ssi[,-1])    # everything except the Country (1st) column
@@ -63,8 +58,7 @@ with the input matrix directly:
 
 
 
-
-```r
+``` r
 # faster than gclust(dist(X)):
 h <- gclust(X)  # default: gini_threshold=0.3, distance="euclidean"
 print(h)
@@ -80,8 +74,7 @@ print(h)
 In order to extract a desired *k*-partition, we can call `stats::cutree()`:
 
 
-
-```r
+``` r
 y_pred <- cutree(h, k=3)
 sample(y_pred, 25)  # preview
 ##                Iran            Slovenia             Morocco 
@@ -108,8 +101,7 @@ This gives the cluster IDs allocated to each country.
 Let's depict the obtained partition using the `rworldmap` package:
 
 
-
-```r
+``` r
 library("rworldmap")  # see the package's manual for details
 mapdata <- data.frame(Country=dimnames(X)[[1]], Cluster=y_pred)
 mapdata <- joinCountryData2Map(mapdata, joinCode="NAME", nameJoinColumn="Country")
@@ -127,8 +119,7 @@ Countries grouped w.r.t. the SSI categories.
 We can compute, e.g., the average indicators in each identified group:
 
 
-
-```r
+``` r
 t(aggregate(as.data.frame(X), list(Cluster=y_pred), mean))[-1, ]
 ##                                [,1]   [,2]   [,3]
 ## BasicNeeds                   9.0679 5.2689 9.8178
@@ -146,15 +137,19 @@ For greater readability, we will restrict ourselves to a smaller sample;
 namely, to the 37 members of the [OECD](https://en.wikipedia.org/wiki/OECD):
 
 
-
-```r
+``` r
 oecd <- c("Australia", "Austria", "Belgium", "Canada", "Chile", "Colombia",
 "Czech Republic", "Denmark", "Estonia", "Finland", "France", "Germany",
 "Greece", "Hungary", "Iceland", "Ireland", "Israel", "Italy", "Japan",
 "Korea, South", "Latvia", "Lithuania", "Luxembourg", "Mexico", "Netherlands",
 "New Zealand", "Norway", "Poland", "Portugal", "Slovak Republic", "Slovenia",
 "Spain", "Sweden", "Switzerland", "Turkey", "United Kingdom", "United States")
 X_oecd <- X[dimnames(X)[[1]] %in% oecd, ]
+```
+
+
+
+``` r
 h_oecd <- gclust(X_oecd)
 plot(as.dendrogram(h_oecd), horiz=TRUE)
 ```
@@ -166,7 +161,7 @@ Cluster dendrogram for the OECD countries.
 
 
 
-Final notes:
+Conclusion:
 
 * If we are only interested in a specific partition,
 calling `genie()` directly will be slightly faster than referring to

diff --git 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.6
-Date: 2025-01-31
+Version: 1.1.6.9001
+Date: 2025-02-03
 Authors@R: c(
     person("Marek", "Gagolewski",
         role = c("aut", "cre", "cph"),

diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 genieclust package for R and Python
-Copyleft (C) 2018-2024, Marek Gagolewski <https://www.gagolewski.com/>
+Copyleft (C) 2018-2025, Marek Gagolewski <https://www.gagolewski.com/>
 
 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
@@ -1,6 +1,6 @@
-# Copyleft (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com/>
+# Copyleft (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com/>
 # pip3 install pweave tabulate hdbscan mlpack nmslib pytest rpy2 scanpy
-
+# R: rworldmap [gdal-devel geos-devel proj-devel udunits2-devel gdal proj]
 
 .PHONY: python py-test py-check r r-check r r-build html docs clean
 

diff --git a/NEWS b/NEWS
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.x.x (2025-xx-xx)
+
+* ...
+
+
 ## 1.1.6 (2024-08-22)
 
 * [PYTHON] The package now works with *numpy* 2.0.

diff --git a/R/gclust.R b/R/gclust.R
@@ -2,7 +2,7 @@
 
 # ############################################################################ #
 #                                                                              #
-#   Copyleft (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com>      #
+#   Copyleft (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com>      #
 #                                                                              #
 #                                                                              #
 #   This program is free software: you can redistribute it and/or modify       #

diff --git a/R/genieclust-package.R b/R/genieclust-package.R
@@ -2,7 +2,7 @@
 
 # ############################################################################ #
 #                                                                              #
-#   Copyleft (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com>      #
+#   Copyleft (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com>      #
 #                                                                              #
 #                                                                              #
 #   This program is free software: you can redistribute it and/or modify       #

diff --git a/R/mst.R b/R/mst.R
@@ -2,7 +2,7 @@
 
 # ############################################################################ #
 #                                                                              #
-#   Copyleft (C) 2020-2024, Marek Gagolewski <https://www.gagolewski.com>      #
+#   Copyleft (C) 2020-2025, Marek Gagolewski <https://www.gagolewski.com>      #
 #                                                                              #
 #                                                                              #
 #   This program is free software: you can redistribute it and/or modify       #

diff --git a/README.md b/README.md
@@ -165,7 +165,7 @@ Any contributions are welcome (e.g., Julia, Matlab, ...).
 
 ## License
 
-Copyright (C) 2018–2024 Marek Gagolewski <https://www.gagolewski.com/>
+Copyright (C) 2018–2025 Marek Gagolewski <https://www.gagolewski.com/>
 
 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

diff --git a/docs/_downloads/01c61da91a57cfdb372b0edb5845828a/genieclust_plots-4.pdf b/docs/_downloads/01c61da91a57cfdb372b0edb5845828a/genieclust_plots-4.pdf
diff --git a/docs/_downloads/36c4dad867b3fffadb9a35cb5700de0e/genieclust_plots-3.pdf b/docs/_downloads/36c4dad867b3fffadb9a35cb5700de0e/genieclust_plots-3.pdf
diff --git a/docs/_downloads/3db969050b6fe55b9afe4d23ba8ca159/genieclust_plots-1.pdf b/docs/_downloads/3db969050b6fe55b9afe4d23ba8ca159/genieclust_plots-1.pdf
diff --git a/docs/_downloads/45852431f09dd0f067debdafd9183f89/genieclust_plots-4.hires.png b/docs/_downloads/45852431f09dd0f067debdafd9183f89/genieclust_plots-4.hires.png
diff --git a/docs/_downloads/80b6e797cf4bfc1e75b448d4dd5ab97a/genieclust_plots-2.png b/docs/_downloads/80b6e797cf4bfc1e75b448d4dd5ab97a/genieclust_plots-2.png
diff --git a/docs/_downloads/87a64c806a70c3933ae7971e4274766d/genieclust_plots-3.png b/docs/_downloads/87a64c806a70c3933ae7971e4274766d/genieclust_plots-3.png
diff --git a/docs/_downloads/a93a0e04519e0a9f69f41a9fc3df0844/genieclust_plots-2.hires.png b/docs/_downloads/a93a0e04519e0a9f69f41a9fc3df0844/genieclust_plots-2.hires.png
diff --git a/docs/_downloads/aad27638b83bb016d016d86411e5bb69/genieclust_plots-4.png b/docs/_downloads/aad27638b83bb016d016d86411e5bb69/genieclust_plots-4.png
diff --git a/docs/_downloads/e8b0369125c8b9186ee63322221ea81a/genieclust_plots-3.hires.png b/docs/_downloads/e8b0369125c8b9186ee63322221ea81a/genieclust_plots-3.hires.png
diff --git a/docs/_downloads/ed494fd415c093d0a546f90cf51e4280/genieclust_plots-1.png b/docs/_downloads/ed494fd415c093d0a546f90cf51e4280/genieclust_plots-1.png
diff --git a/docs/_downloads/f10d82cc1a8914330c4324f07e968726/genieclust_plots-2.pdf b/docs/_downloads/f10d82cc1a8914330c4324f07e968726/genieclust_plots-2.pdf
diff --git a/docs/_downloads/feb2bbc6c795930ee090591ae6c4e6c1/genieclust_plots-1.hires.png b/docs/_downloads/feb2bbc6c795930ee090591ae6c4e6c1/genieclust_plots-1.hires.png
diff --git a/docs/_images/genieclust_plots-1.png b/docs/_images/genieclust_plots-1.png
diff --git a/docs/_images/genieclust_plots-2.png b/docs/_images/genieclust_plots-2.png
diff --git a/docs/_images/genieclust_plots-3.png b/docs/_images/genieclust_plots-3.png
diff --git a/docs/_images/genieclust_plots-4.png b/docs/_images/genieclust_plots-4.png
diff --git a/docs/_images/ssi-map-1.png b/docs/_images/ssi-map-1.png
diff --git a/docs/_images/ssi-oecd-dendrogram-1.png b/docs/_images/ssi-oecd-dendrogram-1.png
diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------
-   Copyleft (C) 2021-2024, Marek Gagolewski <https://www.gagolewski.com/>
+   Copyleft (C) 2021-2025, Marek Gagolewski <https://www.gagolewski.com/>
    -------------------------------------------------------------------------- */
 
 @import url("fonts/Alegreya-fontspec.css");

diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js
@@ -1,5 +1,5 @@
 const DOCUMENTATION_OPTIONS = {
-    VERSION: '1.1.6',
+    VERSION: '1.1.6.9001',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/docs/genieclust.html b/docs/genieclust.html
@@ -13,7 +13,7 @@
     <link rel="stylesheet" type="text/css" href="_static/plot_directive.css" />
     <link rel="stylesheet" type="text/css" href="_static/graphviz.css?v=fd3f3429" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo-extensions.css?v=36a5483c" />
-    <link rel="stylesheet" type="text/css" href="_static/css/custom.css?v=5282ffc2" />
+    <link rel="stylesheet" type="text/css" href="_static/css/custom.css?v=1981fb80" />
 
 
 
@@ -222,7 +222,7 @@
 <a class="sidebar-brand" href="index.html">genieclust</a>
 </span>
 <div class="sidebar-brand">
-1.1.6
+1.1.6.9001
 </div>
 <form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -451,11 +451,11 @@ <h1>Python Package <cite>genieclust</cite> Reference<a class="headerlink" href="
             <div class="copyright">
 
 
-              Copyright &#169; 2018–2024 by <a href="https://www.gagolewski.com">Marek Gagolewski</a>.
+              Copyright &#169; 2018–2025 by <a href="https://www.gagolewski.com">Marek Gagolewski</a>.
               Some rights reserved. Licensed under <a href='https://creativecommons.org/licenses/by-nc-nd/4.0/'>CC BY-NC-ND 4.0</a>.
               Built with <a href="https://sphinx-doc.org/">Sphinx</a>
               and a customised <a href="https://github.com/pradyunsg/furo">Furo</a> theme.
-              Last updated on 2024-11-20T12:33:00+0100.
+              Last updated on 2025-02-03T16:58:47+0100.
               This site will never display any ads: it is a non-profit project.
               It does not collect any data.
             </div>
@@ -470,7 +470,7 @@ <h1>Python Package <cite>genieclust</cite> Reference<a class="headerlink" href="
 
     </aside>
   </div>
-</div><script src="_static/documentation_options.js?v=937269b5"></script>
+</div><script src="_static/documentation_options.js?v=c547bfba"></script>
     <script src="_static/doctools.js?v=9a2dae69"></script>
     <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="_static/scripts/furo.js?v=4e2eecee"></script>