Merge pull request #265 from janezd/nxexplorer-exact-match

Network Explorer: Add exact match by label

Author: janezd

orangecontrib/network/widgets/OWNxExplorer.py

@@ -354,6 +354,10 @@ def _mark_by_labels(marker):
                 return None
             return marker(np.char.array(labels), txt)
 
+        def mark_label_equals():
+            return _mark_by_labels(
+                lambda labels, txt: np.flatnonzero(labels.lower() == txt))
+
         def mark_label_starts():
             return _mark_by_labels(
                 lambda labels, txt: np.flatnonzero(labels.lower().startswith(txt)))
@@ -426,6 +430,7 @@ def mark_more_than_average_neighbour():
 
         self.mark_criteria = [
             ("(Select criteria for marking)", None, lambda: np.zeros((0,))),
+            ("Mark node labelled as", text_line(), mark_label_equals),
             ("Mark nodes whose label starts with", text_line(), mark_label_starts),
             ("Mark nodes whose label contains", text_line(), mark_label_contains),
             ("Mark nodes whose data that contains", text_line(), mark_text),

orangecontrib/network/widgets/tests/test_OWNxExplorer.py

@@ -86,15 +86,15 @@ def test_edge_weights(self):
 
         # Mark nodes with many connections (multiple): should show the weights for edges between marked nodes only
         self.widget.mark_min_conn = 8
-        self.widget.set_mark_mode(8)
+        self.widget.set_mark_mode(9)
         self.assertEqual(len(self.widget.graph.edge_labels), 12)
 
         # Reset to default (no selection) and check that the labels disappear
         self.widget.set_mark_mode(0)
         self.assertEqual(len(self.widget.graph.edge_labels), 0)
 
         # Mark nodes with most connections (single): should show all its edges' weights
-        self.widget.set_mark_mode(9)
+        self.widget.set_mark_mode(10)
         self.assertEqual(len(self.widget.graph.edge_labels), 14)
 
     def test_input_subset(self):