Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update noise and delay mode #35

Open
wants to merge 1 commit into
base: local_planner_subgoalmode
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions arena_bringup/launch/start_arena_flatland.launch
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
<arg name="local_planner" default="teb"/>
<arg name="rviz_file" default="nav_LP"/>

<arg name="noise_mode" default="0"/>
<param name="noise_mode" value="$(arg noise_mode)"/>

<arg name="delay" default="1"/>
<param name="delay" value="$(arg delay)"/>

<arg name="train_mode" default="false"/>
<arg name="disable_scenario" default="true"/>
<arg name="scenario_file" default="empty_map.json"/>
Expand Down Expand Up @@ -71,6 +77,10 @@
<arg name="odom_ground_truth" default="$(arg odom_ground_truth)"/>
</include>

<!-- start scan_noise node -->
<include file="$(find arena_bringup)/launch/sublaunch/scan_process.launch">
</include>

<!-- start task_generator node -->
<include file="$(find arena_bringup)/launch/sublaunch/task_generator.launch" unless="$(arg disable_scenario)">
<arg name="scenarios_json_path" value="$(find simulator_setup)/scenarios/$(arg scenario_file)"/>
Expand Down
3 changes: 2 additions & 1 deletion arena_bringup/launch/sublaunch/flatland_simulator.launch
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

<!-- launch flatland server -->
<node name="flatland_server" pkg="flatland_server" type="flatland_server" output="screen">
<remap from="/scan" to="/scan_original"/>
<param name="world_path" value="$(arg world_path)" />
<param name="update_rate" value="$(arg update_rate)" />
<param name="step_size" value="$(arg step_size)" />
Expand Down Expand Up @@ -46,4 +47,4 @@
<node name="flatland_rviz" pkg="rviz" type="rviz" output="screen" args="-d $(find arena_bringup)/rviz/$(arg rviz_file).rviz"/>
</group>

</launch>
</launch>
9 changes: 9 additions & 0 deletions arena_bringup/launch/sublaunch/scan_process.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

<launch>

<!-- ************** task generator *************** -->
<node pkg="scan_process" name="scan_process" type="scan_process.py" output="screen">

</node>

</launch>
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
{
"run": [
"run_2",
"run_3",
"run_4",
"run_5",
"run_6",
"run_7",
"run_8",
"run_9",
"run_10",
"run_11",
"run_12",
"run_13",
"run_14",
"run_15",
"run_16",
"run_17",
"run_18",
"run_19",
"run_20",
"run_21",
"run_22",
"run_23",
"run_24",
"run_25",
"run_26",
"run_27",
"run_28"
],
"time": [
172.45,
164.0,
172.5,
173.55,
172.0,
164.0,
162.5,
163.05,
163.95,
155.0,
174.0,
173.0,
215.55,
173.0,
173.5,
173.5,
173.5,
173.55,
172.95,
149.0,
173.0,
161.95,
173.0,
173.05,
173.0,
162.0,
173.45
],
"path": [
34.07,
32.916,
33.982,
34.224,
34.357,
32.924,
32.581,
32.696,
32.886,
30.719,
34.113,
34.148,
41.639,
34.164,
34.056,
34.011,
34.187,
34.256,
34.101,
29.749,
33.962,
32.517,
33.927,
34.13,
34.174,
32.437,
34.244
],
"velocity": [
0.198,
0.201,
0.197,
0.197,
0.2,
0.201,
0.2,
0.201,
0.201,
0.198,
0.196,
0.197,
0.193,
0.197,
0.196,
0.196,
0.197,
0.197,
0.197,
0.2,
0.196,
0.201,
0.196,
0.197,
0.198,
0.2,
0.197
],
"collision": [
2,
1,
2,
2,
1,
1,
1,
1,
1,
1,
1,
2,
2,
2,
1,
0,
1,
2,
1,
0,
1,
1,
0,
2,
2,
1,
2
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
{
"run": [
"run_2",
"run_3",
"run_4",
"run_5",
"run_6",
"run_7",
"run_8",
"run_9",
"run_10",
"run_11",
"run_12",
"run_13",
"run_14",
"run_15",
"run_16",
"run_17",
"run_18",
"run_19",
"run_20",
"run_21",
"run_22",
"run_23",
"run_24",
"run_25",
"run_26",
"run_27",
"run_28"
],
"time": [
150.0,
150.5,
150.5,
150.0,
151.0,
150.5,
150.0,
150.0,
150.0,
150.0,
151.5,
150.0,
151.0,
150.0,
150.0,
151.0,
150.5,
149.0,
150.5,
151.0,
151.0,
150.5,
151.0,
150.0,
150.5,
150.0,
150.0
],
"path": [
29.938,
30.044,
30.015,
29.944,
30.037,
30.023,
29.929,
29.948,
29.989,
29.931,
30.21,
29.894,
30.084,
29.921,
29.922,
30.172,
30.017,
29.749,
30.049,
30.165,
30.148,
30.037,
30.103,
29.914,
30.041,
29.936,
29.904
],
"velocity": [
0.2,
0.2,
0.199,
0.2,
0.199,
0.199,
0.2,
0.2,
0.2,
0.2,
0.199,
0.199,
0.199,
0.199,
0.199,
0.2,
0.199,
0.2,
0.2,
0.2,
0.2,
0.2,
0.199,
0.199,
0.2,
0.2,
0.199
],
"collision": [
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0
]
}
Loading