Mercurial Hosting > traffic-intelligence
changeset 119:45a426552aaa
compilation of very simple feature class with trajectory
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Mon, 15 Aug 2011 11:39:25 -0400 |
| parents | b3e3d9f80a6a |
| children | 46b166523bf8 |
| files | c/Makefile c/feature-based-tracking.cpp include/Feature.hpp include/Parameters.hpp |
| diffstat | 4 files changed, 32 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/c/Makefile Wed Aug 10 18:36:05 2011 -0400 +++ b/c/Makefile Mon Aug 15 11:39:25 2011 -0400 @@ -3,7 +3,7 @@ CXX = g++ -INCLUDE = -I../include +INCLUDE = -I../include -I$(HOME)/Research/Code/trajectorymanagementandanalysis/trunk/src/TrajectoryManagementAndAnalysis LIBS = -L../../klt @@ -22,7 +22,7 @@ ifeq ($(UNAME), Linux) OPENCV_HOME=/usr/local - INCLUDE+= -I$(OPENCV_HOME)/include/ + INCLUDE+= -I$(OPENCV_HOME)/include -I$(OPENCV_HOME)/include/opencv LIBS += -L$(OPENCV_HOME)/lib LINUX_BOOST_PREFIX = /usr/local CFLAGS += -DLINUX @@ -59,6 +59,12 @@ builddir: @$(SCRIPTS_DIR)/createdirectory.sh $(BUILD_DIR) +test: + echo "coucou $(HOME)" + +feature-based-tracking: feature-based-tracking.o + $(CXX) $(CFLAGS) $(LIBS) $^ -o $(BUILD_DIR)/$@ $(LDFLAGS) + track-features.o: track-features.cpp $(CXX) -I../../klt $(INCLUDE) $^ -c
--- a/c/feature-based-tracking.cpp Wed Aug 10 18:36:05 2011 -0400 +++ b/c/feature-based-tracking.cpp Mon Aug 15 11:39:25 2011 -0400 @@ -1,9 +1,13 @@ +#include "../include/Feature.hpp" +//#include "cv.h" using namespace std; int main(int argc, char *argv[]) { + Feature f; + return 0; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/Feature.hpp Mon Aug 15 11:39:25 2011 -0400 @@ -0,0 +1,16 @@ +#ifndef FEATURE_HPP +#define FEATURE_HPP + +#include "opencv/cv.h" + +#include "src/Trajectory.h" + +class Feature { + +protected: + int id; + int firstInstant; + Trajectory<cv::Point2f> trajectory; +}; + +#endif
--- a/include/Parameters.hpp Wed Aug 10 18:36:05 2011 -0400 +++ b/include/Parameters.hpp Mon Aug 15 11:39:25 2011 -0400 @@ -1,4 +1,5 @@ -// ifdef... +#ifndef PARAMETERS_HPP +#define PARAMETERS_HPP /// \todo Class for parameters, with utilities to save and load from configuration files @@ -32,3 +33,5 @@ float minVelocityCosine; int minNFeaturesPerGroup; }; + +#endif