Skip to content

Commit 86f29b1

Browse files
committed
added sampling blocks definition reader
1 parent 28d42e0 commit 86f29b1

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

source/dbrt/tracker/rotary_tracker.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ class RotaryTracker : public RobotTracker
6565
// Belief representation of a single joint, i.e. a Gaussian
6666
typedef typename JointFilter::Belief JointBelief;
6767

68+
// Belief distribution of a single joint
6869
typedef fl::Gaussian<Eigen::Matrix<fl::Real, 1, 1>> AngleBelief;
6970

7071
public:
@@ -120,10 +121,11 @@ class RotaryTracker : public RobotTracker
120121
*/
121122
State current_state() const;
122123

124+
/**
125+
* Callback function to apply the filter for the given joint state message
126+
*/
123127
void track_callback(const sensor_msgs::JointState& joint_msg);
124128

125-
/* const std::vector<int>& joint_order() const; */
126-
127129
private:
128130
/* std::vector<int> joint_order_; */
129131
std::shared_ptr<KinematicsFromURDF> kinematics_;

source/dbrt/tracker/visual_tracker_factory.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@
3838

3939
namespace dbrt
4040
{
41+
// typedef std::vector<std::map<std::string, std::vector<std::string>>>
42+
// SamplingBlocksDefinition;
43+
// void load_sampling_block_definition(
44+
// SamplingBlocksDefinition& sampling_blocks_definition)
45+
// {
46+
47+
// }
48+
4149
/**
4250
* \brief Create a particle filter tracking the robot joints based on depth
4351
* images measurements
@@ -148,6 +156,7 @@ std::shared_ptr<dbrt::VisualTracker> create_visual_tracker(
148156
ri::read<double>(prefix + "moving_average_update_rate", nh);
149157
tracker_parameters.max_kl_divergence =
150158
ri::read<double>(prefix + "max_kl_divergence", nh);
159+
151160
tracker_parameters.sampling_blocks =
152161
ri::read<std::vector<std::vector<int>>>(prefix + "sampling_blocks", nh);
153162

@@ -165,7 +174,6 @@ std::shared_ptr<dbrt::VisualTracker> create_visual_tracker(
165174
/* - Initialize tracker - */
166175
/* ------------------------------ */
167176

168-
169177
std::vector<Eigen::VectorXd> initial_states_vectors = {
170178
kinematics->sensor_msg_to_eigen(*joint_state)};
171179
std::vector<dbrt::RobotState<>> initial_states;

0 commit comments

Comments
 (0)