diff --git a/.devel/pytest/test_approx.py b/.devel/pytest/test_approx.py index bde91dc..f0d5de1 100644 --- a/.devel/pytest/test_approx.py +++ b/.devel/pytest/test_approx.py @@ -26,12 +26,12 @@ try: import mlpack -except ImportError: +except: mlpack = None try: import nmslib -except ImportError: +except: nmslib = None @@ -52,7 +52,7 @@ def __test_genie_approx(metric='euclidean'): if nmslib is None: return - + if mlpack is None: return for dataset in ["t4_8k", "h2mg_64_50"]:#, "bigger"]:#[, "bigger""s1", "Aggregation", "unbalance", "h2mg_64_50"]:#, "h2mg_1024_50", "t4_8k", "bigger"]: if dataset == "bigger": @@ -133,6 +133,7 @@ def __test_genie_approx(metric='euclidean'): def __test_sparse(affinity='euclidean_sparse'): if nmslib is None: return + if mlpack is None: return np.random.seed(123) X = np.random.choice(np.arange(-2.0, 3.0), 1000).reshape(100,-1) @@ -148,6 +149,7 @@ def __test_sparse(affinity='euclidean_sparse'): def __test_string(affinity='leven'): if nmslib is None: return + if mlpack is None: return np.random.seed(123) X = [] diff --git a/.devel/sphinx/_static/css/custom.css b/.devel/sphinx/_static/css/custom.css index 240011c..8bc41f4 100644 --- a/.devel/sphinx/_static/css/custom.css +++ b/.devel/sphinx/_static/css/custom.css @@ -1,17 +1,21 @@ /* -------------------------------------------------------------------------- - Copyleft (C) 2021-2023, Marek Gagolewski + Copyleft (C) 2021-2024, Marek Gagolewski -------------------------------------------------------------------------- */ @import url("fonts/Alegreya-fontspec.css"); @import url("fonts/ubuntu-fontspec.css"); +.katex { + font-size: inherit; +} + h1, h2, h3, h4, h5, h6 { font-weight: 700; font-family: Alegreya Sans,Roboto Slab,ff-tisa-web-pro,Georgia,Arial,sans-serif; } body { - font-family: Lato,proxima-nova,Helvetica Neue,Arial,sans-serif; + font-family: Alegreya Sans,Lato,proxima-nova,Helvetica Neue,Arial,sans-serif; font-weight: 400; } @@ -128,7 +132,8 @@ p code.notranslate, p code.literal, p tt.literal { strong.command, strong.program, .rst-content code, .rst-content div[class^="highlight"] pre, .rst-content tt, .rst-content pre, pre, samp, kbd, code { font-family: Ubuntu Mono,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace; -/* font-size: 90%; */ + letter-spacing: -0.15pt; + font-size: 95%; /* font-style: normal; */ } diff --git a/.devel/sphinx/alphamarek.py b/.devel/sphinx/alphamarek.py index 7d21a97..c99e5ce 100644 --- a/.devel/sphinx/alphamarek.py +++ b/.devel/sphinx/alphamarek.py @@ -113,7 +113,7 @@ def get_book_template(self, e): self.format_btitle(e, 'title'), self.format_volume_and_series(e), sentence [ - field('publisher'), + optional_field('publisher'), optional_field('address'), self.format_edition(e) ], diff --git a/DESCRIPTION b/DESCRIPTION index 523b32f..586192a 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.5-2 -Date: 2023-11-02 +Version: 1.1.5-9001 +Date: 2024-06-17 Authors@R: c( person("Marek", "Gagolewski", role = c("aut", "cre", "cph"), diff --git a/genieclust/genie.py b/genieclust/genie.py index 0c38d1e..6aa3e63 100644 --- a/genieclust/genie.py +++ b/genieclust/genie.py @@ -31,13 +31,13 @@ try: import nmslib -except ImportError: +except: nmslib = None try: import mlpack -except ImportError: +except: mlpack = None diff --git a/man/gclust.Rd b/man/gclust.Rd index 268ee43..731d7f7 100644 --- a/man/gclust.Rd +++ b/man/gclust.Rd @@ -166,8 +166,8 @@ According to the algorithm's original definition, the resulting partition tree (dendrogram) might violate the ultrametricity property (merges might occur at levels that are not increasing w.r.t. a between-cluster distance). -Departures from ultrametricity are corrected by applying -\code{height = rev(cummin(rev(height)))}. +\code{gclust()} automatically corrects departures from +ultrametricity by applying \code{height = rev(cummin(rev(height)))}. } \examples{ library("datasets")