readme file

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 1f35d81..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-CC := g++
-CFLAGS := -Wall -std=c++11 -Iinclude
-CPPLAGS += -Wall -std=c++11
-CXXLAGS += -Wall -std=c++11
-
-SRC := $(wildcard src/*.cpp *.cpp)
-OBJS := $(patsubst %.cpp,%.o, $(SRC))
-LIBS += `pkg-config --libs opencv log4cpp`
-#LIBS +=  -llog4cpp -lpthread
-LIBS += -lpthread
-
-.PHONY: all clean
-all:$(OBJS)
-       $(CC) $(CFLAGS) -o main $(OBJS)  $(LIBS)
-
-$(OBJS):%.o:%.cpp
-       $(CC) -c $(CFLAGS) $< -o $@
-
-
-clean:
-       rm -rf $(OBJS) main

diff --git a/README.md b/README.md
index e167559..a1112a9 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,10 +1,11 @@
 Tracker++ cpp version on Linux (arm)
 
-## install dependencies
+## Install dependencies
 
 - opencv - 3.4.1
-<https://docs.opencv.org/3.4.1/d7/d9f/tutorial_linux_install.html>
-   Run the script `script/install_opencv.sh`, the prefix is `/usr/local`
+
+    Run  `script/install_opencv.sh` to build and install opencv into /usr/local
+Refer this page <https://docs.opencv.org/3.4.1/d7/d9f/tutorial_linux_install.html>
 
 - log4cpp : logger utils
 - eigen : matrix library of C++
@@ -15,22 +16,30 @@ Tracker++ cpp version on Linux (arm)
     - `apt-get install libpython-dev python-dev`
     - build boost with python
     - `pip install scipy numpy sklearn`
-<https://www.boost.org/doc/libs/1_67_0/libs/python/doc/html/building/installing_boost_python_on_your_.html>
 
-As boost has already 
+Boost has been already installed when build ArmNN, but not enable python module,
+so need to re-install boost 1.64 by following command. add `--with-python`
 `sudo ./b2 install link=static cxxflags=-fPIC --with-filesystem --with-test --with-log --with-program_options --with-python`
+<https://www.boost.org/doc/libs/1_67_0/libs/python/doc/html/building/installing_boost_python_on_your_.html>
 
 
 ## Build with `scons`
 
-- Run `scons` to build the `src/` and `main`. It will generate a library
-`libtracker.a` and an executable file `main` under current folder.
+- Run `scons` 
+    To build folder `src/` and `main.cpp`. `libtracker.a` and `main` will be generated
 
-- Run `scons --all` to build source and `test` file. A executable file `TestMain`,
-which is used to run the unit test, will be generated under `test`
-
-- Run `scons --all -c` to clean.
+- Run `scons --all` 
+    To build folder `src/` and `test/` and `main.cpp`. `libtracker.a` , `main`,
+    and `test/TestMain` will be generated. Run `TestMain` to run all the unit
+    test 
+    
+- Run `scons -c` or  `scons --all -c` 
+    To clean 
 
 ### Run 
 
 `./main`
+
+### Log
+Logger config file is located at `config/log4cpp.properties`. By default, log
+file is `/tmp/trackerpp.log`

diff --git a/src/Engine.cpp b/src/Engine.cpp
index fbdf337..2e615b3 100644 (file)
--- a/src/Engine.cpp
+++ b/src/Engine.cpp
@@ -29,7 +29,6 @@ EnginePtr Engine::create()
 
 Engine::Engine()
 {
-    //detector = std::make_shared<Detector>();
     detector = DetectorPtr(new Detector());
 }
 

diff --git a/src/Tracker.cpp b/src/Tracker.cpp
index 098a24e..37595b4 100644 (file)
--- a/src/Tracker.cpp
+++ b/src/Tracker.cpp
@@ -9,10 +9,6 @@ static const int MaxLost = 5;
 Tracker::Tracker(const cv::Mat& image, const Detection& detection, int id) 
 : id(id)
 {
-    status = TrackerStatus::Fire;
-    preStatus = TrackerStatus::Fire;
-
-    // TODO: Kalman filter
     KF.transitionMatrix = (Mat_<double>(4, 4) << 
                                                 1, 0, 1, 0,
                                                 0, 1, 0, 1,
@@ -26,8 +22,6 @@ Tracker::Tracker(const cv::Mat& image, const Detection& detection, int id)
     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(KF.statePre, Scalar::all(0), Scalar::all(0.1));
     KF.statePost = (Mat_<double>(4, 1) << detection.center_x, detection.center_y, 0, 0);
 }
@@ -72,5 +66,6 @@ void Tracker::correct(const cv::Mat& image, const Detection& detection)
 void Tracker::predict()
 {
     age++;
-    //detection = KF.predict();
+    // TODO
+    Mat temp = KF.predict();
 }