Bugs fixed

kalininalab · Mar 28, 2024 · 563e5d0 · 563e5d0
1 parent ad728e5
commit 563e5d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/datasail/solver/cluster_1d.py b/datasail/solver/cluster_1d.py
@@ -6,7 +6,7 @@
 import numpy as np
 
 from datasail.solver.utils import solve, cluster_y_constraints, compute_limits, stratification_constraints
-from experiments.ablation import david
+# from experiments.ablation import david
 
 
 def solve_c1(

diff --git a/datasail/solver/solve.py b/datasail/solver/solve.py
@@ -196,13 +196,13 @@ def run_solver(
                                              for c in e_dataset.cluster_names]) if e_dataset.cluster_stratification is not None else None,
                         e_similarities=e_dataset.cluster_similarity,
                         e_distances=e_dataset.cluster_distance,
-                        e_weights=np.ndarray([e_dataset.cluster_weights.get(c, 1) for c in e_dataset.cluster_names]),
+                        e_weights=np.array([e_dataset.cluster_weights.get(c, 1) for c in e_dataset.cluster_names]),
                         f_clusters=f_dataset.cluster_names,
                         f_s_matrix=np.stack([f_dataset.cluster_stratification.get(c, np.zeros(len(dataset.classes)))
                                              for c in f_dataset.cluster_names]) if f_dataset.cluster_stratification is not None else None,
                         f_similarities=f_dataset.cluster_similarity,
                         f_distances=f_dataset.cluster_distance,
-                        f_weights=np.ndarray([f_dataset.cluster_weights.get(c, 1) for c in f_dataset.cluster_names]),
+                        f_weights=np.array([f_dataset.cluster_weights.get(c, 1) for c in f_dataset.cluster_names]),
                         inter=cluster_inter,
                         delta=delta,
                         epsilon=epsilon,