CSRT and MOSSE trackers tests

Author: piercus

binding.gyp

@@ -88,6 +88,9 @@
 			"cc/modules/tracking/Trackers/TrackerMedianFlow.cc",
 			"cc/modules/tracking/Trackers/TrackerTLD.cc",
 			"cc/modules/tracking/Trackers/TrackerGOTURN.cc",
+			"cc/modules/tracking/Trackers/TrackerCSRT.cc",
+			"cc/modules/tracking/Trackers/TrackerCSRTParams.cc",
+			"cc/modules/tracking/Trackers/TrackerMOSSE.cc",
 			"cc/modules/features2d/features2d.cc",
 			"cc/modules/features2d/KeyPoint.cc",
 			"cc/modules/features2d/KeyPointMatch.cc",

cc/modules/tracking/Trackers/TrackerCSRTParams.cc

@@ -14,7 +14,6 @@ NAN_MODULE_INIT(TrackerCSRTParams::Init) {
 	ctor->SetClassName(FF_NEW_STRING("TrackerCSRTParams"));
 	instanceTemplate->SetInternalFieldCount(1);
 
-	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("sigma"), sigmaGet, sigmaSet);
 	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("admm_iterations"), admm_iterationsGet, admm_iterationsSet);
 	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("background_ratio"), background_ratioGet, background_ratioSet);
 	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("cheb_attenuation"), cheb_attenuationGet, cheb_attenuationSet);
@@ -28,7 +27,7 @@ NAN_MODULE_INIT(TrackerCSRTParams::Init) {
 	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("num_hog_channels_used"), num_hog_channels_usedGet, num_hog_channels_usedSet);
 	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("number_of_scales"), number_of_scalesGet, number_of_scalesSet);
 	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("padding"), paddingGet, paddingSet);
-	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("psr_threshold "), psr_threshold Get, psr_threshold Set);
+	//Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("psr_threshold"), psr_thresholdGet, psr_thresholdSet);
 	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("scale_lr"), scale_lrGet, scale_lrSet);
 	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("scale_model_max_area"), scale_model_max_areaGet, scale_model_max_areaSet);
 	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("scale_sigma_factor"), scale_sigma_factorGet, scale_sigma_factorSet);

cc/modules/tracking/Trackers/TrackerCSRTParams.h

@@ -39,8 +39,8 @@ class TrackerCSRTParams : public Nan::ObjectWrap {
 	static FF_SETTER_INT(TrackerCSRTParams, number_of_scales, params.number_of_scales);
 	static FF_GETTER(TrackerCSRTParams, paddingGet, params.padding);
 	static FF_SETTER_NUMBER(TrackerCSRTParams, padding, params.padding);
-	static FF_GETTER(TrackerCSRTParams, psr_threshold Get, params.psr_threshold );
-	static FF_SETTER_NUMBER(TrackerCSRTParams, psr_threshold , params.psr_threshold );
+	//static FF_GETTER(TrackerCSRTParams, psr_thresholdGet, params.psr_threshold);
+	//static FF_SETTER_NUMBER(TrackerCSRTParams, psr_threshold, params.psr_threshold);
 	static FF_GETTER(TrackerCSRTParams, scale_lrGet, params.scale_lr);
 	static FF_SETTER_NUMBER(TrackerCSRTParams, scale_lr, params.scale_lr);
 	static FF_GETTER(TrackerCSRTParams, scale_model_max_areaGet, params.scale_model_max_area);
@@ -64,11 +64,10 @@ class TrackerCSRTParams : public Nan::ObjectWrap {
 	static FF_GETTER(TrackerCSRTParams, use_segmentationGet, params.use_segmentation);
 	static FF_SETTER_BOOL(TrackerCSRTParams, use_segmentation, params.use_segmentation);
 	static FF_GETTER(TrackerCSRTParams, weights_lrGet, params.weights_lr);
-	static FF_SETTER_NUMBER(TrackerCSRTParams, weights_lr, params.weights_lr);
-	static FF_GETTER(TrackerCSRTParams, window_functionGet, params.window_function);
+	static FF_SETTER_NUMBER(TrackerCSRTParams, weights_lr, params.weights_lr);	
+	static FF_GETTER_SIMPLE(TrackerCSRTParams, window_functionGet, params.window_function, StringConverter);
 	static FF_SETTER_STRING(TrackerCSRTParams, window_function, params.window_function);
 
-
 	static Nan::Persistent<v8::FunctionTemplate> constructor;
 };
 

cc/modules/tracking/Trackers/TrackerMOSSE.cc

@@ -11,7 +11,6 @@ NAN_MODULE_INIT(TrackerMOSSE::Init) {
 	v8::Local<v8::ObjectTemplate> instanceTemplate = ctor->InstanceTemplate();
 
 	Tracker::Init(ctor);
-	TrackerMOSSEParams::Init(target);
 
 	constructor.Reset(ctor);
 	ctor->SetClassName(FF_NEW_STRING("TrackerMOSSE"));
@@ -26,7 +25,7 @@ NAN_METHOD(TrackerMOSSE::New) {
 	FF_METHOD_CONTEXT("TrackerMOSSE::New");
 
 	TrackerMOSSE* self = new TrackerMOSSE();
-	self->tracker = cv::TrackerMOSSE::createTracker(params);
+	self->tracker = cv::TrackerMOSSE::create();
 	self->Wrap(info.Holder());
 	FF_RETURN(info.Holder());
 };

test/tests/modules/tracking/trackerTests.js

@@ -13,7 +13,7 @@ const expectImplementsMethods = (tracker) => {
   expect(tracker).to.have.property('getModel').to.be.a('function');
 };
 
-const trackerName = getTestImg => (trackerName) => {
+const TrackerTestGenerator = getTestImg => (trackerName) => {
   const newTracker = () => new cv[trackerName]();
   const newTrackerParams = () => new cv[`${trackerName}Params`]();
 
@@ -151,7 +151,7 @@ module.exports = () => {
           tracker[addMethod](testImg, new cv.Rect(0, 0, 10, 10));
         });
         const rects = tracker.update(testImg);
-        expect(rects).to.be.an('array').lengthOf(5);
+        expect(rects).to.be.an('array').lengthOf(7);
         rects.forEach((rect) => {
           expect(rect).to.be.instanceOf(cv.Rect);
         });