Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c49b1bc6
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c49b1bc6
编写于
12月 28, 2012
作者:
A
Andrey Pavlenko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
partial fix for failing tests; fix for Windows launcher script; more quiet output
上级
ad326cb0
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
17 addition
and
56 deletion
+17
-56
modules/java/android_test/src/org/opencv/test/core/TermCriteriaTest.java
...droid_test/src/org/opencv/test/core/TermCriteriaTest.java
+1
-1
modules/java/android_test/src/org/opencv/test/features2d/BRIEFDescriptorExtractorTest.java
.../opencv/test/features2d/BRIEFDescriptorExtractorTest.java
+1
-2
modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java
...encv/test/features2d/BruteForceDescriptorMatcherTest.java
+1
-2
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingDescriptorMatcherTest.java
...st/features2d/BruteForceHammingDescriptorMatcherTest.java
+1
-1
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingLUTDescriptorMatcherTest.java
...features2d/BruteForceHammingLUTDescriptorMatcherTest.java
+1
-1
modules/java/android_test/src/org/opencv/test/features2d/BruteForceL1DescriptorMatcherTest.java
...cv/test/features2d/BruteForceL1DescriptorMatcherTest.java
+1
-1
modules/java/android_test/src/org/opencv/test/features2d/BruteForceSL2DescriptorMatcherTest.java
...v/test/features2d/BruteForceSL2DescriptorMatcherTest.java
+1
-2
modules/java/android_test/src/org/opencv/test/features2d/FASTFeatureDetectorTest.java
...c/org/opencv/test/features2d/FASTFeatureDetectorTest.java
+1
-3
modules/java/android_test/src/org/opencv/test/features2d/FlannBasedDescriptorMatcherTest.java
...encv/test/features2d/FlannBasedDescriptorMatcherTest.java
+1
-3
modules/java/android_test/src/org/opencv/test/features2d/ORBDescriptorExtractorTest.java
...rg/opencv/test/features2d/ORBDescriptorExtractorTest.java
+1
-2
modules/java/android_test/src/org/opencv/test/features2d/SIFTDescriptorExtractorTest.java
...g/opencv/test/features2d/SIFTDescriptorExtractorTest.java
+1
-2
modules/java/android_test/src/org/opencv/test/features2d/STARFeatureDetectorTest.java
...c/org/opencv/test/features2d/STARFeatureDetectorTest.java
+1
-15
modules/java/android_test/src/org/opencv/test/features2d/SURFDescriptorExtractorTest.java
...g/opencv/test/features2d/SURFDescriptorExtractorTest.java
+1
-2
modules/java/android_test/src/org/opencv/test/features2d/SURFFeatureDetectorTest.java
...c/org/opencv/test/features2d/SURFFeatureDetectorTest.java
+1
-4
modules/java/java_test/CMakeLists.txt
modules/java/java_test/CMakeLists.txt
+2
-2
modules/java/java_test/build.xml
modules/java/java_test/build.xml
+1
-13
未找到文件。
modules/java/android_test/src/org/opencv/test/core/TermCriteriaTest.java
浏览文件 @
c49b1bc6
...
...
@@ -77,7 +77,7 @@ public class TermCriteriaTest extends OpenCVTestCase {
public
void
testToString
()
{
String
actual
=
tc2
.
toString
();
String
expected
=
"{ type: 2, maxCount: 4, epsilon:
0.001
}"
;
String
expected
=
"{ type: 2, maxCount: 4, epsilon:
"
+
EPS
+
"
}"
;
assertEquals
(
expected
,
actual
);
}
...
...
modules/java/android_test/src/org/opencv/test/features2d/BRIEFDescriptorExtractorTest.java
浏览文件 @
c49b1bc6
...
...
@@ -26,10 +26,9 @@ public class BRIEFDescriptorExtractorTest extends OpenCVTestCase {
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
extractor
=
DescriptorExtractor
.
create
(
DescriptorExtractor
.
BRIEF
);
matSize
=
100
;
super
.
setUp
();
}
public
void
testComputeListOfMatListOfListOfKeyPointListOfMat
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java
浏览文件 @
c49b1bc6
...
...
@@ -80,6 +80,7 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
}
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
matcher
=
DescriptorMatcher
.
create
(
DescriptorMatcher
.
BRUTEFORCE
);
matSize
=
100
;
...
...
@@ -90,8 +91,6 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
new
DMatch
(
3
,
1
,
0
,
0.48435235f
),
new
DMatch
(
4
,
0
,
0
,
1.0836693f
)
};
super
.
setUp
();
}
public
void
testAdd
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingDescriptorMatcherTest.java
浏览文件 @
c49b1bc6
...
...
@@ -65,6 +65,7 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
}
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
matcher
=
DescriptorMatcher
.
create
(
DescriptorMatcher
.
BRUTEFORCE_HAMMING
);
matSize
=
100
;
...
...
@@ -73,7 +74,6 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
new
DMatch
(
1
,
2
,
0
,
42
),
new
DMatch
(
2
,
1
,
0
,
40
),
new
DMatch
(
3
,
3
,
0
,
53
)
};
super
.
setUp
();
}
public
void
testAdd
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingLUTDescriptorMatcherTest.java
浏览文件 @
c49b1bc6
...
...
@@ -65,6 +65,7 @@ public class BruteForceHammingLUTDescriptorMatcherTest extends OpenCVTestCase {
}
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
matcher
=
DescriptorMatcher
.
create
(
DescriptorMatcher
.
BRUTEFORCE_HAMMINGLUT
);
matSize
=
100
;
...
...
@@ -73,7 +74,6 @@ public class BruteForceHammingLUTDescriptorMatcherTest extends OpenCVTestCase {
new
DMatch
(
1
,
2
,
0
,
42
),
new
DMatch
(
2
,
1
,
0
,
40
),
new
DMatch
(
3
,
3
,
0
,
53
)
};
super
.
setUp
();
}
public
void
testAdd
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/BruteForceL1DescriptorMatcherTest.java
浏览文件 @
c49b1bc6
...
...
@@ -80,6 +80,7 @@ public class BruteForceL1DescriptorMatcherTest extends OpenCVTestCase {
}
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
matcher
=
DescriptorMatcher
.
create
(
DescriptorMatcher
.
BRUTEFORCE_L1
);
matSize
=
100
;
...
...
@@ -90,7 +91,6 @@ public class BruteForceL1DescriptorMatcherTest extends OpenCVTestCase {
new
DMatch
(
3
,
1
,
0
,
2.6545324f
),
new
DMatch
(
4
,
0
,
0
,
6.1294870f
)
};
super
.
setUp
();
}
public
void
testAdd
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/BruteForceSL2DescriptorMatcherTest.java
浏览文件 @
c49b1bc6
...
...
@@ -85,6 +85,7 @@ public class BruteForceSL2DescriptorMatcherTest extends OpenCVTestCase {
}
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
matcher
=
DescriptorMatcher
.
create
(
DescriptorMatcher
.
BRUTEFORCE_SL2
);
matSize
=
100
;
...
...
@@ -95,8 +96,6 @@ public class BruteForceSL2DescriptorMatcherTest extends OpenCVTestCase {
new
DMatch
(
3
,
1
,
0
,
0.23459719f
),
new
DMatch
(
4
,
0
,
0
,
1.174339f
)
};
super
.
setUp
();
}
public
void
testAdd
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/FASTFeatureDetectorTest.java
浏览文件 @
c49b1bc6
...
...
@@ -33,12 +33,10 @@ public class FASTFeatureDetectorTest extends OpenCVTestCase {
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
detector
=
FeatureDetector
.
create
(
FeatureDetector
.
FAST
);
truth
=
new
KeyPoint
[]
{
new
KeyPoint
(
32
,
27
,
7
,
-
1
,
254
,
0
,
-
1
),
new
KeyPoint
(
27
,
32
,
7
,
-
1
,
254
,
0
,
-
1
),
new
KeyPoint
(
73
,
68
,
7
,
-
1
,
254
,
0
,
-
1
),
new
KeyPoint
(
68
,
73
,
7
,
-
1
,
254
,
0
,
-
1
)
};
super
.
setUp
();
}
public
void
testCreate
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/FlannBasedDescriptorMatcherTest.java
浏览文件 @
c49b1bc6
...
...
@@ -154,9 +154,9 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
}
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
matcher
=
DescriptorMatcher
.
create
(
DescriptorMatcher
.
FLANNBASED
);
matSize
=
100
;
truth
=
new
DMatch
[]
{
new
DMatch
(
0
,
0
,
0
,
1.049694f
),
new
DMatch
(
1
,
0
,
0
,
1.0984558f
),
...
...
@@ -164,8 +164,6 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
new
DMatch
(
3
,
1
,
0
,
0.48435235f
),
new
DMatch
(
4
,
0
,
0
,
1.0836693f
)
};
super
.
setUp
();
}
public
void
testAdd
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/ORBDescriptorExtractorTest.java
浏览文件 @
c49b1bc6
...
...
@@ -31,10 +31,9 @@ public class ORBDescriptorExtractorTest extends OpenCVTestCase {
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
extractor
=
DescriptorExtractor
.
create
(
DescriptorExtractor
.
ORB
);
matSize
=
100
;
super
.
setUp
();
}
public
void
testComputeListOfMatListOfListOfKeyPointListOfMat
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/SIFTDescriptorExtractorTest.java
浏览文件 @
c49b1bc6
...
...
@@ -28,6 +28,7 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase {
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
extractor
=
DescriptorExtractor
.
create
(
DescriptorExtractor
.
SIFT
);
keypoint
=
new
KeyPoint
(
55.775577545166016f
,
44.224422454833984f
,
16
,
9.754629f
,
8617.863f
,
1
,
-
1
);
matSize
=
100
;
...
...
@@ -44,8 +45,6 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase {
);
}
};
super
.
setUp
();
}
public
void
testComputeListOfMatListOfListOfKeyPointListOfMat
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/STARFeatureDetectorTest.java
浏览文件 @
c49b1bc6
...
...
@@ -42,22 +42,10 @@ public class STARFeatureDetectorTest extends OpenCVTestCase {
}
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
detector
=
FeatureDetector
.
create
(
FeatureDetector
.
STAR
);
matSize
=
200
;
truth
=
new
KeyPoint
[]
{
/*
new KeyPoint(95, 80, 22, -1, 31.595734f, 0, -1),
new KeyPoint(105, 80, 22, -1, 31.595734f, 0, -1),
new KeyPoint(80, 95, 22, -1, 31.595734f, 0, -1),
new KeyPoint(120, 95, 22, -1, 31.595734f, 0, -1),
new KeyPoint(100, 100, 8, -1, -219.90825f, 0, -1),
new KeyPoint(80, 105, 22, -1, 31.595734f, 0, -1),
new KeyPoint(120, 105, 22, -1, 31.595734f, 0, -1),
new KeyPoint(95, 120, 22, -1, 31.595734f, 0, -1),
new KeyPoint(105, 120, 22, -1, 31.595734f, 0, -1)
*/
new
KeyPoint
(
95
,
80
,
22
,
-
1
,
31.5957f
,
0
,
-
1
),
new
KeyPoint
(
105
,
80
,
22
,
-
1
,
31.5957f
,
0
,
-
1
),
new
KeyPoint
(
80
,
95
,
22
,
-
1
,
31.5957f
,
0
,
-
1
),
...
...
@@ -68,8 +56,6 @@ public class STARFeatureDetectorTest extends OpenCVTestCase {
new
KeyPoint
(
95
,
120
,
22
,
-
1
,
31.5957f
,
0
,
-
1
),
new
KeyPoint
(
105
,
120
,
22
,
-
1
,
31.5957f
,
0
,
-
1
)
};
super
.
setUp
();
}
public
void
testCreate
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/SURFDescriptorExtractorTest.java
浏览文件 @
c49b1bc6
...
...
@@ -26,10 +26,9 @@ public class SURFDescriptorExtractorTest extends OpenCVTestCase {
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
extractor
=
DescriptorExtractor
.
create
(
DescriptorExtractor
.
SURF
);
matSize
=
100
;
super
.
setUp
();
}
public
void
testComputeListOfMatListOfListOfKeyPointListOfMat
()
{
...
...
modules/java/android_test/src/org/opencv/test/features2d/SURFFeatureDetectorTest.java
浏览文件 @
c49b1bc6
...
...
@@ -52,18 +52,15 @@ public class SURFFeatureDetectorTest extends OpenCVTestCase {
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
detector
=
FeatureDetector
.
create
(
FeatureDetector
.
SURF
);
matSize
=
100
;
truth
=
new
KeyPoint
[]
{
new
KeyPoint
(
55.775578f
,
55.775578f
,
16
,
80.245735f
,
8617.8633f
,
0
,
-
1
),
new
KeyPoint
(
44.224422f
,
55.775578f
,
16
,
170.24574f
,
8617.8633f
,
0
,
-
1
),
new
KeyPoint
(
44.224422f
,
44.224422f
,
16
,
260.24573f
,
8617.8633f
,
0
,
-
1
),
new
KeyPoint
(
55.775578f
,
44.224422f
,
16
,
350.24573f
,
8617.8633f
,
0
,
-
1
)
};
super
.
setUp
();
}
public
void
testCreate
()
{
...
...
modules/java/java_test/CMakeLists.txt
浏览文件 @
c49b1bc6
...
...
@@ -70,8 +70,8 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" DESTINATION "${opencv_test_jav
# Create a script for running the Java tests and place it in build/bin.
if
(
WIN32
)
file
(
WRITE
"
${
CMAKE_BINARY_DIR
}
/bin/opencv_test_java.cmd"
"cd
${
opencv_test_java_bin_dir
}
\n
set path=
${
EXECUTABLE_OUTPUT_PATH
}
;%path
%
\n
ant -DjavaLibraryPath=
${
EXECUTABLE_OUTPUT_PATH
}
/Release buildAndTest"
)
file
(
WRITE
"
${
CMAKE_BINARY_DIR
}
/bin/opencv_test_java_D.cmd"
"cd
${
opencv_test_java_bin_dir
}
\n
set
path=
${
EXECUTABLE_OUTPUT_PATH
}
;%path%
\n
ant -DjavaLibraryPath=
${
EXECUTABLE_OUTPUT_PATH
}
/Debug
buildAndTest"
)
file
(
WRITE
"
${
CMAKE_BINARY_DIR
}
/bin/opencv_test_java.cmd"
"cd
${
opencv_test_java_bin_dir
}
\n
set PATH=
${
EXECUTABLE_OUTPUT_PATH
}
/Release;%PATH
%
\n
ant -DjavaLibraryPath=
${
EXECUTABLE_OUTPUT_PATH
}
/Release buildAndTest"
)
file
(
WRITE
"
${
CMAKE_BINARY_DIR
}
/bin/opencv_test_java_D.cmd"
"cd
${
opencv_test_java_bin_dir
}
\n
set
PATH=
${
EXECUTABLE_OUTPUT_PATH
}
/Debug;%PATH%
\n
ant -DjavaLibraryPath=
${
EXECUTABLE_OUTPUT_PATH
}
/Debug
buildAndTest"
)
else
()
file
(
WRITE
"
${
CMAKE_BINARY_DIR
}
/bin/opencv_test_java.sh"
"cd
${
opencv_test_java_bin_dir
}
;
\n
ant -DjavaLibraryPath=
${
LIBRARY_OUTPUT_PATH
}
buildAndTest;
\n
cd -"
)
endif
()
...
...
modules/java/java_test/build.xml
浏览文件 @
c49b1bc6
...
...
@@ -31,21 +31,9 @@
</jar>
</target>
<!-- <target name="run" > -->
<!-- <java fork="true" classname="org.opencv.test.OpenCVTestRunner"> -->
<!-- <sysproperty key="java.library.path" path="${javaLibraryPath}"/> -->
<!-- <classpath refid="master-classpath"/> -->
<!-- <classpath> -->
<!-- <fileset dir="build/jar"> -->
<!-- <include name="*.jar"/> -->
<!-- </fileset> -->
<!-- </classpath> -->
<!-- </java> -->
<!-- </target> -->
<target
name=
"test"
>
<mkdir
dir=
"testResults"
/>
<junit
printsummary=
"
yes"
haltonfailure=
"false
"
>
<junit
printsummary=
"
false"
haltonfailure=
"false"
haltonerror=
"false"
showoutput=
"false"
logfailedtests=
"true"
maxmemory=
"256m
"
>
<sysproperty
key=
"java.library.path"
path=
"${javaLibraryPath}"
/>
<classpath
refid=
"master-classpath"
/>
<classpath>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录