some renaming of filenames, as well as within files, for some more

readability and consistency:

rbc_particle_filter_object -> particle
RbcParticleFilterObject -> Particle
rbc_particle_filter_tracker -> particle_tracker

rms_gaussian_filter_object -> gaussian
RmsGaussianFilterObject -> Gaussian
rms_gaussian_filter_tracker -> gaussian_tracker

Author: wumanu

CMakeLists.txt

@@ -163,11 +163,11 @@ set(dbot_SOURCES
     ${dbot_SOURCE_DIR}/default_shader_provider.cpp
     ${dbot_SOURCE_DIR}/file_shader_provider.cpp
     ${dbot_SOURCE_DIR}/tracker/object_tracker.cpp
-    ${dbot_SOURCE_DIR}/tracker/rbc_particle_filter_object_tracker.cpp
-    ${dbot_SOURCE_DIR}/tracker/rms_gaussian_filter_object_tracker.cpp
+    ${dbot_SOURCE_DIR}/tracker/particle_tracker.cpp
+    ${dbot_SOURCE_DIR}/tracker/gaussian_tracker.cpp
     ${dbot_SOURCE_DIR}/builder/rb_sensor_builder.cpp
-    ${dbot_SOURCE_DIR}/builder/rbc_particle_filter_tracker_builder.cpp
-    ${dbot_SOURCE_DIR}/builder/rms_gaussian_filter_tracker_builder.cpp
+    ${dbot_SOURCE_DIR}/builder/particle_tracker_builder.cpp
+    ${dbot_SOURCE_DIR}/builder/gaussian_tracker_builder.cpp
 )
 
 add_library(${dbot_LIBRARY} SHARED

source/dbot/builder/rms_gaussian_filter_tracker_builder.cpp renamed to source/dbot/builder/gaussian_tracker_builder.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <dbot/simple_wavefront_object_loader.hpp>
-#include <dbot/builder/rms_gaussian_filter_tracker_builder.hpp>
+#include <dbot/builder/gaussian_tracker_builder.hpp>
 
 namespace dbot
 {
@@ -33,14 +33,14 @@ RmsGaussianFilterTrackerBuilder::RmsGaussianFilterTrackerBuilder(
 {
 }
 
-std::shared_ptr<RmsGaussianFilterObjectTracker>
+std::shared_ptr<GaussianTracker>
 RmsGaussianFilterTrackerBuilder::build()
 {
     auto object_model = create_object_model(param_.ori);
 
     auto filter = create_filter(object_model);
 
-    auto tracker = std::make_shared<RmsGaussianFilterObjectTracker>(
+    auto tracker = std::make_shared<GaussianTracker>(
         filter,
         object_model,
         param_.moving_average_update_rate,
@@ -81,9 +81,9 @@ auto RmsGaussianFilterTrackerBuilder::create_sensor(
     const std::shared_ptr<CameraData>& camera_data,
     const Parameters::Observation& param) const -> Sensor
 {
-    typedef RmsGaussianFilterObjectTracker::PixelModel PixelModel;
-    typedef RmsGaussianFilterObjectTracker::TailModel TailModel;
-    typedef RmsGaussianFilterObjectTracker::BodyTailPixelModel BodyTailModel;
+    typedef GaussianTracker::PixelModel PixelModel;
+    typedef GaussianTracker::TailModel TailModel;
+    typedef GaussianTracker::BodyTailPixelModel BodyTailModel;
 
     auto renderer = create_renderer(object_model);
 

source/dbot/builder/rms_gaussian_filter_tracker_builder.hpp renamed to source/dbot/builder/gaussian_tracker_builder.hpp

@@ -22,7 +22,7 @@
  */
 
 /**
- * \file rms_gaussian_filter_tracker_builder.hpp
+ * \file gaussian_tracker_builder.hpp
  * \date December 2015
  * \author Jan Issac (jan.issac@gmail.com)
  */
@@ -33,7 +33,7 @@
 
 #include <dbot/camera_data.hpp>
 #include <dbot/object_resource_identifier.hpp>
-#include <dbot/tracker/rms_gaussian_filter_object_tracker.hpp>
+#include <dbot/tracker/gaussian_tracker.hpp>
 #include <dbot/builder/object_transition_builder.hpp>
 
 namespace dbot
@@ -44,14 +44,14 @@ namespace dbot
 class RmsGaussianFilterTrackerBuilder
 {
 public:
-    typedef RmsGaussianFilterObjectTracker::State State;
-    typedef RmsGaussianFilterObjectTracker::Input Input;
-    typedef RmsGaussianFilterObjectTracker::Noise Noise;
-    typedef RmsGaussianFilterObjectTracker::Obsrv Obsrv;
-    typedef RmsGaussianFilterObjectTracker::Filter Filter;
-    typedef RmsGaussianFilterObjectTracker::Quadrature Quadrature;
-    typedef RmsGaussianFilterObjectTracker::Transition Transition;
-    typedef RmsGaussianFilterObjectTracker::Sensor Sensor;
+    typedef GaussianTracker::State State;
+    typedef GaussianTracker::Input Input;
+    typedef GaussianTracker::Noise Noise;
+    typedef GaussianTracker::Obsrv Obsrv;
+    typedef GaussianTracker::Filter Filter;
+    typedef GaussianTracker::Quadrature Quadrature;
+    typedef GaussianTracker::Transition Transition;
+    typedef GaussianTracker::Sensor Sensor;
 
     struct Parameters
     {
@@ -89,7 +89,7 @@ class RmsGaussianFilterTrackerBuilder
     /**
      * \brief Builds the Rbc PF tracker
      */
-    std::shared_ptr<RmsGaussianFilterObjectTracker> build();
+    std::shared_ptr<GaussianTracker> build();
 
 protected:
     /**

source/dbot/builder/rbc_particle_filter_tracker_builder.cpp renamed to source/dbot/builder/particle_tracker_builder.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <dbot/simple_wavefront_object_loader.hpp>
-#include <dbot/builder/rbc_particle_filter_tracker_builder.hpp>
+#include <dbot/builder/particle_tracker_builder.hpp>
 
 
 //namespace dbot
@@ -36,7 +36,7 @@
 //{
 //}
 
-//std::shared_ptr<RbcParticleFilterObjectTracker>
+//std::shared_ptr<ParticleTracker>
 //RbcParticleFilterTrackerBuilder::build()
 
 //auto RbcParticleFilterTrackerBuilder::create_filter(

source/dbot/builder/rbc_particle_filter_tracker_builder.hpp renamed to source/dbot/builder/particle_tracker_builder.hpp

@@ -22,7 +22,7 @@
  */
 
 /**
- * \file rbc_particle_filter_tracker_builder.hpp
+ * \file particle_tracker_builder.hpp
  * \date November 2015
  * \author Jan Issac (jan.issac@gmail.com)
  */
@@ -33,7 +33,7 @@
 
 #include <dbot/object_model_loader.hpp>
 #include <dbot/object_resource_identifier.hpp>
-#include <dbot/tracker/rbc_particle_filter_object_tracker.hpp>
+#include <dbot/tracker/particle_tracker.hpp>
 #include <dbot/builder/object_transition_builder.hpp>
 #include <dbot/builder/rb_sensor_builder.h>
 
@@ -94,11 +94,11 @@ class RbcParticleFilterTrackerBuilder
     /**
      * \brief Builds the Rbc PF tracker
      */
-    std::shared_ptr<RbcParticleFilterObjectTracker> build()
+    std::shared_ptr<ParticleTracker> build()
     {
         auto filter = create_filter(object_model_, params_.max_kl_divergence);
 
-        auto tracker = std::make_shared<RbcParticleFilterObjectTracker>(
+        auto tracker = std::make_shared<ParticleTracker>(
             filter,
             object_model_,
             params_.evaluation_count,

source/dbot/tracker/rms_gaussian_filter_object_tracker.cpp renamed to source/dbot/tracker/gaussian_tracker.cpp

@@ -21,11 +21,11 @@
  *
  */
 
-#include <dbot/tracker/rms_gaussian_filter_object_tracker.hpp>
+#include <dbot/tracker/gaussian_tracker.hpp>
 
 namespace dbot
 {
-RmsGaussianFilterObjectTracker::RmsGaussianFilterObjectTracker(
+GaussianTracker::GaussianTracker(
     const std::shared_ptr<Filter>& filter,
     const std::shared_ptr<ObjectModel>& object_model,
     double update_rate,
@@ -36,7 +36,7 @@ RmsGaussianFilterObjectTracker::RmsGaussianFilterObjectTracker(
 {
 }
 
-auto RmsGaussianFilterObjectTracker::on_initialize(
+auto GaussianTracker::on_initialize(
     const std::vector<State>& initial_states) -> State
 {
     auto initial_cov = belief_.covariance();
@@ -48,7 +48,7 @@ auto RmsGaussianFilterObjectTracker::on_initialize(
     return belief_.mean();
 }
 
-auto RmsGaussianFilterObjectTracker::on_track(const Obsrv& obsrv) -> State
+auto GaussianTracker::on_track(const Obsrv& obsrv) -> State
 {
     State old_pose = belief_.mean();
     filter_->sensor().local_sensor().body_model().nominal_pose(

source/dbot/tracker/rms_gaussian_filter_object_tracker.hpp renamed to source/dbot/tracker/gaussian_tracker.hpp

@@ -22,7 +22,7 @@
  */
 
 /**
- * \file rms_gaussian_filter_object_tracker.hpp
+ * \file gaussian_tracker.hpp
  * \author Jan Issc (jan.issac@gmail.com)
  * \date December 2015
  */
@@ -40,7 +40,7 @@
 
 namespace dbot
 {
-class RmsGaussianFilterObjectTracker : public ObjectTracker
+class GaussianTracker : public ObjectTracker
 {
 public:
     /* ---------------------------------------------------------------------- */
@@ -91,7 +91,7 @@ class RmsGaussianFilterObjectTracker : public ObjectTracker
      * \param update_rate
      *     Moving average update rate
      */
-    RmsGaussianFilterObjectTracker(
+    GaussianTracker(
         const std::shared_ptr<Filter>& filter,
         const std::shared_ptr<ObjectModel>& object_model,
         double update_rate,

source/dbot/tracker/rbc_particle_filter_object_tracker.cpp renamed to source/dbot/tracker/particle_tracker.cpp

@@ -21,11 +21,11 @@
  *
  */
 
-#include <dbot/tracker/rbc_particle_filter_object_tracker.hpp>
+#include <dbot/tracker/particle_tracker.hpp>
 
 namespace dbot
 {
-RbcParticleFilterObjectTracker::RbcParticleFilterObjectTracker(
+ParticleTracker::ParticleTracker(
     const std::shared_ptr<Filter>& filter,
     const std::shared_ptr<ObjectModel>& object_model,
     int evaluation_count,
@@ -37,7 +37,7 @@ RbcParticleFilterObjectTracker::RbcParticleFilterObjectTracker(
 {
 }
 
-auto RbcParticleFilterObjectTracker::on_initialize(
+auto ParticleTracker::on_initialize(
     const std::vector<State>& initial_states) -> State
 {
     filter_->set_particles(initial_states);
@@ -56,7 +56,7 @@ auto RbcParticleFilterObjectTracker::on_initialize(
     return integrated_poses;
 }
 
-auto RbcParticleFilterObjectTracker::on_track(const Obsrv& image) -> State
+auto ParticleTracker::on_track(const Obsrv& image) -> State
 {
     filter_->filter(image, zero_input());
 

source/dbot/tracker/rbc_particle_filter_object_tracker.hpp renamed to source/dbot/tracker/particle_tracker.hpp

@@ -22,7 +22,7 @@
  */
 
 /**
- * \file rbc_particle_filter_object_tracker.hpp
+ * \file particle_tracker.hpp
  * \date November 2015
  * \author Jan Issac (jan.issac@gmail.com)
  * \author Manuel Wuthrich (manuel.wuthrich@gmail.com)
@@ -38,9 +38,9 @@
 namespace dbot
 {
 /**
- * \brief RbcParticleFilterObjectTracker
+ * \brief ParticleTracker
  */
-class RbcParticleFilterObjectTracker : public ObjectTracker
+class ParticleTracker : public ObjectTracker
 {
 public:
     typedef fl::TransitionFunction<State, Noise, Input> Transition;
@@ -62,15 +62,15 @@ class RbcParticleFilterObjectTracker : public ObjectTracker
      * \param update_rate
      *     Moving average update rate
      */
-    RbcParticleFilterObjectTracker(
+    ParticleTracker(
         const std::shared_ptr<Filter>& filter,
         const std::shared_ptr<ObjectModel>& object_model,
         int evaluation_count,
         double update_rate,
         bool center_object_frame);
 
 
-    virtual ~RbcParticleFilterObjectTracker() { }
+    virtual ~ParticleTracker() { }
 
     /**
      * \brief perform a single filter step