third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix java wrapper autotests

Browse Source
This commit is contained in:
abratchik
2016-10-17 21:53:59 +04:00
parent 4c66772783
commit 78874c568e
16 changed files with 324 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/misc/java/test/BruteForceHammingDescriptorMatcherTest.java
+5 -6
View File
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.opencv.core.Core;
import org.opencv.core.CvType;
import org.opencv.core.Mat;
import org.opencv.core.MatOfDMatch;
@@ -12,12 +11,12 @@ import org.opencv.core.MatOfKeyPoint;
import org.opencv.core.Point;
import org.opencv.core.Scalar;
import org.opencv.core.DMatch;
import org.opencv.features2d.DescriptorExtractor;
import org.opencv.features2d.DescriptorMatcher;
import org.opencv.features2d.FeatureDetector;
import org.opencv.test.OpenCVTestCase;
import org.opencv.test.OpenCVTestRunner;
import org.opencv.imgproc.Imgproc;
import org.opencv.features2d.Feature2D;
public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
@@ -48,7 +47,7 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
Mat descriptors = new Mat();
FeatureDetector detector = FeatureDetector.create(FeatureDetector.FAST);
DescriptorExtractor extractor = DescriptorExtractor.create(DescriptorExtractor.BRIEF);
Feature2D extractor = createAlgorythmInstance(XFEATURES2D_PACKAGE_NAME+"BriefDescriptorExtractor", ALGORITHM_FACTORY_NAME, null, null);
detector.detect(img, keypoints);
extractor.compute(img, keypoints, descriptors);
@@ -212,7 +211,7 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
matcher.radiusMatch(query, train, matches, 50.f);
assertEquals(matches.size(), 4);
assertEquals(4, matches.size());
assertTrue(matches.get(0).empty());
assertMatEqual(matches.get(1), new MatOfDMatch(truth[1]), EPS);
assertMatEqual(matches.get(2), new MatOfDMatch(truth[2]), EPS);
@@ -241,7 +240,7 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
public void testRead() {
String filename = OpenCVTestRunner.getTempFileName("yml");
writeFile(filename, "%YAML:1.0\n");
writeFile(filename, "%YAML 1.0\n---\n");
matcher.read(filename);
assertTrue(true);// BruteforceMatcher has no settings
@@ -256,7 +255,7 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
matcher.write(filename);
String truth = "%YAML:1.0\n";
String truth = "%YAML 1.0\n---\n";
assertEquals(truth, readFile(filename));
}