fix API inconsistency, update to 0.4.1

Author: kno10

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 For changes to the main Rust package, please see <https://github.com/kno10/rust-kmedoids/blob/main/CHANGELOG.md>
 
+## kmedoids 0.4.1 (2022-09-24)
+
+- drop a leftover println, remove Display/Debug traits
+- optimize marginally the MSC loss function computation
+- fix return value inconsistency in Python wrapper with n_cpu set
+
 ## kmedoids 0.4.0 (2022-09-24)
 
 - add clustering by optimizing the Silhouette: PAMSIL

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "kmedoids"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Erich Schubert <erich.schubert@tu-dortmund.de>", "Lars Lenssen <lars.lenssen@tu-dortmund.de>"]
 description = "k-Medoids clustering with the FasterPAM algorithm"
 homepage = "https://github.com/kno10/python-kmedoids"
@@ -14,7 +14,7 @@ name = "kmedoids"
 crate-type = ["cdylib"]
 
 [dependencies]
-rustkmedoids = { version = "0.4.0", package = "kmedoids", git = "https://github.com/kno10/rust-kmedoids" }
+rustkmedoids = { version = "0.4.1", package = "kmedoids", git = "https://github.com/kno10/rust-kmedoids" }
 numpy = "0.17"
 ndarray = "0.15"
 rand = "0.8"

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "kmedoids"
-version = "0.4.0"
+version = "0.4.1"
 description = "k-Medoids Clustering in Python with FasterPAM"
 requires-dist = ["numpy"]
 classifier = [

tests/test_integration.py

@@ -55,23 +55,23 @@ def test_pammedsil(self):
         dist = np.array([[0, 2, 3, 4, 5], [2, 0, 6, 7, 8], [3, 6, 0, 9, 10], [4, 7, 9, 0, 11], [5, 8, 10, 11, 0]], dtype=np.float32)
         pms = kmedoids.pammedsil(dist, 2)
         pms_rust = kmedoids.kmedoids._pammedsil_swap_f32(dist, pms.medoids, 100)
-        assert pms.loss == 0.8172727272727272
+        assert pms.loss == 0.8172727272727273
         assert pms.loss == pms_rust[0]
         assert np.array_equal(pms.medoids, pms_rust[2])
 
     def test_fastmsc(self):
         dist = np.array([[0, 2, 3, 4, 5], [2, 0, 6, 7, 8], [3, 6, 0, 9, 10], [4, 7, 9, 0, 11], [5, 8, 10, 11, 0]], dtype=np.float32)
         fmsc = kmedoids.fastmsc(dist, 2, init="build")
         fmsc_rust = kmedoids.kmedoids._fastmsc_f32(dist, fmsc.medoids, 100)
-        assert fmsc.loss == 0.8172727272727272
+        assert fmsc.loss == 0.8172727272727273
         assert np.array_equal(fmsc.medoids, fmsc_rust[2])
         assert fmsc.loss == fmsc_rust[0]
 
     def test_fastermsc(self):
         dist = np.array([[0, 2, 3, 4, 5], [2, 0, 6, 7, 8], [3, 6, 0, 9, 10], [4, 7, 9, 0, 11], [5, 8, 10, 11, 0]], dtype=np.float32)
         fmsc = kmedoids.fastermsc(dist, 2, init="build")
         fmsc_rust = kmedoids.kmedoids._fastermsc_f32(dist, fmsc.medoids, 100)
-        assert fmsc.loss == 0.8172727272727272
+        assert fmsc.loss == 0.8172727272727273
         assert np.array_equal(fmsc.medoids, fmsc_rust[2])
         assert fmsc.loss == fmsc_rust[0]
 
@@ -81,7 +81,7 @@ def test_silhouette(self):
         sil = kmedoids.silhouette(dist, pam.labels, n_cpu=1)
         par_sil = kmedoids.silhouette(dist, pam.labels, n_cpu=2)
         sil_rust = kmedoids.kmedoids._silhouette_i32(dist, pam.labels, False)
-        assert sil[0] == par_sil
+        assert sil[0] == par_sil[0]
         assert sil[0] == sil_rust[0]
 
     def test_medoid_silhouette(self):