RF: refactor tests after moving _combine into LouvainCommunityDetection class

Author: CindeeM

brainx/tests/test_weighted_modularity.py

@@ -218,12 +218,13 @@ def test_run(self):
         self.assertEqual(len(final_partitions), 2)
 
 
-def test_combine():
-    first = [set([0,1,2]), set([3,4,5]), set([6,7])]
-    second = [set([0,2]), set([1])]
-    npt.assert_raises(ValueError, wm._combine, second, first)
-    res = wm._combine(first, second)
-    npt.assert_equal(res, [set([0,1,2,6,7]), set([3,4,5])])
+    def test_combine(self):
+
+        first = [set([0,1,2]), set([3,4,5]), set([6,7])]
+        second = [set([0,2]), set([1])]
+        npt.assert_raises(ValueError, self.louvain._combine, second, first)
+        res = self.louvain._combine(first, second)
+        npt.assert_equal(res, [set([0,1,2,6,7]), set([3,4,5])])
 
 def test_meta_graph():
     graph, communities = get_test_data()

brainx/weighted_modularity.py

@@ -324,18 +324,18 @@ def _move_node(part, node, new_comm):
         new_community = [x for x in new_community if len(x) > 0]
         return WeightedPartition(part.graph, new_community)
 
-    @staticmethod
-    def partitions_from_dendogram(dendo):
+    def partitions_from_dendogram(self, dendo):
         """ returns community partitions based on results in dendogram
         """
         all_partitions = []
         init_part = dendo[0].communities
         all_partitions.append(init_part)
         for partition in dendo[1:]:
-            init_part = _combine(init_part, partition.communities)
+            init_part = self._combine(init_part, partition.communities)
             all_partitions.append(init_part)
         return all_partitions
 
+    @staticmethod
     def _combine(prev, next):
         """combines nodes in sets (prev) based on mapping defined by
         (next) (which now treats a previous communitity as a node)