Add convenience wrapper to find_connected_components()

2 files changed, 33 insertions, 2 deletions

diff --git a/schedcat/locking/partition.py b/schedcat/locking/partition.py
index 833ff6a..d6277e0 100644
--- a/schedcat/locking/partition.py
+++ b/schedcat/locking/partition.py
@@ -1,5 +1,7 @@
 from collections import defaultdict
 
+from schedcat.model.tasks import TaskSystem
+
 def find_connected_components(taskset):
     """Determine sets of tasks that do not share any resources."""
     by_res = defaultdict(set)
@@ -25,3 +27,15 @@ def find_connected_components(taskset):
             by_task[t] = c
 
     return by_task, by_res
+
+def find_independent_tasksubsets(taskset):
+    by_task, by_res = find_connected_components(taskset)
+    done = set()
+    subsets = []
+
+    for t in by_task:
+        if not t in done:
+            subsets.append(TaskSystem(by_task[t]))
+            done.update(by_task[t])
+
+    return subsets
diff --git a/tests/locking.py b/tests/locking.py
index 3f75646..095d44c 100644
--- a/tests/locking.py
+++ b/tests/locking.py
@@ -534,7 +534,7 @@ class Test_partition(unittest.TestCase):
         self.assertEqual(len(by_task), len(self.ts))
         for t in self.ts:
             self.assertEqual(len(by_task[t]), 4)
-            self.assertTrue(t in by_task[t])
+            self.assertIn(t, by_task[t])
 
     def test_merge2(self):
         self.ts[0].resmodel[0].add_request(1)
@@ -554,4 +554,21 @@ class Test_partition(unittest.TestCase):
         self.assertEqual(len(by_task), len(self.ts))
         for t in self.ts:
             self.assertEqual(len(by_task[t]), 2)
-            self.assertTrue(t in by_task[t])
+            self.assertIn(t, by_task[t])
+
+    def test_subsets(self):
+        self.ts[0].resmodel[0].add_request(1)
+        self.ts[0].resmodel[1].add_request(1)
+        self.ts[1].resmodel[1].add_request(1)
+
+        self.ts[2].resmodel[2].add_request(1)
+        self.ts[2].resmodel[3].add_request(1)
+        self.ts[3].resmodel[3].add_request(1)
+
+        subsets = lp.find_independent_tasksubsets(self.ts)
+        self.assertEqual(len(subsets), 2)
+        subsets.sort(key=lambda x: x.utilization())
+        self.assertIn(self.ts[0], subsets[0])
+        self.assertIn(self.ts[1], subsets[0])
+        self.assertIn(self.ts[2], subsets[1])
+        self.assertIn(self.ts[3], subsets[1])