Ensure passing numpy arrays to rust (#50)

milesgranger · Apr 20, 2020 · e156586 · e156586
1 parent 169d8d9
commit e156586
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gapstat-rs"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Miles Granger <[email protected]>"]
 
 [lib]

diff --git a/gap_statistic/optimalK.py b/gap_statistic/optimalK.py
@@ -328,6 +328,11 @@ def _process_with_rust(
             )
             raise
 
+        X = X if isinstance(X, np.ndarray) else X.values
+        X = X.astype(np.float64)
+
+        cluster_array = np.array(cluster_array, dtype=np.int64)
+
         for (
             n_clusters,
             gap_value,
@@ -336,9 +341,7 @@ def _process_with_rust(
             sk,
             gap_star,
             sk_star,
-        ) in gapstat_rs.optimal_k(
-            X.astype(np.float64), cluster_array.astype(np.int64), self.n_iter, n_refs
-        ):
+        ) in gapstat_rs.optimal_k(X, cluster_array, self.n_iter, n_refs):
             yield GapCalcResult(
                 gap_value, n_clusters, ref_dispersion_std, sdk, sk, gap_star, sk_star
             )

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 setup(
     name="gap-stat",
-    version="2.0.0",
+    version="2.0.1",
     author="Miles Granger",
     maintainer="Miles Granger",
     author_email="[email protected]",