Skip to content

merge #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Joeliqq wants to merge 16 commits into
base: master
Choose a base branch
from
Open

merge #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
095e5f2
change
Jun 1, 2015
6b3d383
增加了专门用于删除非推理结果的三元组的功能
gibeon Jun 7, 2015
147f659
更新后，执行OWLHorstJustification的时候在最后加一个参数--clearoriginals，应该可以删除那些不用的三元组。
gibeon Jun 7, 2015
3017472
72
Jul 2, 2015
c484119
添加了CassandraDB.getRowCountAccordingInferredSteps()，以及修改了MapReduceReas…
gibeon Jul 12, 2015
3140962
add a new field "transitivelevel" for table justification
gibeon Jul 15, 2015
4061c83
增加了inferredsteps和transitivelevel索引的创建
gibeon Jul 15, 2015
0ecd6b8
Revert "鏇存柊鍚庯紝鎵ц?孫WLHorstJustification鐨勬椂鍊欏湪鏈€鍚庡姞涓€涓?鍙傛暟--clearorigin…
Dec 10, 2015
8dcecf0
Signed-off-by: Joe <[email protected]>
Dec 10, 2015
b24c8b4
changed by wu
Dec 12, 2015
5a2c270
shouldn't changed
Dec 13, 2015
9b3e690
Change the result
Dec 22, 2015
3c36fd5
step1 写入值
Dec 24, 2015
29a6106
表结构：
Jan 10, 2016
5c26cd8
Signed-off-by: Joe <[email protected]>
Jul 14, 2016
2efb201
完成 推理和选择
Jul 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions mrj-0.1/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ReasonMapreduce"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/cassandra-2.1.2"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/hadoop-0.20.x"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/DataStax"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/ReasonMapreduce"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/DataStax"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/hadoop 0.2"/>
<classpathentry kind="lib" path="E:/workfile/hadoop-0.20.3-dev-core.jar" sourcepath="E:/workfile/hadoop-0.20.2_Writable2Object_source_build/hadoop-0.20.2_Writable2Object_source"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/cassandra 2.1.10"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/javadriver 2.1.7.1"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 2 additions & 0 deletions mrj-0.1/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/bin
/bin/
1 change: 1 addition & 0 deletions mrj-0.1/.idea/.name
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions mrj-0.1/.idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions mrj-0.1/.idea/copyright/profiles_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions mrj-0.1/.idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

178 changes: 178 additions & 0 deletions mrj-0.1/.idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions mrj-0.1/.idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions mrj-0.1/.idea/scopes/scope_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions mrj-0.1/.idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading