Remove pandas

Mye-InfoBank · Jul 20, 2021 · 2fabc5d · 2fabc5d
1 parent ee35f64
commit 2fabc5d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.spyproject/
diff --git a/scHPL/learn.py b/scHPL/learn.py
@@ -90,9 +90,12 @@ def learn_tree(data: anndata,
     labels_1 = labels[idx_1]
     data_1 = xx[idx_1]
 
+    print('Starting tree:')
+    print_tree(tree)
+
     for b in batch_order:
 
-        print('Adding dataset', str(b), 'to the tree')
+        print('\nAdding dataset', str(b), 'to the tree')
 
         idx_2 = np.where(batches == b)[0]
         data_2 = xx[idx_2]
@@ -121,7 +124,7 @@ def learn_tree(data: anndata,
                                            return_missing = return_missing)
         missing_pop.extend(mis_pop)
 
-        print('Updated tree:')
+        print('\nUpdated tree:')
         print_tree(tree)
 
         #concatenate the two datasets

diff --git a/scHPL/update.py b/scHPL/update.py
@@ -151,7 +151,7 @@ def _match_trees(X, tree, y_true, pop2):
     # scan binary matrix
     binary, y_true, pop2 = _scan_binary(binary, name_root1, name_root2, y_true, tree, pop2)
 
-    strict.iloc[binary.values == False] = False
+    strict.values[binary.values == False] = False
 
     # scan strict matrix if needed
     if (np.any(strict)):