Skip to content

Commit

Permalink
small changes in readme
Browse files Browse the repository at this point in the history
  • Loading branch information
ReykCS committed Oct 28, 2022
1 parent 45a683e commit 85ebfdf
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 22 deletions.
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# Arena Rosnav Task Generator

This is the task generator package designed to work with:

- [arena-rosnav](https://github.com/Arena-Rosnav/arena-rosnav)
- [arena-rosnav-3d]()

The task generator is especially designed for single robot simulations.
This is the task generator package designed to work with the [Arena Benchmark](https://github.com/Arena-Rosnav/arena-rosnav) infrastructure.

## Task Modes

Expand Down
8 changes: 4 additions & 4 deletions robot_setup/marl_map_empty.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ robots:
# planner: rosnav
# amount: 6
# agent: rto_tlabs_marl
- model: agvota
- model: jackal
planner: teb
amount: 1
amount: 6
agent: new_jackal
- model: burger
- model: rto
planner: teb
amount: 1
amount: 6
agent: new_jackal
# - model: cob4
# planner: teb
Expand Down
8 changes: 4 additions & 4 deletions task_generator/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ class TaskMode:
SCENARIO = "scenario"

class Random:
MIN_DYNAMIC_OBS = 1
MAX_DYNAMIC_OBS = 3
MIN_STATIC_OBS = 1
MAX_STATIC_OBS = 3
MIN_DYNAMIC_OBS = 10
MAX_DYNAMIC_OBS = 15
MIN_STATIC_OBS = 10
MAX_STATIC_OBS = 15

class Scenario:
RESETS_DEFAULT = 5
Expand Down
5 changes: 1 addition & 4 deletions task_generator/manager/robot_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def __init__(self, namespace, map_manager, environment, robot_setup):

self.robot_setup = robot_setup

def set_up_robot(self, launch_robot_controller=True):
def set_up_robot(self):
if Utils.get_arena_type() == Constants.ArenaType.TRAINING:
self.robot_radius = rospy.get_param("robot_radius")

Expand All @@ -56,9 +56,6 @@ def set_up_robot(self, launch_robot_controller=True):
if Utils.get_arena_type() == Constants.ArenaType.TRAINING:
return

if not launch_robot_controller:
return

self.launch_robot(self.robot_setup)

self.robot_radius = rospy.get_param(
Expand Down
4 changes: 0 additions & 4 deletions task_generator/tasks/staged.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,6 @@ def _reset_robot_and_obstacles(
**kwargs
)

def _set_up_robot_managers(self):
for manager in self.robot_managers:
manager.set_up_robot(launch_robot_controller=False)

def _init_stage(self, stage):
static_obstacles = self._stages[stage]["static"]
dynamic_obstacles = self._stages[stage]["dynamic"]
Expand Down

0 comments on commit 85ebfdf

Please sign in to comment.