diff --git a/DESCRIPTION b/DESCRIPTION index 9566ab1d..b1d36808 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: genieclust Type: Package Title: Fast and Robust Hierarchical Clustering with Noise Points Detection Version: 1.1.4.9002 -Date: 2023-07-24 +Date: 2023-09-19 Authors@R: c( person("Marek", "Gagolewski", role = c("aut", "cre", "cph"), diff --git a/NEWS b/NEWS index a3c3b70f..9349ea89 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ * [BUGFIX] [Python] #80: fixed adjustment for `nmslib_n_neighbors` in small samples. +* [BUGFIX] [Python] #82: `cluster_validity` submodule not imported. + * [BUGFIX] Some external cluster validity measures now handle NaNs better and are slightly less prone to round-off errors. diff --git a/genieclust/__init__.py b/genieclust/__init__.py index e6cc9678..3b7ef300 100644 --- a/genieclust/__init__.py +++ b/genieclust/__init__.py @@ -21,12 +21,13 @@ # ############################################################################ # # version string, e.g., "1.0.0.9001" or "1.1.1" -__version__ = "1.1.4.9001" +__version__ = "1.1.4.9002" from . import plots from . import inequity from . import tools from . import compare_partitions +from . import cluster_validity from . import internal from .genie import Genie, GIc diff --git a/src/c_compare_partitions.h b/src/c_compare_partitions.h index f1e7a7f2..31bb8b9b 100644 --- a/src/c_compare_partitions.h +++ b/src/c_compare_partitions.h @@ -300,7 +300,7 @@ CComparePartitionsPairsResult Ccompare_partitions_pairs(const T* C, double prod_comb = (sum_comb_x*sum_comb_y)/n/(n-1.0)*2.0; // expected sum_comb, // see Eq.(2) in (Hubert, Arabie, 1985) double mean_comb = (sum_comb_x+sum_comb_y)*0.5; - double e_fm = prod_comb/sqrt(sum_comb_x*sum_comb_y); // expected FM (variant) + double e_fm = prod_comb/sqrt(sum_comb_x*sum_comb_y); // expected FM CComparePartitionsPairsResult res; res.ar = (sum_comb-prod_comb)/(mean_comb-prod_comb);