Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
2561c596
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
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,体验更适合开发者的 AI 搜索 >>
提交
2561c596
编写于
4月 06, 2017
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8524 from mshabunin:java-fixes
上级
fd93ae08
4d62f1de
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
61 addition
and
7 deletion
+61
-7
modules/core/misc/java/src/java/core+DMatch.java
modules/core/misc/java/src/java/core+DMatch.java
+0
-3
modules/java/CMakeLists.txt
modules/java/CMakeLists.txt
+1
-1
modules/java/build.xml.in
modules/java/build.xml.in
+16
-1
modules/java/generator/gen_java.py
modules/java/generator/gen_java.py
+2
-2
modules/ml/misc/java/test/MLTest.java
modules/ml/misc/java/test/MLTest.java
+42
-0
未找到文件。
modules/core/misc/java/src/java/core+DMatch.java
浏览文件 @
2561c596
...
...
@@ -45,9 +45,6 @@ public class DMatch {
distance
=
_distance
;
}
/**
* Less is better.
*/
public
boolean
lessThan
(
DMatch
it
)
{
return
distance
<
it
.
distance
;
}
...
...
modules/java/CMakeLists.txt
浏览文件 @
2561c596
...
...
@@ -345,7 +345,7 @@ else(ANDROID)
list
(
APPEND step3_depends
"
${
OpenCV_BINARY_DIR
}
/build.xml"
)
add_custom_command
(
OUTPUT
"
${
JAR_FILE
}
"
"
${
JAR_FILE
}
.dephelper"
COMMAND
${
ANT_EXECUTABLE
}
-q -noinput -k jar
COMMAND
${
ANT_EXECUTABLE
}
-q -noinput -k jar
javadoc
COMMAND
${
CMAKE_COMMAND
}
-E touch
"
${
JAR_FILE
}
.dephelper"
WORKING_DIRECTORY
"
${
OpenCV_BINARY_DIR
}
"
DEPENDS
${
step3_depends
}
...
...
modules/java/build.xml.in
浏览文件 @
2561c596
...
...
@@ -2,6 +2,7 @@
<!-- process, this config is used to package the autogenerated .java -->
<!-- interface files into OpenCV.jar -->
<project name="OpenCV">
<target name="jar">
<!-- This is to make a jar with a source attachment, for e.g. easy -->
<!-- navigation in Eclipse. See this question: -->
...
...
@@ -10,7 +11,21 @@
<include name="**/*.java"/>
<compilerarg line="-encoding utf-8"/>
</javac>
<jar basedir="src" destfile="bin/@JAR_NAME@"/>
</target>
<target name="javadoc">
<tstamp>
<format property="doctimestamp" pattern="EEE MMM d yyyy HH:mm:ss z"/>
</tstamp>
<javadoc
packagenames="org.opencv.*"
sourcepath="src"
destdir="doc/javadoc"
Windowtitle="OpenCV @OPENCV_VERSION_PLAIN@ Java documentation"
Doctitle="OpenCV Java documentation (@OPENCV_VERSION@)"
bottom="Generated on ${doctimestamp} / OpenCV @OPENCV_VCSVERSION@"
/>
</target>
</project>
modules/java/generator/gen_java.py
浏览文件 @
2561c596
...
...
@@ -1005,7 +1005,7 @@ class JavaWrapperGenerator(object):
type_dict
[
"Ptr_"
+
name
]
=
\
{
"j_type"
:
classinfo
.
jname
,
"jn_type"
:
"long"
,
"jn_args"
:
((
"__int64"
,
".nativeObj"
),),
"jni_name"
:
"
Ptr<"
+
classinfo
.
fullName
(
isCPP
=
True
)
+
">(("
+
classinfo
.
fullName
(
isCPP
=
True
)
+
"
*)%(n)s_nativeObj)"
,
"jni_type"
:
"jlong"
,
"jni_name"
:
"
*((Ptr<"
+
classinfo
.
fullName
(
isCPP
=
True
)
+
">
*)%(n)s_nativeObj)"
,
"jni_type"
:
"jlong"
,
"suffix"
:
"J"
}
logging
.
info
(
'ok: class %s, name: %s, base: %s'
,
classinfo
,
name
,
classinfo
.
base
)
...
...
@@ -1575,7 +1575,7 @@ JNIEXPORT void JNICALL Java_org_opencv_%(module)s_%(j_cls)s_delete
# if parents are smart (we hope) then children are!
# if not we believe the class is smart if it has "create" method
ci
.
smart
=
False
if
ci
.
base
:
if
ci
.
base
or
ci
.
name
==
'Algorithm'
:
ci
.
smart
=
True
else
:
for
fi
in
ci
.
methods
:
...
...
modules/ml/misc/java/test/MLTest.java
0 → 100644
浏览文件 @
2561c596
package
org.opencv.test.ml
;
import
org.opencv.ml.Ml
;
import
org.opencv.ml.SVM
;
import
org.opencv.core.Mat
;
import
org.opencv.core.MatOfFloat
;
import
org.opencv.core.MatOfInt
;
import
org.opencv.core.CvType
;
import
org.opencv.test.OpenCVTestCase
;
import
org.opencv.test.OpenCVTestRunner
;
public
class
MLTest
extends
OpenCVTestCase
{
public
void
testSaveLoad
()
{
Mat
samples
=
new
MatOfFloat
(
new
float
[]
{
5.1f
,
3.5f
,
1.4f
,
0.2f
,
4.9f
,
3.0f
,
1.4f
,
0.2f
,
4.7f
,
3.2f
,
1.3f
,
0.2f
,
4.6f
,
3.1f
,
1.5f
,
0.2f
,
5.0f
,
3.6f
,
1.4f
,
0.2f
,
7.0f
,
3.2f
,
4.7f
,
1.4f
,
6.4f
,
3.2f
,
4.5f
,
1.5f
,
6.9f
,
3.1f
,
4.9f
,
1.5f
,
5.5f
,
2.3f
,
4.0f
,
1.3f
,
6.5f
,
2.8f
,
4.6f
,
1.5f
}).
reshape
(
1
,
10
);
Mat
responses
=
new
MatOfInt
(
new
int
[]
{
0
,
0
,
0
,
0
,
0
,
1
,
1
,
1
,
1
,
1
}).
reshape
(
1
,
10
);
SVM
saved
=
SVM
.
create
();
assertFalse
(
saved
.
isTrained
());
saved
.
train
(
samples
,
Ml
.
ROW_SAMPLE
,
responses
);
assertTrue
(
saved
.
isTrained
());
String
filename
=
OpenCVTestRunner
.
getTempFileName
(
"yml"
);
saved
.
save
(
filename
);
SVM
loaded
=
SVM
.
load
(
filename
);
assertTrue
(
saved
.
isTrained
());
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录