Skip to content

Commit 8781b2b

Browse files
committed
Adapt to ruff recommendations
1 parent df18fbd commit 8781b2b

2 files changed

Lines changed: 10 additions & 14 deletions

File tree

src/isar_robot/robotinterface.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ def stop(self) -> None:
9191
)
9292
try:
9393
self.mission_simulation.stop_mission()
94-
except RobotNoMissionRunningException as e:
95-
raise e
9694
finally:
9795
self.mission_simulation = None
9896

src/isar_robot/simulation.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ def __init__(
2727
self.task_index: int = 0
2828
self.n_tasks: int = len(mission.tasks)
2929
self.robot_is_home: bool = False
30-
self.task_statuses: list[TaskStatus] = list(
31-
map(lambda _: TaskStatus.NotStarted, self.mission.tasks)
32-
)
30+
self.task_statuses: list[TaskStatus] = [
31+
TaskStatus.NotStarted for _ in self.mission.tasks
32+
]
3333
self.task_id_mapping = {}
3434
for i, task in enumerate(self.mission.tasks):
3535
self.task_id_mapping[task.id] = i
@@ -106,24 +106,22 @@ def current_task(self):
106106
def mission_status(self):
107107
if self.mission_paused:
108108
return MissionStatus.Paused
109-
if all(map(lambda status: status == TaskStatus.NotStarted, self.task_statuses)):
109+
if all(status == TaskStatus.NotStarted for status in self.task_statuses):
110110
return MissionStatus.NotStarted
111111
if not self.mission_done:
112112
return MissionStatus.InProgress
113-
if all(map(lambda status: status == TaskStatus.Successful, self.task_statuses)):
113+
if all(status == TaskStatus.Successful for status in self.task_statuses):
114114
return MissionStatus.Successful
115115
if any(
116-
map(
117-
lambda status: status in [TaskStatus.InProgress, TaskStatus.NotStarted],
118-
self.task_statuses,
119-
)
116+
status in [TaskStatus.InProgress, TaskStatus.NotStarted]
117+
for status in self.task_statuses
120118
):
121119
return MissionStatus.InProgress
122-
if all(map(lambda status: status == TaskStatus.Failed, self.task_statuses)):
120+
if all(status == TaskStatus.Failed for status in self.task_statuses):
123121
return MissionStatus.Failed
124-
if any(map(lambda status: status == TaskStatus.Cancelled, self.task_statuses)):
122+
if any(status == TaskStatus.Cancelled for status in self.task_statuses):
125123
return MissionStatus.Cancelled
126-
if any(map(lambda status: status == TaskStatus.Failed, self.task_statuses)):
124+
if any(status == TaskStatus.Failed for status in self.task_statuses):
127125
return MissionStatus.PartiallySuccessful
128126
raise RobotMissionStatusException("Unhandled mission status detected")
129127

0 commit comments

Comments
 (0)