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

java tests: avoided copy and paste

Browse Source
This commit is contained in:
Kirill Kornyakov 2011-07-16 07:26:13 +00:00
parent 8f41b2b23b
commit 30f265a16a
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,26 +103,14 @@ public class OpenCVTestCase extends TestCase {
}
public static void assertMatEqual(Mat m1, Mat m2) {
//OpenCVTestRunner.Log(m1.toString());
//OpenCVTestRunner.Log(m2.toString());
if (!m1.type().equals(m2.type()) ||
m1.cols() != m2.cols() || m1.rows() != m2.rows()) {
throw new UnsupportedOperationException();
}
else if (m1.channels() == 1) {
assertTrue(CalcPercentageOfDifference(m1, m2) == 0.0);
}
else {
for (int coi = 0; coi < m1.channels(); coi++) {
Mat m1c = getCOI(m1, coi);
Mat m2c = getCOI(m2, coi);
assertTrue(CalcPercentageOfDifference(m1c, m2c) == 0.0);
}
}
compareMats(m1, m2, true);
}
public static void assertMatNotEqual(Mat m1, Mat m2) { //TODO: copypasta (see above)
public static void assertMatNotEqual(Mat m1, Mat m2) {
compareMats(m1, m2, false);
}
static private void compareMats(Mat m1, Mat m2, boolean isEqualityMeasured) {
//OpenCVTestRunner.Log(m1.toString());
//OpenCVTestRunner.Log(m2.toString());
@ -131,13 +119,23 @@ public class OpenCVTestCase extends TestCase {
throw new UnsupportedOperationException();
}
else if (m1.channels() == 1) {
assertTrue(CalcPercentageOfDifference(m1, m2) != 0.0);
if (isEqualityMeasured) {
assertTrue(CalcPercentageOfDifference(m1, m2) == 0.0);
}
else {
assertTrue(CalcPercentageOfDifference(m1, m2) != 0.0);
}
}
else {
for (int coi = 0; coi < m1.channels(); coi++) {
Mat m1c = getCOI(m1, coi);
Mat m2c = getCOI(m2, coi);
assertTrue(CalcPercentageOfDifference(m1c, m2c) != 0.0);
if (isEqualityMeasured) {
assertTrue(CalcPercentageOfDifference(m1c, m2c) == 0.0);
}
else {
assertTrue(CalcPercentageOfDifference(m1c, m2c) != 0.0);
}
}
}
}
@ -158,10 +156,10 @@ public class OpenCVTestCase extends TestCase {
static private double CalcPercentageOfDifference(Mat m1, Mat m2) {
Mat cmp = new Mat(0, 0, CvType.CV_8U);
core.compare(m1, m2, cmp, core.CMP_EQ);
double num = 100.0 *
double difference = 100.0 *
(1.0 - Double.valueOf(core.countNonZero(cmp)) / Double.valueOf(cmp.rows() * cmp.cols()));
return num;
return difference;
}
public void test_1(String label) {