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.

Sign up for GitHub

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

Eloquent dev #62

Open
wants to merge 21 commits into
base: eloquent
Choose a base branch
from
+9,088 −7,801
Open

Eloquent dev #62

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4cf381a
init eloquent devel
jginesclavero Mar 4, 2020
4283ece
pedsim_msgs to ros2
jginesclavero Mar 4, 2020
3054641
Rm unussed msg
jginesclavero Mar 4, 2020
f8f10d8
pedsim_simulator migrated to ROS2 without visualization
jginesclavero Mar 27, 2020
fb7c9f3
Add parameters to control the radius of the robot and the agents
jginesclavero Mar 31, 2020
7725cd2
Update .gitignore
jginesclavero Mar 31, 2020
ad0ab8e
Add node to spawn a single agent
jginesclavero Jul 16, 2020
45e52e6
creating a domestic scenario
jginesclavero Jul 16, 2020
2f4d470
tf2 broadcaster
jginesclavero Jul 16, 2020
9738b90
rm log
jginesclavero Jul 16, 2020
7f557b1
Check NaN values
jginesclavero Aug 12, 2020
0f7c752
Add demo files
jginesclavero Aug 12, 2020
5365226
Migrate pedsim_visualizer to ROS2
jginesclavero Aug 13, 2020
66e5132
Add house demo launch
jginesclavero Aug 13, 2020
1ac7e81
Migrate pedsim_msgs to spencer_msgs in pedsim_visualizer_node
jginesclavero Aug 18, 2020
5019ec1
Update .gitmodules
jginesclavero Aug 18, 2020
e8ea988
Update .gitmodules
jginesclavero Aug 18, 2020
436f3da
Add wall_resolution param wall published once
jginesclavero Aug 18, 2020
d36191d
Update .gitmodules
jginesclavero Aug 19, 2020
1b0e9b1
Add crowd scenario
jginesclavero Nov 18, 2020
4b56c09
Merge branch 'eloquent-dev' of https://github.com/jginesclavero/pedsi…
jginesclavero Nov 18, 2020
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
Prev Previous commit
Next Next commit
creating a domestic scenario
@jginesclavero
jginesclavero committed Jul 16, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 45e52e6f786b663899a93c9089b8e2afeb3e0a6a
2 changes: 1 addition & 1 deletion pedsim_simulator/launch/house_demo_launch.py
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ def generate_launch_description():
description='')

declare_simulation_factor_cmd = DeclareLaunchArgument(
'simulation_factor', default_value='0.1',
'simulation_factor', default_value='0.05',
description='Top-level namespace')

pedsim_simulator_cmd = IncludeLaunchDescription(
32 changes: 29 additions & 3 deletions pedsim_simulator/scenarios/turtlebot3_house.xml
View file
Original file line number Diff line number Diff line change
@@ -18,11 +18,21 @@


<!--Waypoints (incl. WaitingQueues)-->
<waypoint id="wp1" x="-6" y="3" r="0.25"/>
<!--<waypoint id="wp1" x="-6" y="3" r="0.25"/>
<waypoint id="wp2" x="-4" y="2" r="0.25"/>
<waypoint id="wp3" x="-2" y="1" r="0.25"/>
<waypoint id="wp4" x="1.0" y="0.0" r="0.25"/>
<waypoint id="wp5" x="1.0" y="-3" r="0.25"/>
<waypoint id="wp5" x="1.0" y="-3" r="0.25"/>-->

<waypoint id="wp0" x="-2" y="-3" r="0.25"/>
<waypoint id="wp1" x="1" y="-1" r="0.25"/>
<waypoint id="wp2" x="1" y="0" r="0.25"/>
<waypoint id="wp3" x="-2" y="1" r="0.25"/>
<waypoint id="wp4" x="-4" y="2" r="0.25"/>
<waypoint id="wp5" x="-6" y="3" r="0.25"/>
<waypoint id="wp6" x="-3" y="4" r="0.25"/>
<waypoint id="wp7" x="-2" y="4" r="0.25"/>
<waypoint id="wp8" x="-1" y="2" r="0.25"/>


<waypoint id="coffee_entry" x="5" y="25" r="5"/>
@@ -40,7 +50,7 @@
<addwaypoint id="robot_goal"/>
</agent>
<!--AgentClusters-->
<agent x="-6" y="-2" n="1" dx="0" dy="0" type="0">
<!--<agent x="-6" y="-2" n="1" dx="0" dy="0" type="0">
<addwaypoint id="wp1"/>
<addwaypoint id="wp2"/>
<addwaypoint id="wp3"/>
@@ -49,9 +59,25 @@
<addwaypoint id="wp4"/>
<addwaypoint id="wp3"/>
<addwaypoint id="wp2"/>
</agent> -->

<agent x="-1" y="-2" n="1" dx="0" dy="0" type="0">
<addwaypoint id="wp1"/>
<addwaypoint id="wp2"/>
<addwaypoint id="wp3"/>
<addwaypoint id="wp4"/>
<addwaypoint id="wp5"/>
<addwaypoint id="wp6"/>
<addwaypoint id="wp7"/>
<addwaypoint id="wp8"/>
<addwaypoint id="wp2"/>
<addwaypoint id="wp1"/>
<addwaypoint id="wp0"/>

</agent>

<agent x="1" y="3" n="1" dx="0" dy="0" type="0">
<addwaypoint id="wp1"/>
</agent>

</scenario>