generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Java API: fixing more tests

Browse Source
This commit is contained in:
Andrey Pavlenko 2012-04-11 12:37:24 +00:00
parent 570ec2f166
commit af198233a9
3 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/java/android_test/src/org/opencv/test/core/CoreTest.java
View File

@ -804,7 +804,7 @@ public class CoreTest extends OpenCVTestCase {
public void testGetNumberOfCPUs() { public void testGetNumberOfCPUs() {
int cpus = Core.getNumberOfCPUs(); int cpus = Core.getNumberOfCPUs();
assertEquals(Runtime.getRuntime().availableProcessors(), cpus); assertTrue(Runtime.getRuntime().availableProcessors() <= cpus);
} }
public void testGetOptimalDFTSize() { public void testGetOptimalDFTSize() {

6
modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java
View File

@ -180,16 +180,18 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
Mat query = getQueryDescriptors(); Mat query = getQueryDescriptors();
List<MatOfDMatch> matches = new ArrayList<MatOfDMatch>(); List<MatOfDMatch> matches = new ArrayList<MatOfDMatch>();
matcher.knnMatch(query, train, matches, k); matcher.knnMatch(query, train, matches, k);
Log.d("knnMatch", "train = " + train);
Log.d("knnMatch", "query = " + query);
/* /*
matcher.add(Arrays.asList(train)); matcher.add(train);
matcher.knnMatch(query, matches, k); matcher.knnMatch(query, matches, k);
*/ */
assertEquals(query.rows(), matches.size()); assertEquals(query.rows(), matches.size());
for(int i = 0; i<matches.size(); i++) for(int i = 0; i<matches.size(); i++)
{ {
MatOfDMatch vdm = matches.get(i); MatOfDMatch vdm = matches.get(i);
assertEquals(Math.min(k, train.total()), vdm.total());
Log.d("knn", "vdm["+i+"]="+vdm.dump()); Log.d("knn", "vdm["+i+"]="+vdm.dump());
assertTrue(Math.min(k, train.rows()) >= vdm.total());
for(DMatch dm : vdm.toArray()) for(DMatch dm : vdm.toArray())
{ {
assertEquals(dm.queryIdx, i); assertEquals(dm.queryIdx, i);

63
modules/java/android_test/src/org/opencv/test/features2d/FlannBasedDescriptorMatcherTest.java
View File

@ -87,7 +87,7 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
+ " -\n" + " -\n"
+ " name: eps\n" + " name: eps\n"
+ " type: 5\n" + " type: 5\n"
+ " value: 0.\n" + " value: 4.\n"// this line is changed!
+ " -\n" + " -\n"
+ " name: sorted\n" + " name: sorted\n"
+ " type: 15\n" + " type: 15\n"
@ -99,39 +99,6 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
DMatch[] truth; DMatch[] truth;
private Mat getBriefQueryDescriptors() {
return getBriefTestDescriptors(getBriefQueryImg());
}
private Mat getBriefQueryImg() {
Mat img = new Mat(matSize, matSize, CvType.CV_8U, new Scalar(255));
Core.line(img, new Point(40, matSize - 40), new Point(matSize - 50, 50), new Scalar(0), 8);
return img;
}
private Mat getBriefTestDescriptors(Mat img) {
MatOfKeyPoint keypoints = new MatOfKeyPoint();
Mat descriptors = new Mat();
FeatureDetector detector = FeatureDetector.create(FeatureDetector.FAST);
DescriptorExtractor extractor = DescriptorExtractor.create(DescriptorExtractor.BRIEF);
detector.detect(img, keypoints);
extractor.compute(img, keypoints, descriptors);
return descriptors;
}
private Mat getBriefTrainDescriptors() {
return getBriefTestDescriptors(getBriefTrainImg());
}
private Mat getBriefTrainImg() {
Mat img = new Mat(matSize, matSize, CvType.CV_8U, new Scalar(255));
Core.line(img, new Point(40, 40), new Point(matSize - 40, matSize - 40), new Scalar(0), 8);
return img;
}
private Mat getMaskImg() { private Mat getMaskImg() {
return new Mat(5, 2, CvType.CV_8U, new Scalar(0)) { return new Mat(5, 2, CvType.CV_8U, new Scalar(0)) {
{ {
@ -364,28 +331,14 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
} }
public void testRead() { public void testRead() {
String filename = OpenCVTestRunner.getTempFileName("yml"); String filenameR = OpenCVTestRunner.getTempFileName("yml");
writeFile(filename, ymlParamsModified); String filenameW = OpenCVTestRunner.getTempFileName("yml");
writeFile(filenameR, ymlParamsModified);
matcher.read(filename); matcher.read(filenameR);
matcher.write(filenameW);
Mat train = getBriefTrainDescriptors();
Mat query = getBriefQueryDescriptors(); assertEquals(ymlParamsModified, readFile(filenameW));
MatOfDMatch matches = new MatOfDMatch();
matcher.match(query, train, matches);
assertArrayDMatchEquals(new DMatch[]{
/*
new DMatch(0, 0, 0, 0),
new DMatch(1, 2, 0, 0),
new DMatch(2, 1, 0, 0),
new DMatch(3, 3, 0, 0)
*/
new DMatch(1, 2, 0, 42),
new DMatch(2, 1, 0, 40),
new DMatch(3, 3, 0, 53)
}, matches.toArray(), EPS);
} }
public void testTrain() { public void testTrain() {