new filter satisfying LGD's requirements

src/commande-new-1d.cpp

@@ -17,8 +17,8 @@ class Run
   private:
     float xx, yy, dz;
 
-    // xx > 0 : forward
+    // xx < 0 : forward
-    // xx < 0 : backward
+    // xx > 0 : backward
 
     // yy > 0 : right
     // yy < 0 : left
@@ -56,12 +56,10 @@ class Run
       if (fabs(yy) > fabs(xx) && fabs(yy) > y_dev_min)
       {
         mvt->linear.y = yy * plan_vel;
-        mvt->linear.x = 0.;
       }
       else if (fabs(xx) > x_dev_min)
       {
-        mvt->linear.x = xx * plan_vel;
+        mvt->linear.x = - xx * plan_vel;
-        mvt->linear.y = 0.;
       }
       
       assert(mvt->linear.x == 0. || mvt->linear.y == 0.);

src/filtre.cpp

@@ -68,14 +68,22 @@ class Callback {
       return std::min(diff1, diff2);
     }
 
+<<<<<<< HEAD
     float sat(const Point& pt)
+=======
+    float sat_dist(const Point& pt)
+>>>>>>> 016c5b01c8e2d4513b333d32b0e0689e985e6776
     {
       float h, s, v, diff1, diff2;
       pcl::tracking::RGB2HSV(pt.r, pt.g, pt.b, h, s, v);
       return s;
     }
 
+<<<<<<< HEAD
     float val(const Point& pt)
+=======
+    float val_dist(const Point& pt)
+>>>>>>> 016c5b01c8e2d4513b333d32b0e0689e985e6776
     {
       float h, s, v, diff1, diff2;
       pcl::tracking::RGB2HSV(pt.r, pt.g, pt.b, h, s, v);