fixing inheritance issue with ActionDispatcher and StochasticController

allenai · Sep 11, 2020 · a5739c7 · a5739c7
1 parent 8ba168f
commit a5739c7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/ai2thor/tests/test_unity.py b/ai2thor/tests/test_unity.py
@@ -63,6 +63,11 @@ def assert_near(point1, point2, error_message=''):
     for k in point1.keys():
         assert round(point1[k], 3) == round(point2[k], 3), error_message
 
+def test_stochastic_controller():
+    controller = UnityTestController(agentControllerType='stochastic')
+    controller.reset('FloorPlan28')
+    assert controller.last_event.metadata['lastActionSuccess']
+
 def test_rectangle_aspect():
     controller = UnityTestController(width=600, height=300)
     controller.reset('FloorPlan28')

diff --git a/unity/Assets/Scripts/ActionDispatcher.cs b/unity/Assets/Scripts/ActionDispatcher.cs
@@ -126,9 +126,13 @@ private static MethodInfo getDispatchMethod(Type targetType, dynamic serverComma
 
                         // if the method is more specific and the parameters match
                         // we will dispatch to this method instead of the base type
-                        if (hierarchy.IndexOf(mi.DeclaringType) < hierarchy.IndexOf(methods[j].DeclaringType) && signatureMatch) { 
-                            methods[j] = mi;
+                        if (signatureMatch) {
+                            replaced = true;
+                            if (hierarchy.IndexOf(mi.DeclaringType) < hierarchy.IndexOf(methods[j].DeclaringType)) {
+                                methods[j] = mi;
+                            } 
                         }
+
                     }
                     if (!replaced) {
                         // we sort the list of methods so that we evaluate