Merge branch 'new_tracks'

# Conflicts:
#	src/Tracker/VOTTracker.hpp
#	src/Tracker/dat/dat_tracker.cpp
#	src/Tracker/dat/dat_tracker.hpp
#	src/Tracker/staple/fhog.cpp
#	src/Tracker/staple/staple_tracker.cpp
#	src/Tracker/staple/staple_tracker.hpp
#	src/Tracker/track.cpp

Author: Nuzhny007

CMakeLists.txt

@@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD 14)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors -std=c++14" CACHE STRING COMPILE_FLAGS FORCE)
-    set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -march=native -mtune=native --fast-math -ffast-math -funroll-loops -Wall -DNDEBUG -DBOOST_DISABLE_ASSERTS" CACHE STRING COMPILE_FLAGS FORCE)
+    set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -march=native -mtune=native -funroll-loops -Wall -DNDEBUG -DBOOST_DISABLE_ASSERTS" CACHE STRING COMPILE_FLAGS FORCE)
     set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -march=native -mtune=native -Wall -DDEBUG" CACHE STRING COMPILE_FLAGS FORCE)
 elseif (MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ob2 /Oi /Ot /arch:AVX /fp:fast /EHsc /W4 -DGTL_STATIC" CACHE STRING COMPILE_FLAGS FORCE)

src/Tracker/VOTTracker.hpp

@@ -16,6 +16,6 @@ class VOTTracker
     }
 
     virtual void Initialize(const cv::Mat &im, cv::Rect region) = 0;
-    virtual cv::Rect Update(const cv::Mat &im) = 0;
+    virtual cv::Rect Update(const cv::Mat &im, float& confidence) = 0;
     virtual void Train(const cv::Mat &im, bool first) = 0;
 };

src/Tracker/dat/dat_tracker.cpp

@@ -81,10 +81,13 @@ void DAT_TRACKER::Initialize(const cv::Mat &im, cv::Rect region)
 ///
 /// \brief DAT_TRACKER::tracker_dat_update
 /// \param I
+/// \param confidence
 /// \return
 ///
-cv::Rect DAT_TRACKER::Update(const cv::Mat &im)
+cv::Rect DAT_TRACKER::Update(const cv::Mat &im, float& confidence)
 {
+    confidence = 0;
+
     cv::Mat img_preprocessed;
     cv::resize(im, img_preprocessed, cv::Size(), scale_factor_, scale_factor_);
     cv::Mat img;
@@ -156,7 +159,9 @@ cv::Rect DAT_TRACKER::Update(const cv::Mat &im)
                                                 float(hypotheses[i].y) + float(hypotheses[i].height) / 2.));
         candidate_scores.push_back(vote_scores[i] * dist_scores[i]);
     }
-    int best_candidate = max_element(candidate_scores.begin(), candidate_scores.end()) - candidate_scores.begin();
+    auto maxEl = std::max_element(candidate_scores.begin(), candidate_scores.end());
+    int best_candidate = maxEl - candidate_scores.begin();
+    confidence = *maxEl;
 
     target_pos = candidate_centers[best_candidate];
 

src/Tracker/dat/dat_tracker.hpp

@@ -46,7 +46,7 @@ class DAT_TRACKER : public VOTTracker
     ~DAT_TRACKER();
 
     void Initialize(const cv::Mat &im, cv::Rect region);
-    cv::Rect Update(const cv::Mat &im);
+    cv::Rect Update(const cv::Mat &im, float& confidence);
     void Train(const cv::Mat &im, bool first);
 
 protected:

src/Tracker/staple/fhog.cpp

@@ -1,8 +1,6 @@
 #include <cstring>
 #include <iostream>
 
-using namespace std;
-
 #include "fhog.h"
 #undef MIN