ADD: match and matchAsync to BFMatcher

ADD: tests to BFMatcher in features2d

Author: eek

cc/modules/features2d/BFMatcher.cc

@@ -11,18 +11,14 @@ NAN_MODULE_INIT(BFMatcher::Init) {
   instanceTemplate->SetInternalFieldCount(1);
 
    ctor->SetClassName(Nan::New("BFMatcher").ToLocalChecked());
-//  ctor->SetClassName(FF_NEW_STRING("BFMatcher"));
-
 
 	Nan::SetAccessor(instanceTemplate, Nan::New("normType").ToLocalChecked(), BFMatcher::GetNormType);
   Nan::SetAccessor(instanceTemplate, Nan::New("crossCheck").ToLocalChecked(), BFMatcher::GetCrossCheck);
 
-//    Nan::SetPrototypeMethod(ctor, "create", create);
-
+    Nan::SetPrototypeMethod(ctor, "match", match);
+    Nan::SetPrototypeMethod(ctor, "matchAsync", matchAsync);
 
     target->Set(Nan::New("BFMatcher").ToLocalChecked(), ctor->GetFunction());
-//  target->Set(FF_NEW_STRING("BFMatcher"), ctor->GetFunction());
-
 };
 
 NAN_METHOD(BFMatcher::New) {
@@ -52,17 +48,17 @@ NAN_METHOD(BFMatcher::New) {
 
 NAN_METHOD(BFMatcher::match) {
   FF::SyncBinding(
-      std::make_shared<BFMatcherBindings::MatchWorker>(FF_UNWRAP(info.This(), BFMatcher)->bfmatcher),
+    std::make_shared<BFMatcherBindings::MatchWorker>(BFMatcher::Converter::unwrap(info.This())),
     "BFMatcher::match",
     info
   );
 }
 
 NAN_METHOD(BFMatcher::matchAsync) {
   FF::AsyncBinding(
-      std::make_shared<BFMatcherBindings::MatchWorker>(FF_UNWRAP(info.This(), BFMatcher)->bfmatcher),
-      "FeatureDetector::matchAsync",
-      info
+    std::make_shared<BFMatcherBindings::MatchWorker>(BFMatcher::Converter::unwrap(info.This())),
+    "FeatureDetector::matchAsync",
+    info
   );
 }
 

cc/modules/features2d/BFMatcherBindings.h

@@ -1,4 +1,5 @@
 #include "BFMatcher.h"
+#include "DescriptorMatch.h"
 
 #ifndef __FF_BFMATCHERBINDINGS_H_
 #define __FF_BFMATCHERBINDINGS_H_
@@ -7,8 +8,9 @@ namespace BFMatcherBindings {
 
 struct MatchWorker : public CatchCvExceptionWorker {
     public:
-        cv::Ptr<cv::BFMatcher> bfmatcher;
-        MatchWorker(cv::Ptr<cv::BFMatcher> _bfmatcher) {
+        cv::BFMatcher bfmatcher;
+
+        MatchWorker(cv::BFMatcher _bfmatcher) {
             this->bfmatcher = _bfmatcher;
         }
 
@@ -17,7 +19,7 @@ struct MatchWorker : public CatchCvExceptionWorker {
         std::vector<cv::DMatch> dmatches;
 
         std::string executeCatchCvExceptionWorker() {
-            bfmatcher->match(descFrom, descTo, dmatches);
+            bfmatcher.match(descFrom, descTo, dmatches);
             return "";
         }
 
@@ -27,7 +29,7 @@ struct MatchWorker : public CatchCvExceptionWorker {
         }
 
         FF_VAL getReturnValue() {
-            return ObjectArrayConverter<BFMatcher, cv::DMatch>::wrap(dmatches);
+            return ObjectArrayConverter<DescriptorMatch, cv::DMatch>::wrap(dmatches);
         }
     };
 }

test/tests/modules/features2d/BFMatcherTests.js

@@ -0,0 +1,60 @@
+const cv = global.dut;
+const { assertPropsWithValue, generateAPITests } = global.utils;
+
+const { expect } = require('chai');
+
+module.exports = (getTestImg) => {
+  describe('BFMatcher', () => {
+    describe('constructor', () => {
+      const normType = cv.NORM_L2;
+      const crossCheck = true;
+
+      it('should throw if insufficient args passed', () => {
+        expect(() => new cv.BFMatcher(undefined)).to.throw();
+      });
+
+      it('should throw if bag args are passed', () => {
+        expect(() => new cv.BFMatcher(normType, undefined)).to.throw();
+      });
+
+      it('should be constructable with required args', () => {
+        expect(() => new cv.BFMatcher(normType)).to.not.throw();
+      });
+
+      it('should initialize with correct values', () => {
+        const match = new cv.BFMatcher(normType, crossCheck);
+        assertPropsWithValue(match)({ normType, crossCheck });
+      });
+    });
+
+    describe('match', () => {
+        let BFMatcher;
+
+        before(() => {
+            BFMatcher = new cv.BFMatcher(cv.NORM_L2, true);
+
+            const kaze = new cv.KAZEDetector();
+            kazeKps = kaze.detect(getTestImg());
+            kazeDesc = kaze.compute(getTestImg(), kazeKps);
+        });
+
+        describe('matchBruteForce', () => {
+            it('sync', () => {
+                const matches = BFMatcher.match(kazeDesc, kazeDesc);
+                expect(kazeKps.length).to.be.above(0);
+                expect(matches).to.be.an('array').lengthOf(kazeKps.length);
+                matches.forEach(match => expect(match).instanceOf(cv.DescriptorMatch));
+            });
+
+            it('async', (done) => {
+                cv.matchBruteForceAsync(kazeDesc, kazeDesc, (err, matches) => {
+                    expect(kazeKps.length).to.be.above(0);
+                    expect(matches).to.be.an('array').lengthOf(kazeKps.length);
+                    matches.forEach(match => expect(match).instanceOf(cv.DescriptorMatch));
+                    done();
+                });
+            });
+        });
+    });
+  });
+};

test/tests/modules/features2d/features2d.test.js

@@ -5,6 +5,7 @@ const detectorTests = require('./detectorTests');
 const KeyPointTests = require('./KeyPointTests');
 const DescriptorMatchTests = require('./DescriptorMatchTests');
 const descriptorMatchingTests = require('./descriptorMatchingTests');
+const BFMatcherTests = require('./BFMatcherTests');
 
 describe('features2d', () => {
   let testImg;
@@ -15,6 +16,7 @@ describe('features2d', () => {
   KeyPointTests();
   DescriptorMatchTests();
   descriptorMatchingTests(() => testImg);
+  BFMatcherTests(() => testImg);
 
   describe('AGASTDetector', () => {
     const defaults = {