Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Java API: added more tests

Browse Source
pull/13383/head
Andrey Kamaev 14 years ago
parent 6b888ada8a
commit 754a8c1b66
3 changed files with 245 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
  2. 203
      modules/java/android_test/src/org/opencv/test/features2d/SURFTest.java
  3. 13
      modules/java/android_test/src/org/opencv/test/imgproc/imgprocTest.java

10
modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
Unescape View File

@ -7,6 +7,7 @@ import org.opencv.core.Mat;
import org.opencv.core.Point;
import org.opencv.core.Scalar;
import org.opencv.core.Core;
import org.opencv.features2d.KeyPoint;
import org.opencv.highgui.Highgui;
public class OpenCVTestCase extends TestCase {
@ -171,6 +172,15 @@ public class OpenCVTestCase extends TestCase {
compareMats(expected, actual, eps, false);
}
public static void assertKeyPointEqual(KeyPoint expected, KeyPoint actual, double eps){
assertTrue(Math.hypot(expected.pt.x - actual.pt.x, expected.pt.y - actual.pt.y) < eps);
assertTrue(Math.abs(expected.size - actual.size) < eps);
assertTrue(Math.abs(expected.angle - actual.angle) < eps);
assertTrue(Math.abs(expected.response - actual.response) < eps);
assertEquals(expected.octave, actual.octave);
assertEquals(expected.class_id, actual.class_id);
}
static private void compareMats(Mat expected, Mat actual, boolean isEqualityMeasured) {
if (expected.type() != actual.type() || expected.cols() != actual.cols()
|| expected.rows() != actual.rows()) {

203
modules/java/android_test/src/org/opencv/test/features2d/SURFTest.java
Unescape View File

@ -1,9 +1,15 @@
package org.opencv.test.features2d;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import org.opencv.core.Core;
import org.opencv.core.CvType;
import org.opencv.core.Mat;
import org.opencv.core.Point;
import org.opencv.core.Scalar;
import org.opencv.features2d.KeyPoint;
import org.opencv.features2d.SURF;
import org.opencv.test.OpenCVTestCase;
@ -11,21 +17,54 @@ import org.opencv.test.OpenCVTestRunner;
public class SURFTest extends OpenCVTestCase {
private SURF surf;
int matSize;
KeyPoint[] truth;
public void test_1() {
super.test_1("features2d.SURF");
}
@Override
protected void setUp() throws Exception {
matSize = 100;
truth = new KeyPoint[] {
new KeyPoint(55.775577545166016f, 44.224422454833984f, 16,
9.754629f, 8617.863f, 1, -1),
new KeyPoint(44.224422454833984f, 44.224422454833984f, 16,
99.75463f, 8617.863f, 1, -1),
new KeyPoint(44.224422454833984f, 55.775577545166016f, 16,
189.7546f, 8617.863f, 1, -1),
new KeyPoint(55.775577545166016f, 55.775577545166016f, 16,
279.75464f, 8617.863f, 1, -1) };
super.setUp();
}
surf = null;
private Mat getCross() {
Mat cross = new Mat(matSize, matSize, CvType.CV_8U, new Scalar(255));
Core.line(cross, new Point(20, matSize / 2), new Point(matSize - 21,
matSize / 2), new Scalar(100), 2);
Core.line(cross, new Point(matSize / 2, 20), new Point(matSize / 2,
matSize - 21), new Scalar(100), 2);
return cross;
}
public void test_1() {
super.test_1("features2d.SURF");
private void order(List<KeyPoint> points) {
Collections.sort(points, new Comparator<KeyPoint>() {
public int compare(KeyPoint p1, KeyPoint p2) {
if (p1.angle < p2.angle)
return -1;
if (p1.angle > p2.angle)
return 1;
return 0;
}
});
}
public void testDescriptorSize() {
surf = new SURF(500.0, 4, 2, false);
SURF surf = new SURF(500.0, 4, 2, false);
assertEquals(64, surf.descriptorSize());
surf = new SURF(500.0, 4, 2, true);
@ -33,49 +72,171 @@ public class SURFTest extends OpenCVTestCase {
}
public void testDetectMatMatListOfKeyPoint() {
surf = new SURF();
SURF surf = new SURF(8000);
List<KeyPoint> keypoints = new LinkedList<KeyPoint>();
surf.detect(grayChess, new Mat(), keypoints);
OpenCVTestRunner.Log("" + keypoints.size());
fail("Not yet implemented");
Mat gray0 = new Mat(matSize, matSize, CvType.CV_8U, new Scalar(255));
surf.detect(gray0, new Mat(), keypoints);
assertEquals(0, keypoints.size());
Mat cross = getCross();
surf.detect(cross, new Mat(), keypoints);
assertEquals(truth.length, keypoints.size());
order(keypoints);
for (int i = 0; i < truth.length; i++)
assertKeyPointEqual(truth[i], (KeyPoint) keypoints.get(i), EPS);
// for(KeyPoint kp : keypoints)
// OpenCVTestRunner.Log(kp.toString());
}
public void testDetectMatMatListOfKeyPointListOfFloat() {
fail("Not yet implemented");
SURF surf = new SURF(8000);
List<KeyPoint> keypoints = new LinkedList<KeyPoint>();
List<Float> descriptors = new LinkedList<Float>();
Mat cross = getCross();
surf.detect(cross, new Mat(), keypoints, descriptors);
assertEquals(truth.length, keypoints.size());
assertEquals(truth.length * surf.descriptorSize(), descriptors.size());
order(keypoints);
for (int i = 0; i < truth.length; i++)
assertKeyPointEqual(truth[i], (KeyPoint) keypoints.get(i), EPS);
float[] _truth = new float[] { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.09548335f, 0.01814415f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.101962745f, 0.009914574f,
0.57075155f, 0.047922116f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0029440068f, -0.011540107f, 0.01814415f,
0.09548335f, 0.08538555f, -0.054076977f, 0.34105155f,
0.47911066f, 0.02339545f, -0.11012388f, 0.08819653f,
0.50863767f, 0.003179069f, -0.019882837f, 0.008947697f,
0.054817006f, -0.0033560959f, -0.0011770058f, 0.0033560959f,
0.0011770058f, 0.019882834f, 0.0031790687f, 0.054817006f,
0.008947698f, 0.0f, 0.0f, 0.0f, 0.0f, -0.0011770058f,
0.0033560959f, 0.0011770058f, 0.0033560959f, 0.0f, 0.0f, 0.0f,
0.0f, 0.011540107f, 0.0029440077f, 0.09548335f, 0.01814415f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.101962745f, 0.009914574f, 0.57075155f,
0.047922116f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.0029440068f, -0.011540107f, 0.01814415f, 0.09548335f,
0.08538555f, -0.054076977f, 0.34105155f, 0.47911066f,
0.02339545f, -0.11012388f, 0.08819653f, 0.50863767f,
0.003179069f, -0.019882837f, 0.008947697f, 0.054817006f,
-0.0033560959f, -0.0011770058f, 0.0033560959f, 0.0011770058f,
0.019882834f, 0.0031790687f, 0.054817006f, 0.008947698f, 0.0f,
0.0f, 0.0f, 0.0f, -0.0011770058f, 0.0033560959f, 0.0011770058f,
0.0033560959f, 0.0f, 0.0f, 0.0f, 0.0f, 0.011540107f,
0.0029440077f, 0.09548335f, 0.01814415f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.101962745f, 0.009914574f, 0.57075155f, 0.047922116f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0029440068f,
-0.011540107f, 0.01814415f, 0.09548335f, 0.08538555f,
-0.054076977f, 0.34105155f, 0.47911066f, 0.02339545f,
-0.11012388f, 0.08819653f, 0.50863767f, 0.003179069f,
-0.019882837f, 0.008947697f, 0.054817006f, -0.0033560959f,
-0.0011770058f, 0.0033560959f, 0.0011770058f, 0.019882834f,
0.0031790687f, 0.054817006f, 0.008947698f, 0.0f, 0.0f, 0.0f,
0.0f, -0.0011770058f, 0.0033560959f, 0.0011770058f,
0.0033560959f, 0.0f, 0.0f, 0.0f, 0.0f, 0.011540107f,
0.0029440077f, 0.09548335f, 0.01814415f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.101962745f, 0.009914574f, 0.57075155f, 0.047922116f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0029440068f,
-0.011540107f, 0.01814415f, 0.09548335f, 0.08538555f,
-0.054076977f, 0.34105155f, 0.47911066f, 0.02339545f,
-0.11012388f, 0.08819653f, 0.50863767f, 0.003179069f,
-0.019882837f, 0.008947697f, 0.054817006f, -0.0033560959f,
-0.0011770058f, 0.0033560959f, 0.0011770058f, 0.019882834f,
0.0031790687f, 0.054817006f, 0.008947698f, 0.0f, 0.0f, 0.0f,
0.0f, -0.0011770058f, 0.0033560959f, 0.0011770058f,
0.0033560959f };
for (int i = 0; i < descriptors.size(); i++)
assertTrue(Math.abs(_truth[i] - (float)descriptors.get(i)) < EPS);
for (KeyPoint kp : keypoints)
OpenCVTestRunner.Log(kp.toString());
OpenCVTestRunner.Log("desc - " + descriptors.size());
String q = "";
for (Float d : descriptors) {
if (Math.abs(d) < EPS)
d = 0f;
q += ", " + d + "f";
}
q = q.substring(2);
OpenCVTestRunner.Log("[" + q + "]");
}
public void testDetectMatMatListOfKeyPointListOfFloatBoolean() {
fail("Not yet implemented");
SURF surf = new SURF(8000);
List<KeyPoint> keypoints = new LinkedList<KeyPoint>();
List<Float> descriptors = new LinkedList<Float>();
keypoints.add(truth[0]);
//keypoints.add(truth[1]);
//keypoints.add(truth[2]);
//keypoints.add(truth[3]);
//assertEquals(1, keypoints.size());
Mat cross = getCross();
surf.detect(cross, new Mat(), keypoints, descriptors, true);
assertEquals(1, keypoints.size());
assertEquals(surf.descriptorSize(), descriptors.size());
for (KeyPoint kp : keypoints)
OpenCVTestRunner.Log(kp.toString());
OpenCVTestRunner.Log("desc - " + descriptors.size());
String q = "";
for (Float d : descriptors) {
if (Math.abs(d) < EPS)
d = 0f;
q += ", " + d + "f";
}
q = q.substring(2);
OpenCVTestRunner.Log("[" + q + "]");
}
public void testSURF() {
surf = new SURF();
assertTrue(null != surf);
SURF surf = new SURF();
assertNotNull(surf);
}
public void testSURFDouble() {
surf = new SURF(500.0);
assertTrue(null != surf);
SURF surf = new SURF(500.0);
assertNotNull(surf);
}
public void testSURFDoubleInt() {
surf = new SURF(500.0, 4);
assertTrue(null != surf);
SURF surf = new SURF(500.0, 4);
assertNotNull(surf);
}
public void testSURFDoubleIntInt() {
surf = new SURF(500.0, 4, 2);
assertTrue(null != surf);
SURF surf = new SURF(500.0, 4, 2);
assertNotNull(surf);
}
public void testSURFDoubleIntIntBoolean() {
SURF surf = new SURF(500.0, 4, 2, false);
assertNotNull(surf);
}
public void testSURFDoubleIntIntBooleanBoolean() {
surf = new SURF(500.0, 4, 2, false, false);
assertTrue(null != surf);
SURF surf = new SURF(500.0, 4, 2, false, false);
assertNotNull(surf);
}
}

13
modules/java/android_test/src/org/opencv/test/imgproc/imgprocTest.java
Unescape View File

@ -801,6 +801,19 @@ public class imgprocTest extends OpenCVTestCase {
assertMatEqual(mask.submat(1, matSize+1, 1, matSize+1), img);
}
public void testFloodFillMatMatPointScalar_WithoutMask() {
Mat img = gray0;
Core.circle(img, new Point(matSize / 2, matSize / 2), 3, new Scalar(2));
//TODO: ideally we should pass null instead of "new Mat()"
int retval = Imgproc.floodFill(img, new Mat(), new Point(matSize / 2, matSize / 2), new Scalar(1));
Core.circle(img, new Point(matSize / 2, matSize / 2), 3, new Scalar(0));
assertEquals(Core.countNonZero(img), retval);
}
public void testFloodFillMatMatPointScalarRect() {
fail("Not yet implemented");
}

Write Preview
Loading…
Cancel
Save