Add tracking

koi-boy · May 2, 2020 · 7777c2d · 7777c2d
1 parent f83b911
commit 7777c2d
Show file tree

Hide file tree

Showing 126 changed files with 450 additions and 596 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -66,6 +66,9 @@ include_directories(
     "src/user_interface"
     "src/user_interface/dark_theme"
     "src/object_detector/detector/include"
+    "src/object_detector/common"
+    "src/object_detector/tracker"
+    "src/object_detector"
     "src/lane_detector/include"
     "src/car_prop_reader/include"
     ${SDL2_INCLUDE_DIRS}

diff --git a/src/object_detector/CMakeLists.txt b/src/object_detector/CMakeLists.txt
@@ -17,10 +17,11 @@ set(HEADERS
 # Include directories
 # ----------------------------------------------------------------------------
 INCLUDE_DIRECTORIES(
-                    ./tracker/src
-                    ./tracker/common
-                    ./tracker/src/Tracker
-                    ./tracker/src/Tracker/HungarianAlg
+    ./common
+    ./tracker
+    ./tracker/Tracker
+    ./tracker/Tracker/HungarianAlg
+    ./detector/include
 )
 
 set(LIBS

diff --git a/src/object_detector/tracker/common/defines.h → src/object_detector/common/defines.h b/src/object_detector/tracker/common/defines.h → src/object_detector/common/defines.h
@@ -87,26 +87,6 @@ typedef std::vector<CRegion> regions_t;
 ///
 namespace tracking
 {
-///
-/// \brief The Detectors enum
-///
-enum Detectors
-{
-    Motion_VIBE,
-    Motion_MOG,
-    Motion_GMG,
-    Motion_CNT,
-    Motion_SuBSENSE,
-    Motion_LOBSTER,
-    Motion_MOG2,
-    Face_HAAR,
-    Pedestrian_HOG,
-    Pedestrian_C4,
-    SSD_MobileNet,
-    Yolo_OCV,
-	Yolo_Darknet,
-	Yolo_TensorRT
-};
 
 ///
 /// \brief The DistType enum

diff --git a/src/object_detector/tracker/common/nms.h → src/object_detector/common/nms.h b/src/object_detector/tracker/common/nms.h → src/object_detector/common/nms.h
diff --git a/src/object_detector/detector/include/ctdetConfig.h b/src/object_detector/detector/include/ctdetConfig.h
@@ -16,9 +16,7 @@ namespace ctdet {
     constexpr static int classNum = 10;
     constexpr static float mean[]= {0.408, 0.447, 0.470};
     constexpr static float std[] = {0.289, 0.274, 0.278};
-    constexpr static char *className[]= {(char*)"person", (char*)"rider", (char*)"car", (char*)"bus",
-                                         (char*)"truck", (char*)"bike", (char*)"motor", (char*)"traffic_light", (char*)"traffic_sign",
-                                         (char*)"train"};
+    constexpr static char *className[]= {(char*)"person", (char*)"rider", (char*)"car", (char*)"bus", (char*)"truck", (char*)"bike", (char*)"motor", (char*)"traffic_light", (char*)"traffic_sign", (char*)"train"};
 
 }
 #endif //CTDET_TRT_CTDETCONFIG_H