Merge pull request #29 from georgianpartners/issue_27

Changed intent priority from a distance from root node priority (brea…

doc/users.rst

@@ -293,8 +293,7 @@ Preprocessor uses a hierarchical structure defined by the superclass (parent) an
 and intent. There is also a priority order defined in each intent to break ties at the same level.
 
 This tree-like structure which has :py:obj:`GenericIntent <foreshadow.intents.GenericIntent>` as its
-root node is used to prioritize Intents. Intents further down the tree more precisely define a feature, thus the Intent
-farthest from the root node that matches a given feature is assigned to it.
+root node is used to prioritize Intents. Intents further down the tree more precisely define a feature and intents further to the right hold a higher priority than those to the left, thus the Intent represented by the right-most node of the tree that matches will be selected.
 
 Each Intent contains a :code:`multi-pipeline` and a :code:`single-pipeline`. These objects are lists of tuples of the form
 :code:`[('name', TransformerObject()),...]` and are used by Preprocessor to construct sklearn Pipeline objects.

foreshadow/intents/base.py

@@ -127,7 +127,7 @@ def priority_traverse(cls):
             node = lqueue.pop(0)
             if len(node.children) > 0:
                 node_children = map(registry_eval, node.children)
-                lqueue.extend(node_children)
+                lqueue[0:0] = node_children  # Append to beginning to do depth first
 
     @classmethod
     @check_base

foreshadow/tests/test_intents/test_base.py

@@ -217,6 +217,6 @@ class TestIntent12(TestIntent1):
         def is_intent(cls, df):
             return True
 
-    class_list = [TestIntent, TestIntent1, TestIntent2, TestIntent11, TestIntent12]
+    class_list = [TestIntent, TestIntent1, TestIntent11, TestIntent12, TestIntent2]
     assert class_list == list(TestIntent.priority_traverse())
     _unregister_intent(list(map(lambda x: x.__name__, class_list)))