refactor: Remove type annotations for nearest_human_entity and nearest_distance in DefaultHumanDetector

shima004 · shima004 · commit d97ca891ac8f · 2024-10-09T12:21:13.000+09:00
diff --git a/adf_core_python/implement/module/complex/default_human_detector.py b/adf_core_python/implement/module/complex/default_human_detector.py
@@ -75,13 +75,13 @@ def _select_target(self) -> Optional[EntityID]:
             if self._is_valid_human(entity.get_id()) and isinstance(entity, Civilian)
         ]
         if len(cluster_valid_human_entities) != 0:
-            nearest_human_entity: Optional[Entity] = cluster_valid_human_entities[0]
-            nearest_distance: float = self._world_info.get_distance(
+            nearest_human_entity = cluster_valid_human_entities[0]
+            nearest_distance = self._world_info.get_distance(
                 self._agent_info.get_entity_id(),
                 nearest_human_entity.get_id(),
             )
             for entity in cluster_valid_human_entities:
-                distance: float = self._world_info.get_distance(
+                distance = self._world_info.get_distance(
                     self._agent_info.get_entity_id(),
                     entity.get_id(),
                 )
@@ -96,13 +96,13 @@ def _select_target(self) -> Optional[EntityID]:
             if self._is_valid_human(entity.get_id())
         ]
         if len(world_valid_human_entities) != 0:
-            nearest_human_entity: Optional[Entity] = world_valid_human_entities[0]
-            nearest_distance: float = self._world_info.get_distance(
+            nearest_human_entity = world_valid_human_entities[0]
+            nearest_distance = self._world_info.get_distance(
                 self._agent_info.get_entity_id(),
                 nearest_human_entity.get_id(),
             )
             for entity in world_valid_human_entities:
-                distance: float = self._world_info.get_distance(
+                distance = self._world_info.get_distance(
                     self._agent_info.get_entity_id(),
                     entity.get_id(),
                 )

Original file line number	Diff line number	Diff line change
`@@ -75,13 +75,13 @@ def _select_target(self) -> Optional[EntityID]:`
`75`	`75`	`if self._is_valid_human(entity.get_id()) and isinstance(entity, Civilian)`
`76`	`76`	`]`
`77`	`77`	`if len(cluster_valid_human_entities) != 0:`
`78`		`- nearest_human_entity: Optional[Entity] = cluster_valid_human_entities[0]`
`79`		`- nearest_distance: float = self._world_info.get_distance(`
	`78`	`+ nearest_human_entity = cluster_valid_human_entities[0]`
	`79`	`+ nearest_distance = self._world_info.get_distance(`
`80`	`80`	`self._agent_info.get_entity_id(),`
`81`	`81`	`nearest_human_entity.get_id(),`
`82`	`82`	`)`
`83`	`83`	`for entity in cluster_valid_human_entities:`
`84`		`- distance: float = self._world_info.get_distance(`
	`84`	`+ distance = self._world_info.get_distance(`
`85`	`85`	`self._agent_info.get_entity_id(),`
`86`	`86`	`entity.get_id(),`
`87`	`87`	`)`
`@@ -96,13 +96,13 @@ def _select_target(self) -> Optional[EntityID]:`
`96`	`96`	`if self._is_valid_human(entity.get_id())`
`97`	`97`	`]`
`98`	`98`	`if len(world_valid_human_entities) != 0:`
`99`		`- nearest_human_entity: Optional[Entity] = world_valid_human_entities[0]`
`100`		`- nearest_distance: float = self._world_info.get_distance(`
	`99`	`+ nearest_human_entity = world_valid_human_entities[0]`
	`100`	`+ nearest_distance = self._world_info.get_distance(`
`101`	`101`	`self._agent_info.get_entity_id(),`
`102`	`102`	`nearest_human_entity.get_id(),`
`103`	`103`	`)`
`104`	`104`	`for entity in world_valid_human_entities:`
`105`		`- distance: float = self._world_info.get_distance(`
	`105`	`+ distance = self._world_info.get_distance(`
`106`	`106`	`self._agent_info.get_entity_id(),`
`107`	`107`	`entity.get_id(),`
`108`	`108`	`)`