From d505231ea97536bc69e2e23fc28eff5b36d91c48 Mon Sep 17 00:00:00 2001
From: MLErik <baerenjesus@gmail.com>
Date: Tue, 8 Oct 2019 14:45:04 -0400
Subject: [PATCH] fixed merge conflicts.
---
tests/test_flatland_malfunction.py | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/tests/test_flatland_malfunction.py b/tests/test_flatland_malfunction.py
index faf4a4cc..73c831a4 100644
--- a/tests/test_flatland_malfunction.py
+++ b/tests/test_flatland_malfunction.py
@@ -82,12 +82,8 @@ def test_malfunction_process():
obs_builder_object=SingleAgentNavigationObs()
)
# reset to initialize agents_static
-<<<<<<< HEAD
obs, info = env.reset(False, False, True, random_seed=10)
-=======
- obs, info = env.reset(False, False, True, random_seed=0)
->>>>>>> fixed first tests in malfunction test
- print(env.agents[0].malfunction_data)
+
# Check that a initial duration for malfunction was assigned
assert env.agents[0].malfunction_data['next_malfunction'] > 0
for agent in env.agents:
@@ -155,11 +151,7 @@ def test_malfunction_process_statistically():
obs_builder_object=SingleAgentNavigationObs()
)
# reset to initialize agents_static
-<<<<<<< HEAD
env.reset(True, True, False, random_seed=10)
-=======
- env.reset(False, False, False, random_seed=0)
->>>>>>> fixed first tests in malfunction test
env.agents[0].target = (0, 0)
nb_malfunction = 0
--
GitLab