Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iri_people_simulation_approaching
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ely Repiso Polo
iri_people_simulation_approaching
Commits
eb633402
Commit
eb633402
authored
3 years ago
by
Ely Repiso Polo
Browse files
Options
Downloads
Patches
Plain Diff
algo que cambie y no subi
parent
85150ade
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
launch/people_simulation.launch
+1
-1
1 addition, 1 deletion
launch/people_simulation.launch
src/people_simulation_alg_node.cpp
+7
-4
7 additions, 4 deletions
src/people_simulation_alg_node.cpp
with
8 additions
and
5 deletions
launch/people_simulation.launch
+
1
−
1
View file @
eb633402
...
...
@@ -14,7 +14,7 @@
<!-- TODO change map with arg -->
<remap from="~tracks" to="/$(optenv ROBOT tibi)/tracks"/>
<remap from="~tracksMarkers" to="/$(optenv ROBOT tibi)/tracksMarkers"/>
<remap from="~init_simulations" to="/init_simulations"/>
<remap from="~init_simulations" to="/
$(optenv ROBOT tibi)/
init_simulations"/>
</node>
</launch>
This diff is collapsed.
Click to expand it.
src/people_simulation_alg_node.cpp
+
7
−
4
View file @
eb633402
...
...
@@ -2,11 +2,12 @@
PeopleSimulationAlgNode
::
PeopleSimulationAlgNode
(
void
)
:
algorithm_base
::
IriBaseAlgorithm
<
PeopleSimulationAlgorithm
>
(),
n_persons_
(
0
),
simulation_mode_
(
PeopleSimulationAlgNode
::
Normal
),
n_persons_
(
1
0
),
simulation_mode_
(
PeopleSimulationAlgNode
::
Normal
),
tf2_listener_
(
tf2_buffer
),
tf_
(
NULL
)
// tf2_listener_(ros::Duration(10.f))
{
ROS_INFO
(
" approaching Init node. PeopleSimulationAlgNode"
);
//init class attributes if necessary
//this->loop_rate_ = 10;//in [Hz] Es de ubuntu 14.04
setRate
(
10
);
//ROS_INFO("PeopleSimulationAlgNode::init_node");
...
...
@@ -21,12 +22,13 @@ PeopleSimulationAlgNode::PeopleSimulationAlgNode(void) :
// [init clients]
// [init action servers]
// [init services] => My
c
ervice reset cscene sim, persons to initial pose
// [init services] => My
s
ervice reset cscene sim, persons to initial pose
this
->
init_simulations_server_
=
this
->
public_node_handle_
.
advertiseService
(
"init_simulations"
,
&
PeopleSimulationAlgNode
::
init_simulationsCallback
,
this
);
// [init action clients]
init_sim
();
ROS_INFO
(
" approaching Fin init node. PeopleSimulationAlgNode"
);
}
PeopleSimulationAlgNode
::~
PeopleSimulationAlgNode
(
void
)
...
...
@@ -37,6 +39,7 @@ PeopleSimulationAlgNode::~PeopleSimulationAlgNode(void)
void
PeopleSimulationAlgNode
::
init_sim
()
{
ROS_INFO
(
" approaching init init_sim(). PeopleSimulationAlgNode"
);
scene_
.
set_dt
(
0.1
);
//this->public_node_handle_.getParam("simulation_mode", simulation_mode_);
this
->
public_node_handle_
.
getParam
(
"number_persons"
,
n_persons_
);
...
...
@@ -96,12 +99,12 @@ void PeopleSimulationAlgNode::init_sim()
id_marker_
.
color
.
r
=
0.0
;
id_marker_
.
color
.
g
=
0.0
;
id_marker_
.
color
.
b
=
0.0
;
ROS_INFO
(
" approaching Fin init_sim(). PeopleSimulationAlgNode"
);
}
void
PeopleSimulationAlgNode
::
mainNodeThread
(
void
)
{
ROS_INFO
(
" PeopleSimulationAlgNode::mainNodeThread !!!"
);
ROS_INFO
(
"
approaching
PeopleSimulationAlgNode::mainNodeThread !!!"
);
//ros::init(argc, argv, "init_simulations");
// ros::NodeHandle nh("~");
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment