Skip to content

Commit 2517f61

Browse files
committed
Minor clean up
1 parent be69db7 commit 2517f61

File tree

4 files changed

+23
-20
lines changed

4 files changed

+23
-20
lines changed

source/dbrt/builder/factorized_transition_builder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class FactorizedTransitionBuilder
4747

4848
struct Parameters
4949
{
50-
// double joint_sigma;
50+
// double joint_sigma;
5151
std::vector<double> joint_sigmas;
5252
std::vector<double> bias_sigmas;
5353
std::vector<double> bias_factors;

source/dbrt/builder/transition_builder.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ class TransitionBuilder
111111
model->noise_matrix(B);
112112
model->input_matrix(C);
113113

114-
PV(A);
115-
116114
return model;
117115
}
118116

source/dbrt/tracker/fusion_tracker.cpp

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ void FusionTracker::initialize(const std::vector<State>& initial_states)
5050

5151
void FusionTracker::run_rotary_tracker()
5252
{
53+
ROS_INFO("Rotary tracker running ...");
54+
5355
while (running_)
5456
{
5557
usleep(10);
@@ -119,6 +121,8 @@ void FusionTracker::run_visual_tracker()
119121
current_state_and_time(current_state, garbage);
120122
particle_tracker->initialize({current_state});
121123

124+
ROS_INFO("Visual tracker running ...");
125+
122126
while (running_)
123127
{
124128
// continue only if there is a new image available
@@ -240,7 +244,7 @@ void FusionTracker::run_visual_tracker()
240244
joints_obsrv_belief_buffer_local.pop_back();
241245
}
242246

243-
MEASURE("total time for visual processing");
247+
// MEASURE("total time for visual processing");
244248
}
245249
}
246250

@@ -396,21 +400,23 @@ void FusionTracker::joints_obsrv_callback(
396400

397401
if (joints_obsrvs_buffer_.size() > 1000000)
398402
{
399-
ROS_ERROR_STREAM("Joint angle max buffer size (" << 1000000 << ") "
400-
<< "reached! This means most likely that no image "
401-
<< "has been received in a while. Old joint angles "
402-
<< "can only be discarded once an image with a later "
403-
<< "time stamp is received.");
403+
ROS_WARN_STREAM("Joint angle max buffer size ("
404+
<< 1000000
405+
<< ") "
406+
<< "reached! This means most likely that no image "
407+
<< "has been received in a while. Old joint angles "
408+
<< "can only be discarded once an image with a later "
409+
<< "time stamp is received.");
404410
joints_obsrvs_buffer_.pop_front();
405411
}
406412

407413
if (j_t > entry.timestamp)
408414
{
409-
ROS_ERROR_STREAM("Joint angle measurements not ordered! This means "
410-
<< "that a joint angle measurement was received with "
411-
<< "an older time stamp than a joint angle "
412-
<< "measurement previously received. This case should "
413-
<< "never occurr and is not handled!");
415+
ROS_WARN_STREAM("Joint angle measurements not ordered! This means "
416+
<< "that a joint angle measurement was received with "
417+
<< "an older time stamp than a joint angle "
418+
<< "measurement previously received. This case should "
419+
<< "never occurr and is not handled!");
414420
}
415421

416422
j_t = entry.timestamp;
@@ -429,17 +435,17 @@ void FusionTracker::image_obsrv_callback(const sensor_msgs::Image& ros_image)
429435

430436
if (i_t > ros_image_.header.stamp.toSec())
431437
{
432-
ROS_ERROR_STREAM("Image measurements not ordered! This means that an "
433-
<< "image was received with an older time stamp than "
434-
<< "an image previously received. This case should "
435-
<< "never occurr and is not handled!");
438+
ROS_WARN_STREAM("Image measurements not ordered! This means that an "
439+
<< "image was received with an older time stamp than "
440+
<< "an image previously received. This case should "
441+
<< "never occurr and is not handled!");
436442
}
437443

438444
i_t = ros_image_.header.stamp.toSec();
439445

440446
if (i_t > j_t)
441447
{
442-
ROS_WARN_STREAM("Latest image newer than latest joint angles! "
448+
ROS_INFO_STREAM("Latest image newer than latest joint angles! "
443449
<< "Will wait until a joint angle measurement is "
444450
<< "received with a time stamp at least as new as "
445451
<< "the latest image."

source/dbrt/tracker/visual_tracker_factory.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ std::shared_ptr<dbrt::VisualTracker> create_visual_tracker(
9393
extract_ordered_values(transition_joint_sigmas_map, kinematics);
9494
ROS_INFO("Transition parameter loaded");
9595
transition_parameters.joint_count = kinematics->num_joints();
96-
PV(transition_parameters.joint_count);
9796

9897
ROS_INFO("Transition parameter loaded");
9998

0 commit comments

Comments
 (0)