change fraction_filter's behaviour

Author: akialbz

dimspy/process/peak_filters.py

@@ -138,10 +138,10 @@ def filter_fraction(pm, fraction_threshold, within_classes=False, class_tag_type
             raise KeyError('must provide class tag type for within classes filtering')
         if not all(map(lambda t: t.has_tag_type(class_tag_type), pm.peaklist_tags)):
             raise AttributeError('not all tags have tag type [%s]' % class_tag_type)
-        flg = np.ones(pm.shape[1])
+        flg = np.zeros(pm.shape[1])
         for tag in pm.tags_of(class_tag_type):
             with unmask_peakmatrix(pm, tag) as m:
-                flg = np.logical_and(flg, (m.fraction >= fraction_threshold))
+                flg = np.logical_or(flg, (m.fraction >= fraction_threshold))
         pm.add_flag(flag_name, flg)
     return pm
 

tests/test_peak_filters.py

@@ -111,7 +111,7 @@ def test_peak_matrix_fraction_filter(self):
             pm._attr_dict[attr][:,2] *= [1, 1, 1, 1, 1, 1, 0, 0]
 
         pm = filter_fraction(pm, 0.6, within_classes = True, class_tag_type = 'plate')
-        self.assertEqual(pm.shape[1], 9)
+        self.assertEqual(pm.shape[1], 10)
         self.assertRaises(AttributeError, lambda: filter_fraction(pm, 1, within_classes = True, class_tag_type = 'time_point'))
         self.assertRaises(KeyError, lambda: filter_fraction(pm, 1, within_classes = True))