Merge pull request #112 from BerkeleyAutomation/stallcheck

Bump version number, add deadlock check
BerkeleyAutomation · Sep 21, 2018 · f27ad2d · f27ad2d
2 parents be410dd + 9bb29b2
commit f27ad2d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/fluids/sim.py b/fluids/sim.py
@@ -352,3 +352,13 @@ def multiagent_plan(self):
     def run_time(self):
         fluids_assert(self.state, "run_time called without setting the state")
         return self.state.time
+
+
+    def in_deadlock(self):
+        """
+        Returns true if multiagent planner has deadlocked
+        """
+        for car in self.state.type_map[Car]:
+            if car.stopped_time < 10:
+                return False
+        return True
diff --git a/fluids/version.py b/fluids/version.py
@@ -1 +1 @@
-__version__ = '2.0.4'
+__version__ = '2.0.5'