fix some bug

zhjie · Jun 12, 2022 · 046106d · 046106d
1 parent b9349f1
commit 046106d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/envs/JSBSim/core/simulatior.py b/envs/JSBSim/core/simulatior.py
@@ -445,11 +445,11 @@ def run(self):
         action, distance = self._guidance()
         self._distance_increment.append(distance > self._distance_pre)
         self._distance_pre = distance
-        if distance < self._Rc:
+        if distance < self._Rc and self.target_aircraft.is_alive:
             self.__status = MissileSimulator.HIT
             self.target_aircraft.shotdown()
         elif (self._t > self._t_max) or (np.linalg.norm(self.get_velocity()) < self._v_min) \
-                or np.sum(self._distance_increment) >= self._distance_increment.maxlen:
+                or np.sum(self._distance_increment) >= self._distance_increment.maxlen or not self.target_aircraft.is_alive:
             self.__status = MissileSimulator.MISS
         else:
             self._state_trans(action)

diff --git a/test_env.py b/test_env.py
@@ -10,6 +10,7 @@ def test_env():
     parallel_num = 1
     envs = DummyVecEnv([lambda: SingleCombatEnv("1v1/ShootMissile/HierarchySelfplay") for _ in range(parallel_num)])
 
+    envs.reset()
     # DataType test
     obs_shape = (parallel_num, envs.num_agents, *envs.observation_space.shape)
     # act_shape = (parallel_num, envs.num_agents, *envs.action_space.shape)
@@ -58,4 +59,4 @@ def test_multi_env():
 
     envs.close()
 
-test_env()
+test_multi_env()