simplify logic for populating request['fleet_name']

Signed-off-by: Charly Wu <[email protected]>
open-rmf · Jan 15, 2024 · b808e79 · b808e79
1 parent 3b21058
commit b808e79
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/rmf_demos_tasks/rmf_demos_tasks/dispatch_action.py b/rmf_demos_tasks/rmf_demos_tasks/dispatch_action.py
@@ -104,7 +104,7 @@ def __init__(self, argv=sys.argv):
         # Define task request category
         request["category"] = "compose"
 
-        if self.args.robot is None and self.args.fleet:
+        if self.args.fleet:
             request["fleet_name"] = self.args.fleet
 
         # Define task request description with phases

diff --git a/rmf_demos_tasks/rmf_demos_tasks/dispatch_clean.py b/rmf_demos_tasks/rmf_demos_tasks/dispatch_clean.py
@@ -95,7 +95,7 @@ def __init__(self, argv=sys.argv):
         # Define task request category
         request["category"] = "compose"
 
-        if self.args.robot is None and self.args.fleet:
+        if self.args.fleet:
             request["fleet_name"] = self.args.fleet
 
         # Define task request description with cleaning zone

diff --git a/rmf_demos_tasks/rmf_demos_tasks/dispatch_delivery.py b/rmf_demos_tasks/rmf_demos_tasks/dispatch_delivery.py
@@ -120,7 +120,7 @@ def __init__(self, argv=sys.argv):
         start_time = now.sec * 1000 + round(now.nanosec/10**6)
         request["unix_millis_earliest_start_time"] = start_time
 
-        if self.args.robot is None and self.args.fleet:
+        if self.args.fleet:
             request["fleet_name"] = self.args.fleet
 
         def __create_pickup_desc(index):

diff --git a/rmf_demos_tasks/rmf_demos_tasks/dispatch_go_to_place.py b/rmf_demos_tasks/rmf_demos_tasks/dispatch_go_to_place.py
@@ -118,7 +118,7 @@ def __init__(self, argv=sys.argv):
             'unix_millis_earliest_start_time': start_time
         }
 
-        if self.args.robot is None and self.args.fleet:
+        if self.args.fleet:
             rmf_task_request["fleet_name"] = self.args.fleet
 
         payload["request"] = rmf_task_request

diff --git a/rmf_demos_tasks/rmf_demos_tasks/dispatch_patrol.py b/rmf_demos_tasks/rmf_demos_tasks/dispatch_patrol.py
@@ -100,7 +100,7 @@ def __init__(self, argv=sys.argv):
         # Define task request category
         request["category"] = "patrol"
 
-        if self.args.robot is None and self.args.fleet:
+        if self.args.fleet:
             request["fleet_name"] = self.args.fleet
 
         # Define task request description

diff --git a/rmf_demos_tasks/rmf_demos_tasks/dispatch_teleop.py b/rmf_demos_tasks/rmf_demos_tasks/dispatch_teleop.py
@@ -94,7 +94,7 @@ def __init__(self, argv=sys.argv):
         # Define task request category
         request["category"] = "compose"
 
-        if self.args.robot is None and self.args.fleet:
+        if self.args.fleet:
             request["fleet_name"] = self.args.fleet
 
         # Define task request description with phases