X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=src%2FTracker.cpp;h=098a24ec4e4b1f0310c3249f521bb3e3a6bc2eec;hb=81741fb5b3fe86bf29a130f367ea102e3aa99b0b;hp=e9353bdfbfa3aa5c14aa929d9c291ed7abe6955b;hpb=a80807eb35cc0ff70a9afdd6b7db2f38cb686683;p=trackerpp.git

diff --git a/src/Tracker.cpp b/src/Tracker.cpp
index e9353bd..098a24e 100644
--- a/src/Tracker.cpp
+++ b/src/Tracker.cpp
@@ -6,29 +6,30 @@ using namespace std;
 
 static const int MaxLost = 5;
 
-Tracker::Tracker(const cv::Mat& image, const Detection& detection, int id) : id(id)
+Tracker::Tracker(const cv::Mat& image, const Detection& detection, int id) 
+: id(id)
 {
     status = TrackerStatus::Fire;
     preStatus = TrackerStatus::Fire;
 
     // TODO: Kalman filter
-    this->kf.transitionMatrix = (Mat_<double>(4, 4) << 
+    KF.transitionMatrix = (Mat_<double>(4, 4) << 
                                                 1, 0, 1, 0,
                                                 0, 1, 0, 1,
                                                 0, 0, 1, 0,
                                                 0, 0, 0, 1);
 
-    this->kf.measurementMatrix = (Mat_<double>(2, 2) << 
+    KF.measurementMatrix = (Mat_<double>(2, 2) << 
                                                 1, 0, 0, 0,
                                                 0, 1, 0, 0);
 
-    this->kf.processNoiseCov = 1e-5 * Mat_<double>::eye(4, 4);
-    this->kf.measurementNoiseCov = 1e-1 * Mat_<double>::ones(2, 2);
-    this->kf.errorCovPost = 1. * Mat_<double>::ones(4, 4);
+    KF.processNoiseCov = 1e-5 * Mat_<double>::eye(4, 4);
+    KF.measurementNoiseCov = 1e-1 * Mat_<double>::ones(2, 2);
+    KF.errorCovPost = 1. * Mat_<double>::ones(4, 4);
     //this->kf.statePre = 0.1 * Matx_<int, 4, 1>::randn(4, 1);
     //??? TODO
-    randn(this->kf.statePre, Scalar::all(0), Scalar::all(0.1));
-    this->kf.statePost = (Mat_<double>(4, 1) << detection.center_x, detection.center_y, 0, 0);
+    randn(KF.statePre, Scalar::all(0), Scalar::all(0.1));
+    KF.statePost = (Mat_<double>(4, 1) << detection.center_x, detection.center_y, 0, 0);
 }
 
 Tracker::~Tracker()
@@ -53,14 +54,23 @@ void Tracker::updateState(const Mat& image)
 
 void Tracker::addPatch(PatchPtr p)
 {
-    this->patches.push_back(p);
+    patches.insert(patches.begin(), p);
+    if (patches.size() > MaxPatch){
+        patches.erase(patches.end());
+    }
 }
 
 void Tracker::correct(const cv::Mat& image, const Detection& detection)
 {
-    //kf.correct();
+    // detection.center_x,   detection.center_y, 
+    // KF.correct(detect.center_x, detect.center_y);
     preStatus = status;
     status = TrackerStatus::Active;
     last_active = age;
 }
 
+void Tracker::predict()
+{
+    age++;
+    //detection = KF.predict();
+}