Merge pull request #48 from courtois-neuromod/iss44

Fixes issue #46
courtois-neuromod · Apr 1, 2020 · cd0b16a · cd0b16a
2 parents 73a85ee + c08ec86
commit cd0b16a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dypac/bascpp.py b/dypac/bascpp.py
@@ -135,7 +135,7 @@ def find_states(onehot, n_states=10, max_iter=30, threshold_sim=0.3, n_batch=0,
     """Find dynamic states based on the similarity of clusters over time."""
     if verbose:
         print("Consensus clustering.")
-    cent, states, inert = k_means(
+    _, states, _ = k_means(
         onehot,
         n_clusters=n_states,
         init="k-means++",

diff --git a/dypac/dypac.py b/dypac/dypac.py
@@ -293,7 +293,7 @@ def _mask_and_reduce_batch(self, imgs, confounds=None):
             init="k-means++",
             max_iter=self.max_iter,
             random_state=self.random_state,
-            n_init=self.n_init,
+            n_init=self.n_init_aggregation,
         )
 
         # average stability maps and dwell times across consensus states
@@ -342,7 +342,7 @@ def _mask_and_reduce(self, imgs, confounds=None):
             threshold_sim=self.threshold_sim,
             n_batch=self.n_batch,
             random_state=self.random_state,
-            n_init=self.n_init,
+            n_init=self.n_init_aggregation,
             verbose=self.verbose,
         )