Skip to content

Commit

Permalink
v1.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
gagolews committed Jan 16, 2023
1 parent 6838c1e commit 9f65c9f
Show file tree
Hide file tree
Showing 65 changed files with 293 additions and 236 deletions.
4 changes: 2 additions & 2 deletions .devel/sphinx/conf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyleft (C) 2020-2022, Marek Gagolewski <https://www.gagolewski.com>
# Copyleft (C) 2020-2023, Marek Gagolewski <https://www.gagolewski.com>
# Configuration file for the Sphinx documentation builder.

import sphinx_rtd_theme
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .devel/sphinx/news.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
genieclust package for R and Python
Copyleft (C) 2018-2022, Marek Gagolewski <https://www.gagolewski.com>
Copyleft (C) 2018-2023, 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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyleft (C) 2020-2022, Marek Gagolewski <https://www.gagolewski.com>
# Copyleft (C) 2020-2023, Marek Gagolewski <https://www.gagolewski.com>

.PHONY: python py-test py-check r r-check r r-build sphinx docs clean

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions NEWS
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion R/gclust.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ############################################################################ #
# #
# Copyleft (C) 2020-2022, Marek Gagolewski <https://www.gagolewski.com> #
# Copyleft (C) 2020-2023, Marek Gagolewski <https://www.gagolewski.com> #
# #
# #
# This program is free software: you can redistribute it and/or modify #
Expand Down
2 changes: 1 addition & 1 deletion R/genieclust-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ############################################################################ #
# #
# Copyleft (C) 2020-2022, Marek Gagolewski <https://www.gagolewski.com> #
# Copyleft (C) 2020-2023, Marek Gagolewski <https://www.gagolewski.com> #
# #
# #
# This program is free software: you can redistribute it and/or modify #
Expand Down
2 changes: 1 addition & 1 deletion R/mst.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ############################################################################ #
# #
# Copyleft (C) 2020-2022, Marek Gagolewski <https://www.gagolewski.com> #
# Copyleft (C) 2020-2023, Marek Gagolewski <https://www.gagolewski.com> #
# #
# #
# This program is free software: you can redistribute it and/or modify #
Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Any contributions are welcome (e.g., Julia, Matlab, ...).

## License

Copyright (C) 2018–2022 Marek Gagolewski <https://www.gagolewski.com>
Copyright (C) 2018–2023 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
Expand Down Expand Up @@ -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).
<https://genieclust.gagolewski.com>.

Gagolewski M., Bartoszuk M., Cena A., Genie: A new, fast, and
outlier-resistant hierarchical clustering algorithm, *Information
Expand All @@ -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, <https://clustering-benchmarks.gagolewski.com>,
[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).
<https://clustering-benchmarks.gagolewski.com>.

Campello R.J.G.B., Moulavi D., Sander J.,
Density-based clustering based on hierarchical density estimates,
Expand Down
Binary file modified docs/_images/genieclust_plots-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/genieclust_plots-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/genieclust_plots-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/genieclust_plots-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
7 changes: 4 additions & 3 deletions docs/genieclust.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
</a>

<div class="version">
Python and R Package<br /> v1.1.2
Python and R Package<br /> v1.1.3
</div>

<!--
Expand Down Expand Up @@ -150,6 +150,7 @@
<ul>
<li class="toctree-l1"><a class="reference external" href="https://clustering-benchmarks.gagolewski.com">Clustering Benchmarks</a></li>
<li class="toctree-l1"><a class="reference external" href="https://datawranglingpy.gagolewski.com/">Data Wrangling in Python</a></li>
<li class="toctree-l1"><a class="reference external" href="https://deepr.gagolewski.com">Deep R Programming</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Appendix</span></p>
<ul>
Expand Down Expand Up @@ -297,13 +298,13 @@ <h1>Python Package <cite>genieclust</cite> Reference<a class="headerlink" href="

<div role="contentinfo">
<p>
Copyright &#169; 2018–2022 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>.
Copyright &#169; 2018–2023 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/rtfd/sphinx_rtd_theme">rtd</a>
theme.
<span class="lastupdated">
Last updated on 2022-09-22T18:55:42+1000.
Last updated on 2023-01-17T10:05:17+1100.
</span>


Expand Down
7 changes: 4 additions & 3 deletions docs/genieclust_cluster_validity.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</a>

<div class="version">
Python and R Package<br /> v1.1.2
Python and R Package<br /> v1.1.3
</div>

<!--
Expand Down Expand Up @@ -152,6 +152,7 @@
<ul>
<li class="toctree-l1"><a class="reference external" href="https://clustering-benchmarks.gagolewski.com">Clustering Benchmarks</a></li>
<li class="toctree-l1"><a class="reference external" href="https://datawranglingpy.gagolewski.com/">Data Wrangling in Python</a></li>
<li class="toctree-l1"><a class="reference external" href="https://deepr.gagolewski.com">Deep R Programming</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Appendix</span></p>
<ul>
Expand Down Expand Up @@ -895,13 +896,13 @@

<div role="contentinfo">
<p>
Copyright &#169; 2018–2022 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>.
Copyright &#169; 2018–2023 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/rtfd/sphinx_rtd_theme">rtd</a>
theme.
<span class="lastupdated">
Last updated on 2022-09-22T18:55:42+1000.
Last updated on 2023-01-17T10:05:17+1100.
</span>


Expand Down
7 changes: 4 additions & 3 deletions docs/genieclust_compare_partitions.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</a>

<div class="version">
Python and R Package<br /> v1.1.2
Python and R Package<br /> v1.1.3
</div>

<!--
Expand Down Expand Up @@ -152,6 +152,7 @@
<ul>
<li class="toctree-l1"><a class="reference external" href="https://clustering-benchmarks.gagolewski.com">Clustering Benchmarks</a></li>
<li class="toctree-l1"><a class="reference external" href="https://datawranglingpy.gagolewski.com/">Data Wrangling in Python</a></li>
<li class="toctree-l1"><a class="reference external" href="https://deepr.gagolewski.com">Deep R Programming</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Appendix</span></p>
<ul>
Expand Down Expand Up @@ -1020,13 +1021,13 @@

<div role="contentinfo">
<p>
Copyright &#169; 2018–2022 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>.
Copyright &#169; 2018–2023 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/rtfd/sphinx_rtd_theme">rtd</a>
theme.
<span class="lastupdated">
Last updated on 2022-09-22T18:55:42+1000.
Last updated on 2023-01-17T10:05:17+1100.
</span>


Expand Down
7 changes: 4 additions & 3 deletions docs/genieclust_genie.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</a>

<div class="version">
Python and R Package<br /> v1.1.2
Python and R Package<br /> v1.1.3
</div>

<!--
Expand Down Expand Up @@ -152,6 +152,7 @@
<ul>
<li class="toctree-l1"><a class="reference external" href="https://clustering-benchmarks.gagolewski.com">Clustering Benchmarks</a></li>
<li class="toctree-l1"><a class="reference external" href="https://datawranglingpy.gagolewski.com/">Data Wrangling in Python</a></li>
<li class="toctree-l1"><a class="reference external" href="https://deepr.gagolewski.com">Deep R Programming</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Appendix</span></p>
<ul>
Expand Down Expand Up @@ -645,13 +646,13 @@ <h1>genieclust.Genie<a class="headerlink" href="#genieclust-genie" title="Permal

<div role="contentinfo">
<p>
Copyright &#169; 2018–2022 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>.
Copyright &#169; 2018–2023 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/rtfd/sphinx_rtd_theme">rtd</a>
theme.
<span class="lastupdated">
Last updated on 2022-09-22T18:55:42+1000.
Last updated on 2023-01-17T10:05:17+1100.
</span>


Expand Down
7 changes: 4 additions & 3 deletions docs/genieclust_inequity.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</a>

<div class="version">
Python and R Package<br /> v1.1.2
Python and R Package<br /> v1.1.3
</div>

<!--
Expand Down Expand Up @@ -152,6 +152,7 @@
<ul>
<li class="toctree-l1"><a class="reference external" href="https://clustering-benchmarks.gagolewski.com">Clustering Benchmarks</a></li>
<li class="toctree-l1"><a class="reference external" href="https://datawranglingpy.gagolewski.com/">Data Wrangling in Python</a></li>
<li class="toctree-l1"><a class="reference external" href="https://deepr.gagolewski.com">Deep R Programming</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Appendix</span></p>
<ul>
Expand Down Expand Up @@ -480,13 +481,13 @@

<div role="contentinfo">
<p>
Copyright &#169; 2018–2022 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>.
Copyright &#169; 2018–2023 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/rtfd/sphinx_rtd_theme">rtd</a>
theme.
<span class="lastupdated">
Last updated on 2022-09-22T18:55:42+1000.
Last updated on 2023-01-17T10:05:17+1100.
</span>


Expand Down
7 changes: 4 additions & 3 deletions docs/genieclust_internal.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</a>

<div class="version">
Python and R Package<br /> v1.1.2
Python and R Package<br /> v1.1.3
</div>

<!--
Expand Down Expand Up @@ -152,6 +152,7 @@
<ul>
<li class="toctree-l1"><a class="reference external" href="https://clustering-benchmarks.gagolewski.com">Clustering Benchmarks</a></li>
<li class="toctree-l1"><a class="reference external" href="https://datawranglingpy.gagolewski.com/">Data Wrangling in Python</a></li>
<li class="toctree-l1"><a class="reference external" href="https://deepr.gagolewski.com">Deep R Programming</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Appendix</span></p>
<ul>
Expand Down Expand Up @@ -574,13 +575,13 @@

<div role="contentinfo">
<p>
Copyright &#169; 2018–2022 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>.
Copyright &#169; 2018–2023 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/rtfd/sphinx_rtd_theme">rtd</a>
theme.
<span class="lastupdated">
Last updated on 2022-09-22T18:55:42+1000.
Last updated on 2023-01-17T10:05:17+1100.
</span>


Expand Down
Binary file modified docs/genieclust_plots-1.hires.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/genieclust_plots-1.pdf
Binary file not shown.
Binary file modified docs/genieclust_plots-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/genieclust_plots-2.hires.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/genieclust_plots-2.pdf
Binary file not shown.
Binary file modified docs/genieclust_plots-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/genieclust_plots-3.hires.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/genieclust_plots-3.pdf
Binary file not shown.
Binary file modified docs/genieclust_plots-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/genieclust_plots-4.hires.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/genieclust_plots-4.pdf
Binary file not shown.
Binary file modified docs/genieclust_plots-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions docs/genieclust_plots.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
</a>

<div class="version">
Python and R Package<br /> v1.1.2
Python and R Package<br /> v1.1.3
</div>

<!--
Expand Down Expand Up @@ -150,6 +150,7 @@
<ul>
<li class="toctree-l1"><a class="reference external" href="https://clustering-benchmarks.gagolewski.com">Clustering Benchmarks</a></li>
<li class="toctree-l1"><a class="reference external" href="https://datawranglingpy.gagolewski.com/">Data Wrangling in Python</a></li>
<li class="toctree-l1"><a class="reference external" href="https://deepr.gagolewski.com">Deep R Programming</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Appendix</span></p>
<ul>
Expand Down Expand Up @@ -391,13 +392,13 @@

<div role="contentinfo">
<p>
Copyright &#169; 2018–2022 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>.
Copyright &#169; 2018–2023 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/rtfd/sphinx_rtd_theme">rtd</a>
theme.
<span class="lastupdated">
Last updated on 2022-09-22T18:55:42+1000.
Last updated on 2023-01-17T10:05:17+1100.
</span>


Expand Down
Loading

0 comments on commit 9f65c9f

Please sign in to comment.