Update dependency to Eigen3

robbietoo · Jul 5, 2015 · d6facc1 · d6facc1
1 parent c3cc8f6
commit d6facc1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,12 +3,13 @@ project(STRUCK)
 cmake_minimum_required(VERSION 2.6)
 
 find_package(OpenCV REQUIRED)
+find_package(Eigen3 REQUIRED)
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
 endif()
 
-INCLUDE_DIRECTORIES ( src/GraphUtils /usr/include/eigen2 ${OpenCV_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES ( src/GraphUtils ${OpenCV_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} )
 
 add_executable(STRUCK
     src/Config.cpp

diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@ STRUCK is part of the [Visual Object Tracking Repository](https://github.com/gne
 which aims at providing a central repository for state-of-the-art tracking algorithms that are freely available.
 The source code for this tracker was obtained from its [project website](http://www.samhare.net/research/struck/code)
 and extended by a challenge mode.
+Additionally, the code was updated to use Eigen3.
 The following description was copied literally from the original author.
 
 README

diff --git a/src/Kernels.h b/src/Kernels.h
@@ -75,8 +75,8 @@ class IntersectionKernel : public Kernel
 public:
 	inline double Eval(const Eigen::VectorXd& x1, const Eigen::VectorXd& x2) const
 	{
-		return x1.cwise().min(x2).sum();
-	}
+		return x1.array().min(x2.array()).sum();
+    }
 
 	inline double Eval(const Eigen::VectorXd& x) const
 	{

diff --git a/src/LaRank.cpp b/src/LaRank.cpp
@@ -34,7 +34,7 @@
 #include "Rect.h"
 #include "GraphUtils/GraphUtils.h"
 
-#include <Eigen/Array>
+#include <Eigen/Core>
 
 #include <opencv/highgui.h>
 static const int kTileSize = 30;