v1.1.4

Author: gagolews

.devel/pytest/test_paths.py

@@ -19,6 +19,10 @@ def test_paths():
         assert "wut" in clustbench.get_battery_names("../clustering-data-v1/")
         assert "x1" in clustbench.get_dataset_names("wut", "../clustering-data-v1/")
 
+        assert len(clustbench.load_dataset("wut", "x2", "../clustering-data-v1/")["labels"]) == 2
+
+        assert len(clustbench.assertload_dataset("wut", "x2", url="https://github.com/gagolews/clustering-data-v1/raw/v1.1.0")["labels"]) == 2
+
 
 if __name__ == "__main__":
     test_paths()

.devel/sphinx/news.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 1.1.3 (2023-12-11)
+## 1.1.4 (2023-12-12)
 
 -   [BUGFIX] #5: `load_dataset` threw an `OSError` while trying to load
     a dataset.

NEWS

@@ -1,6 +1,6 @@
 # Changelog
 
-## 1.1.3 (2023-12-11)
+## 1.1.4 (2023-12-12)
 
 -   [BUGFIX] #5: `load_dataset` threw an `OSError` while trying to load
     a dataset.

clustbench/__init__.py

@@ -21,7 +21,7 @@
 # ############################################################################ #
 
 # version string, e.g., "1.0.0.9001" or "1.1.1"
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 
 
 from .get_names import get_dataset_names, get_battery_names

clustbench/load_dataset.py

@@ -136,18 +136,16 @@ def load_dataset(
     labels = []
     i = 0
     while True:
-        try:
-            f = base_name + ".labels%d.gz" % i
-            ll = np.loadtxt(f, dtype="int")
-            if ll.ndim != 1 or ll.shape[0] != data.shape[0]:
-                raise ValueError("Incorrect number of labels in '%s'." % f)
-
-            labels.append(ll)
-            i += 1
-        except OSError:
-            # this could be done better with glob.glob for local files,
-            # but not for remote URLs
-            break
+        f = base_name + ".labels%d.gz" % i
+        if not np.DataSource().exists(f):
+            break  # stop trying to find more label vectors
+
+        ll = np.loadtxt(f, dtype="int")
+        if ll.ndim != 1 or ll.shape[0] != data.shape[0]:
+            raise ValueError("Incorrect number of labels in '%s'." % f)
+
+        labels.append(ll)
+        i += 1
 
     n_clusters = np.array([np.max(ll) for ll in labels])
 

docs/_static/documentation_options.js

@@ -1,5 +1,5 @@
 const DOCUMENTATION_OPTIONS = {
-    VERSION: '1.1.3',
+    VERSION: '1.1.4',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

docs/clustbench-documentation.html

@@ -168,7 +168,7 @@
 <a class="sidebar-brand" href="index.html">Clustering Benchmarks</a>
 </span>
 <div class="sidebar-brand">
-1.1.3
+1.1.4
 </div>
 <form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -843,7 +843,7 @@ <h1>Documentation<a class="headerlink" href="#documentation" title="Link to this
               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 2023-12-11T15:14:53+1100.
+              Last updated on 2023-12-12T14:31:23+1100.
               This site will never display any ads: it is a non-profit project.
               It does not collect any data.
             </div>
@@ -896,7 +896,7 @@ <h1>Documentation<a class="headerlink" href="#documentation" title="Link to this
 
     </aside>
   </div>
-</div><script src="_static/documentation_options.js?v=cb7bf70b"></script>
+</div><script src="_static/documentation_options.js?v=00f267c6"></script>
     <script src="_static/doctools.js?v=888ff710"></script>
     <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="_static/scripts/furo.js?v=32e29ea5"></script>

docs/genindex.html

@@ -166,7 +166,7 @@
 <a class="sidebar-brand" href="index.html">Clustering Benchmarks</a>
 </span>
 <div class="sidebar-brand">
-1.1.3
+1.1.4
 </div>
 <form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -398,7 +398,7 @@ <h2>T</h2>
               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 2023-12-11T15:14:53+1100.
+              Last updated on 2023-12-12T14:31:23+1100.
               This site will never display any ads: it is a non-profit project.
               It does not collect any data.
             </div>
@@ -413,7 +413,7 @@ <h2>T</h2>
 
     </aside>
   </div>
-</div><script src="_static/documentation_options.js?v=cb7bf70b"></script>
+</div><script src="_static/documentation_options.js?v=00f267c6"></script>
     <script src="_static/doctools.js?v=888ff710"></script>
     <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="_static/scripts/furo.js?v=32e29ea5"></script>

docs/index.html

@@ -168,7 +168,7 @@
 <a class="sidebar-brand" href="#">Clustering Benchmarks</a>
 </span>
 <div class="sidebar-brand">
-1.1.3
+1.1.4
 </div>
 <form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -381,7 +381,7 @@ <h1>A Framework for Benchmarking Clustering Algorithms<a class="headerlink" href
               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 2023-12-11T15:14:53+1100.
+              Last updated on 2023-12-12T14:31:23+1100.
               This site will never display any ads: it is a non-profit project.
               It does not collect any data.
             </div>
@@ -414,7 +414,7 @@ <h1>A Framework for Benchmarking Clustering Algorithms<a class="headerlink" href
 
     </aside>
   </div>
-</div><script src="_static/documentation_options.js?v=cb7bf70b"></script>
+</div><script src="_static/documentation_options.js?v=00f267c6"></script>
     <script src="_static/doctools.js?v=888ff710"></script>
     <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="_static/scripts/furo.js?v=32e29ea5"></script>

docs/news.html

@@ -168,7 +168,7 @@
 <a class="sidebar-brand" href="index.html">Clustering Benchmarks</a>
 </span>
 <div class="sidebar-brand">
-1.1.3
+1.1.4
 </div>
 <form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -257,7 +257,7 @@
           <section class="tex2jax_ignore mathjax_ignore" id="changelog">
 <h1>Changelog<a class="headerlink" href="#changelog" title="Link to this heading">#</a></h1>
 <section id="id1">
-<h2>1.1.3 (2023-12-11)<a class="headerlink" href="#id1" title="Link to this heading">#</a></h2>
+<h2>1.1.4 (2023-12-12)<a class="headerlink" href="#id1" title="Link to this heading">#</a></h2>
 <ul class="simple">
 <li><p>[BUGFIX] #5: <code class="docutils literal notranslate"><span class="pre">load_dataset</span></code> threw an <code class="docutils literal notranslate"><span class="pre">OSError</span></code> while trying to load
 a dataset.</p></li>
@@ -346,7 +346,7 @@ <h2>0.0.0 (2015-12-29)<a class="headerlink" href="#id6" title="Link to this head
               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 2023-12-11T15:14:53+1100.
+              Last updated on 2023-12-12T14:31:23+1100.
               This site will never display any ads: it is a non-profit project.
               It does not collect any data.
             </div>
@@ -368,7 +368,7 @@ <h2>0.0.0 (2015-12-29)<a class="headerlink" href="#id6" title="Link to this head
           <div class="toc-tree">
             <ul>
 <li><a class="reference internal" href="#">Changelog</a><ul>
-<li><a class="reference internal" href="#id1">1.1.3 (2023-12-11)</a></li>
+<li><a class="reference internal" href="#id1">1.1.4 (2023-12-12)</a></li>
 <li><a class="reference internal" href="#id2">1.1.2 (2023-10-19)</a></li>
 <li><a class="reference internal" href="#id3">1.1.1 (2022-10-06)</a></li>
 <li><a class="reference internal" href="#id4">1.1.0 (2022-09-17)</a></li>
@@ -385,7 +385,7 @@ <h2>0.0.0 (2015-12-29)<a class="headerlink" href="#id6" title="Link to this head
 
     </aside>
   </div>
-</div><script src="_static/documentation_options.js?v=cb7bf70b"></script>
+</div><script src="_static/documentation_options.js?v=00f267c6"></script>
     <script src="_static/doctools.js?v=888ff710"></script>
     <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="_static/scripts/furo.js?v=32e29ea5"></script>