tests expect nans

Author: mayofaulkner

phylib/io/tests/test_alf.py

@@ -20,6 +20,7 @@
 from ..model import TemplateModel
 
 
+
 #------------------------------------------------------------------------------
 # Fixture
 #------------------------------------------------------------------------------
@@ -246,7 +247,7 @@ def test_merger(dataset):
 
     model = TemplateModel(
         dir_path=path, dat_path=dataset.dat_path, sample_rate=2000, n_channels_dat=dataset.nc)
-    print(model.merge_map)
+
     c = EphysAlfCreator(model)
     c.convert(out_path_merge)
 
@@ -255,9 +256,10 @@ def test_merger(dataset):
     clu_new = np.load(next(out_path_merge.glob('clusters.peakToTrough.npy')))
     assert clu_old[split_clu] == clu_new[np.max(clu) + 2]
     assert clu_old[split_clu] == clu_new[np.max(clu) + 3]
-    assert clu_new[split_clu] == 0
-    assert clu_new[merge_clu[0]] == 0
-    assert clu_new[merge_clu[1]] == 0
+
+    assert np.isnan([clu_new[split_clu]])[0]
+    assert np.isnan([clu_new[merge_clu[0]]])[0]
+    assert np.isnan([clu_new[merge_clu[1]]])[0]
 
     clu_old = np.load(next(out_path.glob('clusters.channels.npy')))
     clu_new = np.load(next(out_path_merge.glob('clusters.channels.npy')))
@@ -271,9 +273,9 @@ def test_merger(dataset):
     clu_new = np.load(next(out_path_merge.glob('clusters.depths.npy')))
     assert clu_old[split_clu] == clu_new[np.max(clu) + 2]
     assert clu_old[split_clu] == clu_new[np.max(clu) + 3]
-    assert clu_new[split_clu] == 0
-    assert clu_new[merge_clu[0]] == 0
-    assert clu_new[merge_clu[1]] == 0
+    assert np.isnan([clu_new[split_clu]])[0]
+    assert np.isnan([clu_new[merge_clu[0]]])[0]
+    assert np.isnan([clu_new[merge_clu[1]]])[0]
 
     clu_old = np.load(next(out_path.glob('clusters.waveformsChannels.npy')))
     clu_new = np.load(next(out_path_merge.glob('clusters.waveformsChannels.npy')))

phylib/io/tests/test_model.py

@@ -14,8 +14,7 @@
 
 # from phylib.utils import Bunch
 from phylib.utils.testing import captured_output
-# from ..model import from_sparse, load_model
-from phylib.io.model import from_sparse, load_model
+from ..model import from_sparse, load_model
 
 logger = logging.getLogger(__name__)