Menu
▾
▴
dl-learner-svn — DL-Learner Subversion commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(120) |
Sep
(36) |
Oct
(116) |
Nov
(17) |
Dec
(44) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(143) |
Feb
(192) |
Mar
(74) |
Apr
(84) |
May
(105) |
Jun
(64) |
Jul
(49) |
Aug
(120) |
Sep
(159) |
Oct
(156) |
Nov
(51) |
Dec
(28) |
| 2009 |
Jan
(17) |
Feb
(55) |
Mar
(33) |
Apr
(57) |
May
(54) |
Jun
(28) |
Jul
(6) |
Aug
(16) |
Sep
(38) |
Oct
(30) |
Nov
(26) |
Dec
(52) |
| 2010 |
Jan
(7) |
Feb
(91) |
Mar
(65) |
Apr
(2) |
May
(14) |
Jun
(25) |
Jul
(38) |
Aug
(48) |
Sep
(80) |
Oct
(70) |
Nov
(75) |
Dec
(77) |
| 2011 |
Jan
(68) |
Feb
(53) |
Mar
(51) |
Apr
(35) |
May
(65) |
Jun
(101) |
Jul
(29) |
Aug
(230) |
Sep
(95) |
Oct
(49) |
Nov
(110) |
Dec
(63) |
| 2012 |
Jan
(41) |
Feb
(42) |
Mar
(25) |
Apr
(46) |
May
(51) |
Jun
(44) |
Jul
(45) |
Aug
(29) |
Sep
(12) |
Oct
(9) |
Nov
(17) |
Dec
(2) |
| 2013 |
Jan
(12) |
Feb
(14) |
Mar
(7) |
Apr
(16) |
May
(54) |
Jun
(27) |
Jul
(11) |
Aug
(5) |
Sep
(85) |
Oct
(27) |
Nov
(37) |
Dec
(32) |
| 2014 |
Jan
(8) |
Feb
(29) |
Mar
(5) |
Apr
(3) |
May
(22) |
Jun
(3) |
Jul
(4) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ku...@us...> - 2007-08-28 10:44:04
|
Revision: 78
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=78&view=rev
Author: kurzum
Date: 2007-08-28 03:44:01 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
minor changes build.xml
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-08-28 10:33:11 UTC (rev 77)
+++ trunk/build.xml 2007-08-28 10:44:01 UTC (rev 78)
@@ -164,7 +164,8 @@
<target name="createScripts" >
<pathconvert refid="classpath" property="pathString"/>
- <echo message="${pathString}"/>
+ <echo file="bin/test.bat" message="java -cp ${pathString} org.dllearner.QuickStart"/>
+ <property name="kaon2" value="${lib_dir}/kaon2.jar"/>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ku...@us...> - 2007-08-28 10:33:13
|
Revision: 77
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=77&view=rev
Author: kurzum
Date: 2007-08-28 03:33:11 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
changed all paths to dynamic and system independent
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-08-28 08:45:40 UTC (rev 76)
+++ trunk/build.xml 2007-08-28 10:33:11 UTC (rev 77)
@@ -13,23 +13,31 @@
<property name="release_tmp_dir" value="release/${version_dir}" />
<property name="release_php_client_tmp_dir" value="release/php-client-${today}" />
+
<property name="kaon2" value="${lib_dir}/kaon2.jar"/>
<property name="xbean" value="${lib_dir}/xbean.jar"/>
<property name="dig1.1_xmlbeans" value="${lib_dir}/dig1.1-xmlbeans.jar"/>
+ <property name="sparql" value="${lib_dir}/modules/sparqlModule.jar"/>
+
<property name="jena" value="${lib_dir}/jena/jena.jar"/>
+
+ <property name="owlapi-api" value="${lib_dir}/owlapi/owlapi-api.jar"/>
+ <property name="owlapi-apibinding" value="${lib_dir}/owlapi/owlapi-apibinding.jar"/>
+ <property name="owlapi-dig1_1" value="${lib_dir}/owlapi/owlapi-dig1_1.jar"/>
<!-- setup classpath -->
- <path id="classpath">
- <pathelement location="."/>
- <pathelement location="${kaon2}"/>
- <pathelement location="${xbean}"/>
- <pathelement location="${dig1.1_xmlbeans}"/>
- <pathelement location="${jena}"/>
- <pathelement location="${lib_dir}/owlapi/owlapi-api.jar"/>
- <pathelement location="${lib_dir}/owlapi/owlapi-apibinding.jar"/>
- <pathelement location="${lib_dir}/owlapi/owlapi-dig1_1.jar"/>
- </path>
+
+ <path id="classpath">
+ <pathelement location="."/>
+ <fileset dir="${lib_dir}">
+ <include name="**/*.jar"/>
+ <include name="**/modules/*.jar"/>
+ <include name="**/jena/*.jar"/>
+ <include name="**/owlapi/*.jar"/>
+ </fileset>
+ </path>
+
<!-- build target -->
<target name="build">
@@ -136,30 +144,37 @@
<delete dir="release" />
</target>
- <target name="wsgen_windows" >
- <exec dir="${source_dir}" executable="wsgen">
+ <target name="wsgen" >
+ <path id="wsgen">
+ <path refid="classpath"/>
+ <path location="${class_dir}"/>
+ </path>
+ <pathconvert refid="wsgen" property="wsgenpath"/>
+ <exec dir="${source_dir}" executable="wsgen">
<arg value="-keep"/>
<arg value="-verbose"/>
<arg value="-cp"/>
- <arg value=".;../../classes;../../library/dig1.1-xmlbeans.jar;../../library/kaon2.jar;../../library/xbean.jar;../../library/owlapi/;../../library/owlapi/antlr-runtime-3.0.jar;../../library/owlapi/commons-lang-2.2.jar;../../library/owlapi/owlapi-api.jar;../../library/owlapi/owlapi-apibinding.jar;../../library/owlapi/owlapi-change.jar;../../library/owlapi/owlapi-debugging.jar;../../library/owlapi/owlapi-dig1_1.jar;../../library/owlapi/owlapi-functionalparser.jar;../../library/owlapi/owlapi-functionalrenderer.jar;../../library/owlapi/owlapi-impl.jar;../../library/owlapi/owlapi-krssparser.jar;../../library/owlapi/owlapi-mansyntaxparser.jar;../../library/owlapi/owlapi-mansyntaxrenderer.jar;../../library/owlapi/owlapi-metrics.jar;../../library/owlapi/owlapi-oboparser.jar;../../library/owlapi/owlapi-owlxmlparser.jar;../../library/owlapi/owlapi-owlxmlrenderer.jar;../../library/owlapi/owlapi-rdfapi.jar;../../library/owlapi/owlapi-rdfxmlparser.jar;../../library/owlapi/owlapi-rdfxmlrenderer.jar;../../library/owlapi/owlapi-util.jar"/>
+ <arg value="${wsgenpath}"/>
+ <!--<arg value=".;../../classes;../../library/dig1.1-xmlbeans.jar;../../library/kaon2.jar;../../library/xbean.jar;../../library/owlapi/;../../library/owlapi/antlr-runtime-3.0.jar;../../library/owlapi/commons-lang-2.2.jar;../../library/owlapi/owlapi-api.jar;../../library/owlapi/owlapi-apibinding.jar;../../library/owlapi/owlapi-change.jar;../../library/owlapi/owlapi-debugging.jar;../../library/owlapi/owlapi-dig1_1.jar;../../library/owlapi/owlapi-functionalparser.jar;../../library/owlapi/owlapi-functionalrenderer.jar;../../library/owlapi/owlapi-impl.jar;../../library/owlapi/owlapi-krssparser.jar;../../library/owlapi/owlapi-mansyntaxparser.jar;../../library/owlapi/owlapi-mansyntaxrenderer.jar;../../library/owlapi/owlapi-metrics.jar;../../library/owlapi/owlapi-oboparser.jar;../../library/owlapi/owlapi-owlxmlparser.jar;../../library/owlapi/owlapi-owlxmlrenderer.jar;../../library/owlapi/owlapi-rdfapi.jar;../../library/owlapi/owlapi-rdfxmlparser.jar;../../library/owlapi/owlapi-rdfxmlrenderer.jar;../../library/owlapi/owlapi-util.jar"/>-->
<arg value="org.dllearner.server.DLLearnerWS"/>
</exec>
</target>
- <target name="wsgen_linux" >
- <exec dir="${source_dir}" executable="wsgen">
- <arg value="-keep"/>
- <arg value="-verbose"/>
- <arg value="-cp"/>
- <arg value=".:../../classes/:../../library/dig1.1-xmlbeans.jar:../../library/kaon2.jar:../../library/xbean.jar:../../library/owlapi/:../../library/owlapi/antlr-runtime-3.0.jar:../../library/owlapi/commons-lang-2.2.jar:../../library/owlapi/owlapi-api.jar:../../library/owlapi/owlapi-apibinding.jar:../../library/owlapi/owlapi-change.jar:../../library/owlapi/owlapi-debugging.jar:../../library/owlapi/owlapi-dig1_1.jar:../../library/owlapi/owlapi-functionalparser.jar:../../library/owlapi/owlapi-functionalrenderer.jar:../../library/owlapi/owlapi-impl.jar:../../library/owlapi/owlapi-krssparser.jar:../../library/owlapi/owlapi-mansyntaxparser.jar:../../library/owlapi/owlapi-mansyntaxrenderer.jar:../../library/owlapi/owlapi-metrics.jar:../../library/owlapi/owlapi-oboparser.jar:../../library/owlapi/owlapi-owlxmlparser.jar:../../library/owlapi/owlapi-owlxmlrenderer.jar:../../library/owlapi/owlapi-rdfapi.jar:../../library/owlapi/owlapi-rdfxmlparser.jar:../../library/owlapi/owlapi-rdfxmlrenderer.jar:../../library/owlapi/owlapi-util.jar"/>
- <arg value="org.dllearner.server.DLLearnerWS"/>
- </exec>
+
+
+ <target name="createScripts" >
+ <pathconvert refid="classpath" property="pathString"/>
+ <echo message="${pathString}"/>
+
+
</target>
<target name="javadoc">
+ <pathconvert refid="classpath" property="jdocclasspath"/>
+ <!--classpath="library/owlapi/antlr-runtime-3.0.jar:library/owlapi/owlapi-rdfxmlparser.jar:library/owlapi/owlapi-owlxmlrenderer.jar:library/owlapi/owlapi-mansyntaxrenderer.jar:library/owlapi/owlapi-metrics.jar:library/owlapi/owlapi-owlxmlparser.jar:library/owlapi/owlapi-change.jar:library/owlapi/owlapi-rdfxmlrenderer.jar:library/owlapi/owlapi-apibinding.jar:library/xbean.jar:library/owlapi/owlapi-oboparser.jar:library/jena/jena.jar:library/owlapi/commons-lang-2.2.jar:library/jena/commons-logging.jar:library/owlapi/owlapi-dig1_1.jar:library/owlapi/owlapi-api.jar:library/owlapi/owlapi-debugging.jar:library/jena/iri.jar:library/kaon2.jar:library/jena/xercesImpl.jar:library/owlapi/owlapi-krssparser.jar:library/jena/antlr-2.7.5.jar:library/owlapi/owlapi-functionalrenderer.jar:library/modules/sparqlModule.jar:library/owlapi/owlapi-mansyntaxparser.jar:library/jena/icu4j_3_4.jar:library/owlapi/owlapi-util.jar:library/dig1.1-xmlbeans.jar:library/jena/concurrent.jar:library/owlapi/owlapi-functionalparser.jar:library/owlapi/owlapi-impl.jar:library/owlapi/owlapi-rdfapi.jar" -->
<javadoc access="public"
author="true"
- classpath="library/owlapi/antlr-runtime-3.0.jar:library/owlapi/owlapi-rdfxmlparser.jar:library/owlapi/owlapi-owlxmlrenderer.jar:library/owlapi/owlapi-mansyntaxrenderer.jar:library/owlapi/owlapi-metrics.jar:library/owlapi/owlapi-owlxmlparser.jar:library/owlapi/owlapi-change.jar:library/owlapi/owlapi-rdfxmlrenderer.jar:library/owlapi/owlapi-apibinding.jar:library/xbean.jar:library/owlapi/owlapi-oboparser.jar:library/jena/jena.jar:library/owlapi/commons-lang-2.2.jar:library/jena/commons-logging.jar:library/owlapi/owlapi-dig1_1.jar:library/owlapi/owlapi-api.jar:library/owlapi/owlapi-debugging.jar:library/jena/iri.jar:library/kaon2.jar:library/jena/xercesImpl.jar:library/owlapi/owlapi-krssparser.jar:library/jena/antlr-2.7.5.jar:library/owlapi/owlapi-functionalrenderer.jar:library/modules/sparqlModule.jar:library/owlapi/owlapi-mansyntaxparser.jar:library/jena/icu4j_3_4.jar:library/owlapi/owlapi-util.jar:library/dig1.1-xmlbeans.jar:library/jena/concurrent.jar:library/owlapi/owlapi-functionalparser.jar:library/owlapi/owlapi-impl.jar:library/owlapi/owlapi-rdfapi.jar"
+ classpath="${jdocclasspath}"
destdir="doc/javadoc"
doctitle="DL-Learner Javadoc"
nodeprecated="false"
@@ -184,4 +199,35 @@
</javadoc>
</target>
+
+ <!--
+ Some old elements which are kept for reference for a couple of days
+
+
+ <target name="wsgen_linux" >
+ <exec dir="${source_dir}" executable="wsgen">
+ <arg value="-keep"/>
+ <arg value="-verbose"/>
+ <arg value="-cp"/>
+ <arg value=".:../../classes/:../../library/dig1.1-xmlbeans.jar:../../library/kaon2.jar:../../library/xbean.jar:../../library/owlapi/:../../library/owlapi/antlr-runtime-3.0.jar:../../library/owlapi/commons-lang-2.2.jar:../../library/owlapi/owlapi-api.jar:../../library/owlapi/owlapi-apibinding.jar:../../library/owlapi/owlapi-change.jar:../../library/owlapi/owlapi-debugging.jar:../../library/owlapi/owlapi-dig1_1.jar:../../library/owlapi/owlapi-functionalparser.jar:../../library/owlapi/owlapi-functionalrenderer.jar:../../library/owlapi/owlapi-impl.jar:../../library/owlapi/owlapi-krssparser.jar:../../library/owlapi/owlapi-mansyntaxparser.jar:../../library/owlapi/owlapi-mansyntaxrenderer.jar:../../library/owlapi/owlapi-metrics.jar:../../library/owlapi/owlapi-oboparser.jar:../../library/owlapi/owlapi-owlxmlparser.jar:../../library/owlapi/owlapi-owlxmlrenderer.jar:../../library/owlapi/owlapi-rdfapi.jar:../../library/owlapi/owlapi-rdfxmlparser.jar:../../library/owlapi/owlapi-rdfxmlrenderer.jar:../../library/owlapi/owlapi-util.jar"/>
+ <arg value="org.dllearner.server.DLLearnerWS"/>
+ </exec>
+ </target>
+
+ <path id="classpath">
+ <pathelement location="."/>
+ <pathelement location="${kaon2}"/>
+ <pathelement location="${xbean}"/>
+ <pathelement location="${dig1.1_xmlbeans}"/>
+ <pathelement location="${jena}"/>
+ <pathelement location="${owlapi-api}"/>
+ <pathelement location="${owlapi-apibinding}"/>
+ <pathelement location="${owlapi-dig1_1}"/>
+ </path>
+
+ -->
+
+
+
+
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ku...@us...> - 2007-08-28 08:45:43
|
Revision: 76
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=76&view=rev
Author: kurzum
Date: 2007-08-28 01:45:40 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/server/ClientState.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/server/ClientNotKnownException.java
trunk/src/dl-learner/org/dllearner/server/NoOntologySelectedException.java
trunk/src/dl-learner/org/dllearner/server/OntologyURLNotValid.java
Removed Paths:
-------------
trunk/src/dl-learner/org/dllearner/server/exceptions/
Copied: trunk/src/dl-learner/org/dllearner/server/ClientNotKnownException.java (from rev 75, trunk/src/dl-learner/org/dllearner/server/exceptions/ClientNotKnownException.java)
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/ClientNotKnownException.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/server/ClientNotKnownException.java 2007-08-28 08:45:40 UTC (rev 76)
@@ -0,0 +1,15 @@
+package org.dllearner.server;
+
+public class ClientNotKnownException extends Exception {
+ static final long serialVersionUID=100;
+ String detail;
+
+ public ClientNotKnownException (String message, String detail) {
+ super (message);
+ this.detail = detail;
+ }
+
+ public String getDetail () {
+ return detail;
+ }
+}
Modified: trunk/src/dl-learner/org/dllearner/server/ClientState.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/ClientState.java 2007-08-28 08:13:35 UTC (rev 75)
+++ trunk/src/dl-learner/org/dllearner/server/ClientState.java 2007-08-28 08:45:40 UTC (rev 76)
@@ -26,8 +26,6 @@
import org.dllearner.reasoning.Reasoner;
import org.dllearner.reasoning.ReasoningMethodUnsupportedException;
import org.dllearner.reasoning.ReasoningService;
-import org.dllearner.server.exceptions.NoOntologySelectedException;
-import org.dllearner.server.exceptions.OntologyURLNotValid;
public class ClientState {
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2007-08-28 08:13:35 UTC (rev 75)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2007-08-28 08:45:40 UTC (rev 76)
@@ -7,9 +7,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.dllearner.server.exceptions.ClientNotKnownException;
-import org.dllearner.server.exceptions.NoOntologySelectedException;
-import org.dllearner.server.exceptions.OntologyURLNotValid;
/**
* Offene Fragen:
Copied: trunk/src/dl-learner/org/dllearner/server/NoOntologySelectedException.java (from rev 75, trunk/src/dl-learner/org/dllearner/server/exceptions/NoOntologySelectedException.java)
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/NoOntologySelectedException.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/server/NoOntologySelectedException.java 2007-08-28 08:45:40 UTC (rev 76)
@@ -0,0 +1,15 @@
+package org.dllearner.server;
+
+public class NoOntologySelectedException extends Exception {
+ static final long serialVersionUID=101;
+ String detail;
+
+ public NoOntologySelectedException (String message, String detail) {
+ super (message);
+ this.detail = detail;
+ }
+
+ public String getDetail () {
+ return detail;
+ }
+}
Copied: trunk/src/dl-learner/org/dllearner/server/OntologyURLNotValid.java (from rev 75, trunk/src/dl-learner/org/dllearner/server/exceptions/OntologyURLNotValid.java)
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/OntologyURLNotValid.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/server/OntologyURLNotValid.java 2007-08-28 08:45:40 UTC (rev 76)
@@ -0,0 +1,15 @@
+package org.dllearner.server;
+
+public class OntologyURLNotValid extends Exception {
+ static final long serialVersionUID=102;
+ String detail;
+
+ public OntologyURLNotValid (String message, String detail) {
+ super (message);
+ this.detail = detail;
+ }
+
+ public String getDetail () {
+ return detail;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-28 08:13:40
|
Revision: 75
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=75&view=rev
Author: jenslehmann
Date: 2007-08-28 01:13:35 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
moved SPARQL module documentation
Added Paths:
-----------
trunk/doc/sparqlModule.txt
Removed Paths:
-------------
trunk/library/modules/sparqlModule.txt
Copied: trunk/doc/sparqlModule.txt (from rev 74, trunk/library/modules/sparqlModule.txt)
===================================================================
--- trunk/doc/sparqlModule.txt (rev 0)
+++ trunk/doc/sparqlModule.txt 2007-08-28 08:13:35 UTC (rev 75)
@@ -0,0 +1,245 @@
+
+
+Algorithm:
+=========
+
+Start with:
+java dbpedia.SparqlModule ListOfIndividuals
+
+ListOfIndividuals= Individual | ListOfIndividuals | {}
+
+The String[] args of the main method is taken as input at the moment.
+This will be changed later, it is only for testing.
+
+Example:
+java dbpedia.SparqlModule http://dbpedia.org/resource/Angela_Merkel http://dbpedia.org/resource/Gerhard_Schr%C3%B6der http://dbpedia.org/resource/Helmut_Kohl http://dbpedia.org/resource/Helmut_Schmidt http://dbpedia.org/resource/Ludwig_Erhard http://dbpedia.org/resource/Willy_Brandt
+
+See bottom for more examples
+
+*Sparql-Queries***
+
+Example Sparql-Query see Options below for more info about FILTERS:
+
+SELECT * WHERE {
+<http://dbpedia.org/resource/Angela_Merkel> ?predicate ?object.
+FILTER(
+(!isLiteral(?object))
+&&( !regex(str(?predicate), 'http://www.w3.org/2004/02/skos/core#') )
+&&( !regex(str(?predicate), 'http://xmlns.com/foaf/0.1/') )
+&&( !regex(str(?predicate), 'http://dbpedia.org/property/wikipage-') )
+&&( !regex(str(?predicate), 'http://www.w3.org/2002/07/owl#sameAs') )
+&&( !regex(str(?predicate), 'http://dbpedia.org/property/reference') )
+&&( !regex((?object), 'http://xmlns.com/foaf/0.1/') )).}
+
+
+*Typing***
+DBpedia is not typed at all.
+I replaced/added the following to comply to OWL-DL:
+
+Resources are sorted in three categories (Class, Property, Instance)
+(implemented as HashSets) according to their uris
+Properties are typed as Properties
+Classes see below Options
+Instances is what is left
+
+*Output***
+The Ontology is written to a file System.currentMillisec().nt
+
+
+
+*Cache***
+the cache remembers: a timestamp, the original sparql-query, the result
+key is the subject http://dbpedia.org/resource/Angela_Merkel which is first urlencoded
+and so serves as the hash for the filename.
+Cache validates if timestamp too old and Sparql-Query the same
+before returning the SPARQL xml-result
+
+
+
+
+
+Options:
+========
+
+All Options cannot be altered right now, except in the source.
+This will be later moved to the constructor.
+Default is always used.
+Some are marked with "NYI", these are Not Yet Implemented and are just ideas I had.
+
+Main-Algorithm:
+---------------
+
+*NumberOfRecursion (int)***
+
+how deep will the Ontology be cut out
+
+Default: ??? not sure 2 at the moment
+
+*ClassRepeat NYI (int)***
+
+Recursion can be increased, if the Object is a class.
+This will result in deeper, richer hierarchies
+
+
+Server:
+------
+
+there are no options planned right now hardcoded with:
+dbpedia.openlinksw.com:8890
+
+
+Sparql-queries:
+---------------
+
+*SparqlFilterPredicate (String[])***
+
+removes all rows with the specified String in the PREDICATE from the ResultSet
+(integrated in SPARQL query with FILTER !regex)
+
+Default:
+"http://www.w3.org/2004/02/skos/core#" // conflict: no properties between classes allowed
+"http://xmlns.com/foaf/0.1/" //foaf is not well defined/unnecessary
+"http://dbpedia.org/property/wikipage-" // foreign wikis -fr -es, etc.
+"http://www.w3.org/2002/07/owl#sameAs" // contradicts with owl-dl maybe changed later so it will be replaced by owl:equivalentClass for Classes
+"http://dbpedia.org/property/reference" //links to homepages
+
+*SparqlFilterObject (String[])***
+(integrated in SPARQL query with FILTER !regex)
+
+removes all rows with the specified String in the OBJECT from the ResultSet
+
+Default:
+http://xmlns.com/foaf/0.1/ //foaf is not well defined/unnecessary
+
+*useLiterals (boolean)***
+(integrated in SPARQL query with FILTER !isLiteral)
+
+removes all rows with literals as objects from the ResultSet
+
+Default: false
+
+
+
+Type Information:
+-----------------
+
+options that are used to type resources to retain OWL-DL
+
+*IsClass (String[])***
+
+specifies URI's that can be considered classes (and therefore will be typed as classes)
+
+Default:
+"http://dbpedia.org/resource/Category:" //dbpedia categories
+"http://www.w3.org/2004/02/skos/core" // concept
+"http://dbpedia.org/class/yago" // yago classes
+"http://dbpedia.org/class/" // "yago" is missing in some of the Datasets from DBpedia,
+I don't actually know if this is a mistake or on purpose
+
+
+Cache:
+------
+
+
+*freshdays (int)***
+
+Determines how many days a cached query stays valid
+
+Default: 15 days
+
+*path (String)***
+
+path of the cache-folder
+
+Default: cache
+
+
+
+Syntactic Sugar NYI
+----------------
+Instead of choosing example individuals to put into main,
+it could be nice to choose 2 Categories.
+The module automatically downloads the individals for both classes itself,
+removes the category from the definiton and then runs the DL-Learner.
+
+
+
+
+
+Examples:
+=========
+
+German Leaders:
+
+Input:
+http://dbpedia.org/resource/Adolf_Hitler http://dbpedia.org/resource/Prince_Chlodwig_zu_HohenloheSchillingsf%C3%BCrst http://dbpedia.org/resource/Prince_Maximilian_of_Baden http://dbpedia.org/resource/Franz_von_Papen http://dbpedia.org/resource/Joseph_Goebbels http://dbpedia.org/resource/Gerhard_Schr%C3%B6der http://dbpedia.org/resource/Angela_Merkel http://dbpedia.org/resource/Helmut_Kohl http://dbpedia.org/resource/Helmut_Schmidt http://dbpedia.org/resource/Ludwig_Erhard http://dbpedia.org/resource/Willy_Brandt
+
+conf:
+
++test("http://dbpedia.org/resource/Adolf_Hitler").
++test("http://dbpedia.org/resource/Prince_Chlodwig_zu_Hohenlohe-Schillingsf%C3%BCrst").
++test("http://dbpedia.org/resource/Prince_Maximilian_of_Baden").
++test("http://dbpedia.org/resource/Franz_von_Papen").
++test("http://dbpedia.org/resource/Joseph_Goebbels").
++test("http://dbpedia.org/resource/Gerhard_Schr%C3%B6der").
++test("http://dbpedia.org/resource/Angela_Merkel").
++test("http://dbpedia.org/resource/Helmut_Kohl").
++test("http://dbpedia.org/resource/Helmut_Schmidt").
++test("http://dbpedia.org/resource/Ludwig_Erhard").
++test("http://dbpedia.org/resource/Willy_Brandt").
+
+
+Greek Philosophers:
+
+Input
+
+ http://dbpedia.org/resource/Socrates http://dbpedia.org/resource/Plato http://dbpedia.org/resource/Pythagoras http://dbpedia.org/resource/Zeno_of_Elea http://dbpedia.org/resource/Democritus http://dbpedia.org/resource/Theophrastus http://dbpedia.org/resource/Anaxagoras http://dbpedia.org/resource/Alexander_the_Great http://dbpedia.org/resource/Hephaestion http://dbpedia.org/resource/Diotima http://dbpedia.org/resource/Nicomachus http://dbpedia.org/resource/Harpalus http://dbpedia.org/resource/Menaechmus
+
+Conf
+
++test("http://dbpedia.org/resource/Socrates").
++test("http://dbpedia.org/resource/Plato").
++test("http://dbpedia.org/resource/Pythagoras").
+
++test("http://dbpedia.org/resource/Zeno_of_Elea").
+//was a pre-Socratic Greek philosopher
++test("http://dbpedia.org/resource/Democritus").
+//was a pre-Socratic Greek philosopher
+//+test("http://dbpedia.org/resource/Theophrastus").
+//a native of Eressos in Lesbos, was the successor of Aristotle in the Peripatetic school.
++test("http://dbpedia.org/resource/Anaxagoras").
+//was a pre-Socratic Greek philosopher.
+
+-test("http://dbpedia.org/resource/Alexander_the_Great").
+-test("http://dbpedia.org/resource/Hephaestion").
+//makedonischer Adeliger, der engste Freund, General, Leibw\xE4chter und vielleicht auch Geliebter Alexanders des Gro\xDFen.
+-test("http://dbpedia.org/resource/Diotima").
+//ist eine literarische Figur Platons, eine Seherin aus Mantin\xE4a,
+-test("http://dbpedia.org/resource/Nicomachus").
+//Nicomachus sp\xE4tantiker r\xF6mischer Schriftsteller und Politiker
+-test("http://dbpedia.org/resource/Harpalus").
+//Harpalus was an aristocrat of Macedon and boyhood friend of Alexander the Great
+-test("http://dbpedia.org/resource/Menaechmus").
+//was a Greek mathematician and geometer born in Alopeconnesus
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Deleted: trunk/library/modules/sparqlModule.txt
===================================================================
--- trunk/library/modules/sparqlModule.txt 2007-08-28 07:05:06 UTC (rev 74)
+++ trunk/library/modules/sparqlModule.txt 2007-08-28 08:13:35 UTC (rev 75)
@@ -1,245 +0,0 @@
-
-
-Algorithm:
-=========
-
-Start with:
-java dbpedia.SparqlModule ListOfIndividuals
-
-ListOfIndividuals= Individual | ListOfIndividuals | {}
-
-The String[] args of the main method is taken as input at the moment.
-This will be changed later, it is only for testing.
-
-Example:
-java dbpedia.SparqlModule http://dbpedia.org/resource/Angela_Merkel http://dbpedia.org/resource/Gerhard_Schr%C3%B6der http://dbpedia.org/resource/Helmut_Kohl http://dbpedia.org/resource/Helmut_Schmidt http://dbpedia.org/resource/Ludwig_Erhard http://dbpedia.org/resource/Willy_Brandt
-
-See bottom for more examples
-
-*Sparql-Queries***
-
-Example Sparql-Query see Options below for more info about FILTERS:
-
-SELECT * WHERE {
-<http://dbpedia.org/resource/Angela_Merkel> ?predicate ?object.
-FILTER(
-(!isLiteral(?object))
-&&( !regex(str(?predicate), 'http://www.w3.org/2004/02/skos/core#') )
-&&( !regex(str(?predicate), 'http://xmlns.com/foaf/0.1/') )
-&&( !regex(str(?predicate), 'http://dbpedia.org/property/wikipage-') )
-&&( !regex(str(?predicate), 'http://www.w3.org/2002/07/owl#sameAs') )
-&&( !regex(str(?predicate), 'http://dbpedia.org/property/reference') )
-&&( !regex((?object), 'http://xmlns.com/foaf/0.1/') )).}
-
-
-*Typing***
-DBpedia is not typed at all.
-I replaced/added the following to comply to OWL-DL:
-
-Resources are sorted in three categories (Class, Property, Instance)
-(implemented as HashSets) according to their uris
-Properties are typed as Properties
-Classes see below Options
-Instances is what is left
-
-*Output***
-The Ontology is written to a file System.currentMillisec().nt
-
-
-
-*Cache***
-the cache remembers: a timestamp, the original sparql-query, the result
-key is the subject http://dbpedia.org/resource/Angela_Merkel which is first urlencoded
-and so serves as the hash for the filename.
-Cache validates if timestamp too old and Sparql-Query the same
-before returning the SPARQL xml-result
-
-
-
-
-
-Options:
-========
-
-All Options cannot be altered right now, except in the source.
-This will be later moved to the constructor.
-Default is always used.
-Some are marked with "NYI", these are Not Yet Implemented and are just ideas I had.
-
-Main-Algorithm:
----------------
-
-*NumberOfRecursion (int)***
-
-how deep will the Ontology be cut out
-
-Default: ??? not sure 2 at the moment
-
-*ClassRepeat NYI (int)***
-
-Recursion can be increased, if the Object is a class.
-This will result in deeper, richer hierarchies
-
-
-Server:
-------
-
-there are no options planned right now hardcoded with:
-dbpedia.openlinksw.com:8890
-
-
-Sparql-queries:
----------------
-
-*SparqlFilterPredicate (String[])***
-
-removes all rows with the specified String in the PREDICATE from the ResultSet
-(integrated in SPARQL query with FILTER !regex)
-
-Default:
-"http://www.w3.org/2004/02/skos/core#" // conflict: no properties between classes allowed
-"http://xmlns.com/foaf/0.1/" //foaf is not well defined/unnecessary
-"http://dbpedia.org/property/wikipage-" // foreign wikis -fr -es, etc.
-"http://www.w3.org/2002/07/owl#sameAs" // contradicts with owl-dl maybe changed later so it will be replaced by owl:equivalentClass for Classes
-"http://dbpedia.org/property/reference" //links to homepages
-
-*SparqlFilterObject (String[])***
-(integrated in SPARQL query with FILTER !regex)
-
-removes all rows with the specified String in the OBJECT from the ResultSet
-
-Default:
-http://xmlns.com/foaf/0.1/ //foaf is not well defined/unnecessary
-
-*useLiterals (boolean)***
-(integrated in SPARQL query with FILTER !isLiteral)
-
-removes all rows with literals as objects from the ResultSet
-
-Default: false
-
-
-
-Type Information:
------------------
-
-options that are used to type resources to retain OWL-DL
-
-*IsClass (String[])***
-
-specifies URI's that can be considered classes (and therefore will be typed as classes)
-
-Default:
-"http://dbpedia.org/resource/Category:" //dbpedia categories
-"http://www.w3.org/2004/02/skos/core" // concept
-"http://dbpedia.org/class/yago" // yago classes
-"http://dbpedia.org/class/" // "yago" is missing in some of the Datasets from DBpedia,
-I don't actually know if this is a mistake or on purpose
-
-
-Cache:
-------
-
-
-*freshdays (int)***
-
-Determines how many days a cached query stays valid
-
-Default: 15 days
-
-*path (String)***
-
-path of the cache-folder
-
-Default: cache
-
-
-
-Syntactic Sugar NYI
-----------------
-Instead of choosing example individuals to put into main,
-it could be nice to choose 2 Categories.
-The module automatically downloads the individals for both classes itself,
-removes the category from the definiton and then runs the DL-Learner.
-
-
-
-
-
-Examples:
-=========
-
-German Leaders:
-
-Input:
-http://dbpedia.org/resource/Adolf_Hitler http://dbpedia.org/resource/Prince_Chlodwig_zu_HohenloheSchillingsf%C3%BCrst http://dbpedia.org/resource/Prince_Maximilian_of_Baden http://dbpedia.org/resource/Franz_von_Papen http://dbpedia.org/resource/Joseph_Goebbels http://dbpedia.org/resource/Gerhard_Schr%C3%B6der http://dbpedia.org/resource/Angela_Merkel http://dbpedia.org/resource/Helmut_Kohl http://dbpedia.org/resource/Helmut_Schmidt http://dbpedia.org/resource/Ludwig_Erhard http://dbpedia.org/resource/Willy_Brandt
-
-conf:
-
-+test("http://dbpedia.org/resource/Adolf_Hitler").
-+test("http://dbpedia.org/resource/Prince_Chlodwig_zu_Hohenlohe-Schillingsf%C3%BCrst").
-+test("http://dbpedia.org/resource/Prince_Maximilian_of_Baden").
-+test("http://dbpedia.org/resource/Franz_von_Papen").
-+test("http://dbpedia.org/resource/Joseph_Goebbels").
-+test("http://dbpedia.org/resource/Gerhard_Schr%C3%B6der").
-+test("http://dbpedia.org/resource/Angela_Merkel").
-+test("http://dbpedia.org/resource/Helmut_Kohl").
-+test("http://dbpedia.org/resource/Helmut_Schmidt").
-+test("http://dbpedia.org/resource/Ludwig_Erhard").
-+test("http://dbpedia.org/resource/Willy_Brandt").
-
-
-Greek Philosophers:
-
-Input
-
- http://dbpedia.org/resource/Socrates http://dbpedia.org/resource/Plato http://dbpedia.org/resource/Pythagoras http://dbpedia.org/resource/Zeno_of_Elea http://dbpedia.org/resource/Democritus http://dbpedia.org/resource/Theophrastus http://dbpedia.org/resource/Anaxagoras http://dbpedia.org/resource/Alexander_the_Great http://dbpedia.org/resource/Hephaestion http://dbpedia.org/resource/Diotima http://dbpedia.org/resource/Nicomachus http://dbpedia.org/resource/Harpalus http://dbpedia.org/resource/Menaechmus
-
-Conf
-
-+test("http://dbpedia.org/resource/Socrates").
-+test("http://dbpedia.org/resource/Plato").
-+test("http://dbpedia.org/resource/Pythagoras").
-
-+test("http://dbpedia.org/resource/Zeno_of_Elea").
-//was a pre-Socratic Greek philosopher
-+test("http://dbpedia.org/resource/Democritus").
-//was a pre-Socratic Greek philosopher
-//+test("http://dbpedia.org/resource/Theophrastus").
-//a native of Eressos in Lesbos, was the successor of Aristotle in the Peripatetic school.
-+test("http://dbpedia.org/resource/Anaxagoras").
-//was a pre-Socratic Greek philosopher.
-
--test("http://dbpedia.org/resource/Alexander_the_Great").
--test("http://dbpedia.org/resource/Hephaestion").
-//makedonischer Adeliger, der engste Freund, General, Leibw\xE4chter und vielleicht auch Geliebter Alexanders des Gro\xDFen.
--test("http://dbpedia.org/resource/Diotima").
-//ist eine literarische Figur Platons, eine Seherin aus Mantin\xE4a,
--test("http://dbpedia.org/resource/Nicomachus").
-//Nicomachus sp\xE4tantiker r\xF6mischer Schriftsteller und Politiker
--test("http://dbpedia.org/resource/Harpalus").
-//Harpalus was an aristocrat of Macedon and boyhood friend of Alexander the Great
--test("http://dbpedia.org/resource/Menaechmus").
-//was a Greek mathematician and geometer born in Alopeconnesus
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-28 07:05:14
|
Revision: 74
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=74&view=rev
Author: jenslehmann
Date: 2007-08-28 00:05:06 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
added Eclipse code style file
moved Eclipse specific stuff to doc/eclipse/
Added Paths:
-----------
trunk/doc/eclipse/
trunk/doc/eclipse/classpath.dist
trunk/doc/eclipse/eclipse_formatter_codestyle.xml
trunk/doc/eclipse/project.dist
Removed Paths:
-------------
trunk/classpath.dist
trunk/project.dist
Deleted: trunk/classpath.dist
===================================================================
--- trunk/classpath.dist 2007-08-28 06:55:29 UTC (rev 73)
+++ trunk/classpath.dist 2007-08-28 07:05:06 UTC (rev 74)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/dl-learner"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="library/dig1.1-xmlbeans.jar"/>
- <classpathentry kind="lib" path="library/kaon2.jar"/>
- <classpathentry kind="lib" path="library/xbean.jar"/>
- <classpathentry kind="lib" path="library/jena/antlr-2.7.5.jar"/>
- <classpathentry kind="lib" path="library/jena/commons-logging.jar"/>
- <classpathentry kind="lib" path="library/jena/concurrent.jar"/>
- <classpathentry kind="lib" path="library/jena/icu4j_3_4.jar"/>
- <classpathentry kind="lib" path="library/jena/iri.jar"/>
- <classpathentry kind="lib" path="library/jena/jena.jar"/>
- <classpathentry kind="lib" path="library/jena/xercesImpl.jar"/>
- <classpathentry kind="lib" path="library/modules/sparqlModule.jar"/>
- <classpathentry kind="lib" path="library/owlapi/antlr-runtime-3.0.jar"/>
- <classpathentry kind="lib" path="library/owlapi/commons-lang-2.2.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-api.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-apibinding.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-change.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-debugging.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-dig1_1.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-functionalparser.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-functionalrenderer.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-impl.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-krssparser.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-mansyntaxparser.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-mansyntaxrenderer.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-metrics.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-oboparser.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-owlxmlparser.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-owlxmlrenderer.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-rdfapi.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-rdfxmlparser.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-rdfxmlrenderer.jar"/>
- <classpathentry kind="lib" path="library/owlapi/owlapi-util.jar"/>
- <classpathentry kind="output" path="classes"/>
-</classpath>
Copied: trunk/doc/eclipse/classpath.dist (from rev 68, trunk/classpath.dist)
===================================================================
--- trunk/doc/eclipse/classpath.dist (rev 0)
+++ trunk/doc/eclipse/classpath.dist 2007-08-28 07:05:06 UTC (rev 74)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/dl-learner"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="library/dig1.1-xmlbeans.jar"/>
+ <classpathentry kind="lib" path="library/kaon2.jar"/>
+ <classpathentry kind="lib" path="library/xbean.jar"/>
+ <classpathentry kind="lib" path="library/jena/antlr-2.7.5.jar"/>
+ <classpathentry kind="lib" path="library/jena/commons-logging.jar"/>
+ <classpathentry kind="lib" path="library/jena/concurrent.jar"/>
+ <classpathentry kind="lib" path="library/jena/icu4j_3_4.jar"/>
+ <classpathentry kind="lib" path="library/jena/iri.jar"/>
+ <classpathentry kind="lib" path="library/jena/jena.jar"/>
+ <classpathentry kind="lib" path="library/jena/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="library/modules/sparqlModule.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/commons-lang-2.2.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-api.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-apibinding.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-change.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-debugging.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-dig1_1.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-functionalparser.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-functionalrenderer.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-impl.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-krssparser.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-mansyntaxparser.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-mansyntaxrenderer.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-metrics.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-oboparser.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-owlxmlparser.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-owlxmlrenderer.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-rdfapi.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-rdfxmlparser.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-rdfxmlrenderer.jar"/>
+ <classpathentry kind="lib" path="library/owlapi/owlapi-util.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: trunk/doc/eclipse/eclipse_formatter_codestyle.xml
===================================================================
--- trunk/doc/eclipse/eclipse_formatter_codestyle.xml (rev 0)
+++ trunk/doc/eclipse/eclipse_formatter_codestyle.xml 2007-08-28 07:05:06 UTC (rev 74)
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="11">
+<profile kind="CodeFormatterProfile" name="DL-Learner" version="11">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>
Copied: trunk/doc/eclipse/project.dist (from rev 68, trunk/project.dist)
===================================================================
--- trunk/doc/eclipse/project.dist (rev 0)
+++ trunk/doc/eclipse/project.dist 2007-08-28 07:05:06 UTC (rev 74)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>DL-Learner-SVN</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Deleted: trunk/project.dist
===================================================================
--- trunk/project.dist 2007-08-28 06:55:29 UTC (rev 73)
+++ trunk/project.dist 2007-08-28 07:05:06 UTC (rev 74)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>DL-Learner-SVN</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-28 06:55:31
|
Revision: 73
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=73&view=rev
Author: jenslehmann
Date: 2007-08-27 23:55:29 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
merged Javadoc target into main build script
Modified Paths:
--------------
trunk/build.xml
Removed Paths:
-------------
trunk/javadoc.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-08-27 18:34:10 UTC (rev 72)
+++ trunk/build.xml 2007-08-28 06:55:29 UTC (rev 73)
@@ -156,4 +156,32 @@
</exec>
</target>
+ <target name="javadoc">
+ <javadoc access="public"
+ author="true"
+ classpath="library/owlapi/antlr-runtime-3.0.jar:library/owlapi/owlapi-rdfxmlparser.jar:library/owlapi/owlapi-owlxmlrenderer.jar:library/owlapi/owlapi-mansyntaxrenderer.jar:library/owlapi/owlapi-metrics.jar:library/owlapi/owlapi-owlxmlparser.jar:library/owlapi/owlapi-change.jar:library/owlapi/owlapi-rdfxmlrenderer.jar:library/owlapi/owlapi-apibinding.jar:library/xbean.jar:library/owlapi/owlapi-oboparser.jar:library/jena/jena.jar:library/owlapi/commons-lang-2.2.jar:library/jena/commons-logging.jar:library/owlapi/owlapi-dig1_1.jar:library/owlapi/owlapi-api.jar:library/owlapi/owlapi-debugging.jar:library/jena/iri.jar:library/kaon2.jar:library/jena/xercesImpl.jar:library/owlapi/owlapi-krssparser.jar:library/jena/antlr-2.7.5.jar:library/owlapi/owlapi-functionalrenderer.jar:library/modules/sparqlModule.jar:library/owlapi/owlapi-mansyntaxparser.jar:library/jena/icu4j_3_4.jar:library/owlapi/owlapi-util.jar:library/dig1.1-xmlbeans.jar:library/jena/concurrent.jar:library/owlapi/owlapi-functionalparser.jar:library/owlapi/owlapi-impl.jar:library/owlapi/owlapi-rdfapi.jar"
+ destdir="doc/javadoc"
+ doctitle="DL-Learner Javadoc"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ noindex="false"
+ nonavbar="false"
+ notree="false"
+ overview="src/dl-learner/overview.html"
+ packagenames="org.dllearner.reasoning,org.dllearner.dl,org.dllearner.server,org.dllearner,org.dllearner.server.exceptions,org.dllearner.server.jaxws,org.dllearner.algorithms.gp,org.dllearner.parser,org.dllearner.modules,org.dllearner.algorithms,org.dllearner.examples,org.dllearner.utilities,org.dllearner.algorithms.hybridgp,org.dllearner.algorithms.refinement"
+ source="1.6"
+ sourcepath="src/dl-learner"
+ splitindex="true"
+ stylesheetfile="/home/jl/promotion/dl-learner-svn/trunk/javadoc.css"
+ use="true"
+ version="true"
+ linksource="true"
+ bottom="<img style='float:right' src='http://sflogo.sourceforge.net/sflogo.php?group_id=203619&type=1' width='88' height='31' border='0' alt='SourceForge.net Logo' /> DL-Learner is licenced under the terms of the GNU General Public License.<br />Copyright &#169; 2007 Jens Lehmann"
+ Encoding="ISO-8859-1"
+ windowtitle="DL-Learner Javadoc">
+ <taglet name="org.dllearner.utilities.ToDoTaglet" path="classes" />
+ <link href="http://java.sun.com/javase/6/docs/api/"/>
+ </javadoc>
+ </target>
+
</project>
Deleted: trunk/javadoc.xml
===================================================================
--- trunk/javadoc.xml 2007-08-27 18:34:10 UTC (rev 72)
+++ trunk/javadoc.xml 2007-08-28 06:55:29 UTC (rev 73)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="javadoc">
- <target name="javadoc">
- <javadoc access="public"
- author="true"
- classpath="library/owlapi/antlr-runtime-3.0.jar:library/owlapi/owlapi-rdfxmlparser.jar:library/owlapi/owlapi-owlxmlrenderer.jar:library/owlapi/owlapi-mansyntaxrenderer.jar:library/owlapi/owlapi-metrics.jar:library/owlapi/owlapi-owlxmlparser.jar:library/owlapi/owlapi-change.jar:library/owlapi/owlapi-rdfxmlrenderer.jar:library/owlapi/owlapi-apibinding.jar:library/xbean.jar:library/owlapi/owlapi-oboparser.jar:library/jena/jena.jar:library/owlapi/commons-lang-2.2.jar:library/jena/commons-logging.jar:library/owlapi/owlapi-dig1_1.jar:library/owlapi/owlapi-api.jar:library/owlapi/owlapi-debugging.jar:library/jena/iri.jar:library/kaon2.jar:library/jena/xercesImpl.jar:library/owlapi/owlapi-krssparser.jar:library/jena/antlr-2.7.5.jar:library/owlapi/owlapi-functionalrenderer.jar:library/modules/sparqlModule.jar:library/owlapi/owlapi-mansyntaxparser.jar:library/jena/icu4j_3_4.jar:library/owlapi/owlapi-util.jar:library/dig1.1-xmlbeans.jar:library/jena/concurrent.jar:library/owlapi/owlapi-functionalparser.jar:library/owlapi/owlapi-impl.jar:library/owlapi/owlapi-rdfapi.jar"
- destdir="doc/javadoc"
- doctitle="DL-Learner Javadoc"
- nodeprecated="false"
- nodeprecatedlist="false"
- noindex="false"
- nonavbar="false"
- notree="false"
- overview="src/dl-learner/overview.html"
- packagenames="org.dllearner.reasoning,org.dllearner.dl,org.dllearner.server,org.dllearner,org.dllearner.server.exceptions,org.dllearner.server.jaxws,org.dllearner.algorithms.gp,org.dllearner.parser,org.dllearner.modules,org.dllearner.algorithms,org.dllearner.examples,org.dllearner.utilities,org.dllearner.algorithms.hybridgp,org.dllearner.algorithms.refinement"
- source="1.6"
- sourcepath="src/dl-learner"
- splitindex="true"
- stylesheetfile="/home/jl/promotion/dl-learner-svn/trunk/javadoc.css"
- use="true"
- version="true"
- linksource="true"
- bottom="<img style='float:right' src='http://sflogo.sourceforge.net/sflogo.php?group_id=203619&type=1' width='88' height='31' border='0' alt='SourceForge.net Logo' /> DL-Learner is licenced under the terms of the GNU General Public License.<br />Copyright &#169; 2007 Jens Lehmann"
- Encoding="ISO-8859-1"
- windowtitle="DL-Learner Javadoc">
- <taglet name="org.dllearner.utilities.ToDoTaglet" path="classes" />
- <link href="http://java.sun.com/javase/6/docs/api/"/>
- </javadoc>
- </target>
-</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-27 18:34:15
|
Revision: 72
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=72&view=rev
Author: jenslehmann
Date: 2007-08-27 11:34:10 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
improved documentation
Modified Paths:
--------------
trunk/src/dl-learner/overview.html
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/dl/package.html
trunk/src/dl-learner/org/dllearner/examples/package.html
trunk/src/dl-learner/org/dllearner/modules/package.html
trunk/src/dl-learner/org/dllearner/parser/package.html
trunk/src/dl-learner/org/dllearner/reasoning/package.html
trunk/src/dl-learner/org/dllearner/utilities/package.html
Added: trunk/src/dl-learner/org/dllearner/dl/package.html
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/package.html (rev 0)
+++ trunk/src/dl-learner/org/dllearner/dl/package.html 2007-08-27 18:34:10 UTC (rev 72)
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head></head>
+<body bgcolor="white">
+<p>Classes for representing Description Logic constructs.</p>
+</body>
+</html>
\ No newline at end of file
Added: trunk/src/dl-learner/org/dllearner/examples/package.html
===================================================================
--- trunk/src/dl-learner/org/dllearner/examples/package.html (rev 0)
+++ trunk/src/dl-learner/org/dllearner/examples/package.html 2007-08-27 18:34:10 UTC (rev 72)
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head></head>
+<body bgcolor="white">
+<p>Classes for generating learning examples (from unsupported formats or self generated data).</p>
+</body>
+</html>
\ No newline at end of file
Added: trunk/src/dl-learner/org/dllearner/modules/package.html
===================================================================
--- trunk/src/dl-learner/org/dllearner/modules/package.html (rev 0)
+++ trunk/src/dl-learner/org/dllearner/modules/package.html 2007-08-27 18:34:10 UTC (rev 72)
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head></head>
+<body bgcolor="white">
+<p>DL-Learner modules.</p>
+</body>
+</html>
\ No newline at end of file
Added: trunk/src/dl-learner/org/dllearner/parser/package.html
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/package.html (rev 0)
+++ trunk/src/dl-learner/org/dllearner/parser/package.html 2007-08-27 18:34:10 UTC (rev 72)
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head></head>
+<body bgcolor="white">
+<p>DL-Learner configuration file parser.</p>
+</body>
+</html>
\ No newline at end of file
Added: trunk/src/dl-learner/org/dllearner/reasoning/package.html
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/package.html (rev 0)
+++ trunk/src/dl-learner/org/dllearner/reasoning/package.html 2007-08-27 18:34:10 UTC (rev 72)
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head></head>
+<body bgcolor="white">
+<p>Implements the connection to other reasoner or own reasoning/caching algorithms.</p>
+</body>
+</html>
\ No newline at end of file
Added: trunk/src/dl-learner/org/dllearner/utilities/package.html
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/package.html (rev 0)
+++ trunk/src/dl-learner/org/dllearner/utilities/package.html 2007-08-27 18:34:10 UTC (rev 72)
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head></head>
+<body bgcolor="white">
+<p>Utility Classes.</p>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/src/dl-learner/overview.html
===================================================================
--- trunk/src/dl-learner/overview.html 2007-08-27 17:20:01 UTC (rev 71)
+++ trunk/src/dl-learner/overview.html 2007-08-27 18:34:10 UTC (rev 72)
@@ -4,6 +4,8 @@
<body>
<p>DL-Learner is a tool for supervised Machine Learning in OWL and Description Logics.</p>
+<p><img src="http://aksw.org/Projects/DLLearner/files?get=dllearner.gif" alt="DL-Learner logo" /></p>
+
<p>
Project Homepage: <a href="http://dl-learner.org">http://dl-learner.org</a> <br />
Sourceforge.net Website: <a href="http://sourceforge.net/projects/dl-learner">http://sf.net/projects/dl-learner</a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-27 17:20:03
|
Revision: 71
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=71&view=rev
Author: jenslehmann
Date: 2007-08-27 10:20:01 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
added support for querying the most general and most specific roles
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/reasoning/ReasoningService.java
trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java
Modified: trunk/src/dl-learner/org/dllearner/reasoning/ReasoningService.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/ReasoningService.java 2007-08-27 16:42:51 UTC (rev 70)
+++ trunk/src/dl-learner/org/dllearner/reasoning/ReasoningService.java 2007-08-27 17:20:01 UTC (rev 71)
@@ -26,6 +26,7 @@
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
+import java.util.TreeSet;
import org.dllearner.OntologyFileFormat;
import org.dllearner.dl.AtomicConcept;
@@ -291,6 +292,7 @@
/**
* Returns more general concepts in the subsumption hierarchy.
*
+ * @see RoleHierarchy#getMoreGeneralRoles(AtomicRole)
* @param role Atomic concept, top, or bottom.
* @return A set of more general concepts.
*/
@@ -301,6 +303,7 @@
/**
* Returns more special concepts in the subsumption hierarchy.
*
+ * @see RoleHierarchy#getMoreSpecialRoles(AtomicRole)
* @param role Atomic concept, top, or bottom.
* @return A set of more special concepts.
*/
@@ -308,6 +311,22 @@
return getRoleHierarchy().getMoreSpecialRoles(role);
}
+ /**
+ * @see RoleHierarchy#getMostGeneralRoles()
+ * @return The most general roles.
+ */
+ public TreeSet<AtomicRole> getMostGeneralRoles() {
+ return getRoleHierarchy().getMostGeneralRoles();
+ }
+
+ /**
+ * @see RoleHierarchy#getMostSpecialRoles()
+ * @return The most special roles.
+ */
+ public TreeSet<AtomicRole> getMostSpecialRoles() {
+ return getRoleHierarchy().getMostSpecialRoles();
+ }
+
public SubsumptionHierarchy getSubsumptionHierarchy() {
try {
nrOfSubsumptionHierarchyQueries++;
Modified: trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java 2007-08-27 16:42:51 UTC (rev 70)
+++ trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java 2007-08-27 17:20:01 UTC (rev 71)
@@ -69,6 +69,8 @@
return (TreeSet<AtomicRole>) roleHierarchyDown.get(role).clone();
}
+
+
@Override
public String toString() {
String str = "";
@@ -89,5 +91,20 @@
str += toString(hierarchy, c, depth+1);
}
return str;
- }
+ }
+
+ /**
+ * @return The most general roles.
+ */
+ public TreeSet<AtomicRole> getMostGeneralRoles() {
+ return mostGeneralRoles;
+ }
+
+ /**
+ * @return The most special roles.
+ */
+ public TreeSet<AtomicRole> getMostSpecialRoles() {
+ return mostSpecialRoles;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-27 16:54:13
|
Revision: 63
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=63&view=rev
Author: jenslehmann
Date: 2007-08-27 04:41:10 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
some more warnings fixed
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/QuickStart.java
Modified: trunk/src/dl-learner/org/dllearner/QuickStart.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/QuickStart.java 2007-08-27 11:37:23 UTC (rev 62)
+++ trunk/src/dl-learner/org/dllearner/QuickStart.java 2007-08-27 11:41:10 UTC (rev 63)
@@ -38,7 +38,7 @@
getAllConfs(f, path);
// System.out.println(hm.size());
- Iterator i = hm.keySet().iterator();
+ Iterator<String> i = hm.keySet().iterator();
Object[] sort = new Object[hm.size()];
int count = 0;
while (i.hasNext())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-27 16:42:54
|
Revision: 70
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=70&view=rev
Author: jenslehmann
Date: 2007-08-27 09:42:51 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
added reasoning service methods for the role hierarchy (+ some class documentation)
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/reasoning/ReasoningService.java
Modified: trunk/src/dl-learner/org/dllearner/reasoning/ReasoningService.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/ReasoningService.java 2007-08-27 16:23:24 UTC (rev 69)
+++ trunk/src/dl-learner/org/dllearner/reasoning/ReasoningService.java 2007-08-27 16:42:51 UTC (rev 70)
@@ -1,3 +1,23 @@
+/**
+ * Copyright (C) 2007, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
package org.dllearner.reasoning;
import java.io.File;
@@ -15,21 +35,14 @@
import org.dllearner.utilities.SortedSetTuple;
/**
- * Das ist die Schnittstelle zum verwendeten Reasoner. Hier k�nnen Queries
- * eingegeben werden, die dann zum benutzten Reasoner weitergeleitet werdern.
- * Die zentrale Schnittstelle soll erm�glichen, dass verschiedene Reasoner auf
- * unterschiedliche Art und Weise angebunden werden k�nnen.
+ * The reasoning service is the interface to the used reasoner. Basically,
+ * it delegates all incoming reasoner request to the <code>Reasoner</code>
+ * object which has been specified in the constructor. However, it calculates
+ * some additional statistics about the time the reasoner needs to answer
+ * the query.
*
- * TODO: ADC-Support, d.h. es werden zwei Konzepte als Input f�r Klassifikation
- * gebracht wovon eins ein Hilfskonzept ist was zur Wissensbasis hinzugef�gt
- * werden muss
+ * @author Jens Lehmann
*
- * TODO: Reasoner k�nnte ein Caching f�r Anfragen bzgl. Subsumption- hierarchie
- * bereitstellen => im Lernalgorithmus m�ssen f�r atomare Konzept die Nachbarn
- * in der Subsumptionhierarchie bekannt sein
- *
- * @author jl
- *
*/
public class ReasoningService {
@@ -255,15 +268,46 @@
}
*/
- // conveniven
+ /**
+ * Returns more general concepts in the subsumption hierarchy.
+ *
+ * @param concept Atomic concept, top, or bottom.
+ * @return A set of more general concepts.
+ */
public SortedSet<Concept> getMoreGeneralConcepts(Concept concept) {
return getSubsumptionHierarchy().getMoreGeneralConcepts(concept);
}
+ /**
+ * Returns more special concepts in the subsumption hierarchy.
+ *
+ * @param concept Atomic concept, top, or bottom.
+ * @return A set of more special concepts.
+ */
public SortedSet<Concept> getMoreSpecialConcepts(Concept concept) {
return getSubsumptionHierarchy().getMoreSpecialConcepts(concept);
}
+ /**
+ * Returns more general concepts in the subsumption hierarchy.
+ *
+ * @param role Atomic concept, top, or bottom.
+ * @return A set of more general concepts.
+ */
+ public SortedSet<AtomicRole> getMoreGeneralRoles(AtomicRole role) {
+ return getRoleHierarchy().getMoreGeneralRoles(role);
+ }
+
+ /**
+ * Returns more special concepts in the subsumption hierarchy.
+ *
+ * @param role Atomic concept, top, or bottom.
+ * @return A set of more special concepts.
+ */
+ public SortedSet<AtomicRole> getMoreSpecialRoles(AtomicRole role) {
+ return getRoleHierarchy().getMoreSpecialRoles(role);
+ }
+
public SubsumptionHierarchy getSubsumptionHierarchy() {
try {
nrOfSubsumptionHierarchyQueries++;
@@ -274,6 +318,15 @@
}
}
+ public RoleHierarchy getRoleHierarchy() {
+ try {
+ return reasoner.getRoleHierarchy();
+ } catch (ReasoningMethodUnsupportedException e) {
+ handleExceptions(e);
+ return null;
+ }
+ }
+
public boolean isSatisfiable() {
reasoningStartTimeTmp = System.nanoTime();
boolean result;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-27 16:23:25
|
Revision: 69
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=69&view=rev
Author: jenslehmann
Date: 2007-08-27 09:23:24 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
added links to Java 6 online Javadoc
Modified Paths:
--------------
trunk/javadoc.css
trunk/javadoc.xml
Modified: trunk/javadoc.css
===================================================================
--- trunk/javadoc.css 2007-08-27 15:51:12 UTC (rev 68)
+++ trunk/javadoc.css 2007-08-27 16:23:24 UTC (rev 69)
@@ -18,13 +18,6 @@
color: rgb(51, 102, 153);
}
-pre{
- margin: 0px;
- padding: 0.5em;
- font-size: 100%;
- border: 1px solid #ccc;
-}
-
.javakeyword{
font-family: Courier New;
color: rgb(127,0,85);
@@ -70,8 +63,8 @@
}
/* Table colors */
-.TableHeadingColor { background: rgb(173,184,217) }
-.TableSubHeadingColor { background: rgb(173,184,217) }
+.TableHeadingColor { background: rgb(172,185,216) }
+.TableSubHeadingColor { background: rgb(172,185,216) }
.TableRowColor { background: rgb(220, 220, 220) }
/* Font used in left-hand frame lists */
Modified: trunk/javadoc.xml
===================================================================
--- trunk/javadoc.xml 2007-08-27 15:51:12 UTC (rev 68)
+++ trunk/javadoc.xml 2007-08-27 16:23:24 UTC (rev 69)
@@ -24,6 +24,7 @@
Encoding="ISO-8859-1"
windowtitle="DL-Learner Javadoc">
<taglet name="org.dllearner.utilities.ToDoTaglet" path="classes" />
+ <link href="http://java.sun.com/javase/6/docs/api/"/>
</javadoc>
</target>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-27 16:07:10
|
Revision: 62
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=62&view=rev
Author: jenslehmann
Date: 2007-08-27 04:37:23 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
fixed some warnings
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/server/ClientState.java
Modified: trunk/src/dl-learner/org/dllearner/server/ClientState.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/ClientState.java 2007-08-27 10:33:05 UTC (rev 61)
+++ trunk/src/dl-learner/org/dllearner/server/ClientState.java 2007-08-27 11:37:23 UTC (rev 62)
@@ -116,10 +116,10 @@
System.out.println("selectInstancesForAConcept: "+Concept);
// add all positives
- Set positives=rs.retrieval(SelectedConcept);
- Iterator i = positives.iterator();
+ Set<Individual> positives=rs.retrieval(SelectedConcept);
+ Iterator<Individual> i = positives.iterator();
while(i.hasNext()){
- indtmp=(Individual)i.next();
+ indtmp=i.next();
p("added "+indtmp.getName()+" to positives");
al.add("added "+indtmp.getName()+" to positives");
positiveExamples.add(indtmp);
@@ -223,8 +223,8 @@
}
//find All other Instances concepts
- Set otherInstances=rs.getIndividuals();
- Iterator it=otherInstances.iterator();
+ Set<Individual> otherInstances=rs.getIndividuals();
+ Iterator<Individual> it=otherInstances.iterator();
while(it.hasNext()){
indtmp=(Individual)it.next();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-27 16:04:33
|
Revision: 60
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=60&view=rev
Author: jenslehmann
Date: 2007-08-27 03:18:46 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
added DL-Learner logo
Added Paths:
-----------
trunk/resources/logos/D.png
trunk/resources/logos/D.svg
trunk/resources/logos/dl-learner-big.jpg
trunk/resources/logos/dl-learner.gif
trunk/resources/logos/dl-learner.jpg
trunk/resources/logos/dl-learner.psd
trunk/resources/logos/rdf_flyer.svg
Added: trunk/resources/logos/D.png
===================================================================
(Binary files differ)
Property changes on: trunk/resources/logos/D.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/resources/logos/D.svg
===================================================================
--- trunk/resources/logos/D.svg (rev 0)
+++ trunk/resources/logos/D.svg 2007-08-27 10:18:46 UTC (rev 60)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xml:space="preserve"
+ version="1.1"
+ overflow="visible"
+ viewBox="0 0 94.332 101.883"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ width="210mm"
+ height="297mm"
+ sodipodi:docname="d.svg"
+ sodipodi:docbase="/home/jl/promotion/dl-learner-svn/trunk/resources/logos"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:modified="true"><metadata
+ id="metadata27"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs25" /><sodipodi:namedview
+ inkscape:window-height="951"
+ inkscape:window-width="1280"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:zoom="0.71838385"
+ inkscape:cx="372.04724"
+ inkscape:cy="562.51459"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:current-layer="svg2" />
+ <g
+ shape-rendering="geometricPrecision"
+ text-rendering="geometricPrecision"
+ image-rendering="optimizeQuality"
+ id="g4"
+ transform="matrix(-1,0,0,1,94.331028,0)">
+ <path
+ d="M 84.45,66.836 C 83.814,66.499 83.166,66.212 82.514,65.957 L 82.98,65.919 C 82.98,65.919 78.829,64.081 78.466,50.739 C 78.107,37.395 82.423,35.119 82.423,35.119 L 81.803,35.146 C 85.064,33.473 87.869,30.83 89.72,27.342 C 94.543,18.27 91.092,7.001 82.018,2.177 C 72.94,-2.641 61.674,0.802 56.854,9.883 C 54.872,13.608 53.956057,18.052943 54.582057,21.918943 L 59.6642,6.5928717 C 59.6642,6.5928717 52.286572,7.5524999 40.935572,14.5985 C 29.586572,21.6485 18.819486,35.256229 18.819486,35.256229 L 29.910243,40.324486 C 29.585243,40.123486 26.803643,37.624357 26.464643,37.447357 C 17.386643,32.623357 7,35.188 2.178,44.266 C -2.642,53.343 0.806,64.607 9.881,69.433 C 16.647,73.024 22.683814,68.493571 28.304814,63.989571 L 20.418072,69.166771 C 20.418072,69.166771 24.726543,76.532528 36.634543,82.925528 C 46.034543,87.969528 64.195328,95.560599 62.0802,90.889157 C 61.8342,97.782157 76.015486,101.54314 68.2213,98.4667 C 77.2963,103.2917 87.33,101.077 92.15,92.001 C 96.974,82.926 93.528,71.656 84.45,66.836 z M 60.289514,76.870271 C 58.785514,77.402271 52.017914,78.873628 42.971914,74.022628 C 33.174914,68.762628 28.015014,60.309786 31.507914,57.931957 C 32.705743,52.626058 31.910857,50.676114 31.461386,48.588699 L 28.874315,41.619842 C 28.874315,41.619842 29.311614,36.287015 40.521614,29.326015 C 50.554614,23.098015 59.880343,26.984086 62.141114,33.132643 C 64.391782,34.943023 65.195647,35.359039 68.025,36.466 C 69.405,37.78 71.945,41.511 72.209,51.32 C 72.479,61.203 69.575,65.014 67.992,66.362 C 66.362,67.1 61.659514,75.673271 60.289514,76.870271 z "
+ id="path6"
+ style="fill:#0c479c"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccc" />
+ <g
+ id="g8">
+ <path
+ d="M 62.239,8.1 C 56.824,14.023 56.71,22.736 61.927,27.666 C 59.348,25.183 59.404,20.015 62.01,15.069 C 62.345,14.626 63.316,13.579 64.735,14.055 C 64.878,14.104 64.972,14.117 65.027,14.108 C 65.348,14.177 65.677,14.218 66.017,14.203 C 68.172,14.105 69.839,12.282 69.742,10.126 C 69.698,9.159 69.297,8.303 68.677,7.646 C 73.679,4.369 79.419,3.994 81.771,6.142 L 81.861,6.148 C 76.488,1.242 67.705,2.119 62.239,8.1 z "
+ id="path10"
+ style="fill:#ffffff" />
+ </g>
+ <g
+ id="g12">
+ <path
+ d="M 7.632,62.845 C 7.586,62.798 7.539,62.743 7.491,62.697 C 7.521,62.728 7.55,62.766 7.586,62.799 L 7.632,62.845 z "
+ id="path14"
+ style="fill:#ffffff" />
+ <path
+ d="M 7.805,43.13 C 2.389,49.054 2.276,57.765 7.492,62.696 C 4.914,60.212 4.969,55.044 7.575,50.098 C 7.911,49.654 8.883,48.608 10.302,49.084 C 10.443,49.133 10.538,49.145 10.594,49.138 C 10.915,49.207 11.245,49.248 11.584,49.233 C 13.74,49.134 15.406,47.311 15.309,45.157 C 15.264,44.19 14.864,43.333 14.246,42.677 C 19.245,39.401 24.986,39.023 27.338,41.172 L 27.427,41.18 C 22.054,36.271 13.269,37.147 7.805,43.13 z "
+ id="path16"
+ style="fill:#ffffff" />
+ </g>
+ <g
+ id="g18">
+ <path
+ d="M 65.256,92.504 C 65.209,92.456 65.162,92.402 65.115,92.356 C 65.144,92.387 65.174,92.425 65.209,92.457 L 65.256,92.504 z "
+ id="path20"
+ style="fill:#ffffff" />
+ <path
+ d="M 65.428,72.786 C 60.012,78.712 59.899,87.425 65.115,92.355 C 62.535,89.872 62.592,84.702 65.197,79.758 C 65.533,79.313 66.504,78.268 67.924,78.744 C 68.067,78.791 68.159,78.805 68.216,78.797 C 68.536,78.866 68.867,78.907 69.206,78.893 C 71.36,78.793 73.026,76.969 72.929,74.813 C 72.885,73.847 72.484,72.991 71.866,72.334 C 76.866,69.059 82.605,68.682 84.959,70.83 L 85.047,70.837 C 79.677,65.93 70.891,66.807 65.428,72.786 z "
+ id="path22"
+ style="fill:#ffffff" />
+ </g>
+ </g>
+</svg>
\ No newline at end of file
Added: trunk/resources/logos/dl-learner-big.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/resources/logos/dl-learner-big.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/resources/logos/dl-learner.gif
===================================================================
(Binary files differ)
Property changes on: trunk/resources/logos/dl-learner.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/resources/logos/dl-learner.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/resources/logos/dl-learner.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/resources/logos/dl-learner.psd
===================================================================
(Binary files differ)
Property changes on: trunk/resources/logos/dl-learner.psd
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/resources/logos/rdf_flyer.svg
===================================================================
--- trunk/resources/logos/rdf_flyer.svg (rev 0)
+++ trunk/resources/logos/rdf_flyer.svg 2007-08-27 10:18:46 UTC (rev 60)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns='http://www.w3.org/2000/svg' xml:space='preserve' version='1.1' overflow='visible' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 94.332 101.883'>
+ <g shape-rendering='geometricPrecision' text-rendering='geometricPrecision' image-rendering='optimizeQuality'>
+ <path d='M84.45,66.836c-0.636-0.337-1.284-0.624-1.936-0.879l0.466-0.038c0,0-4.151-1.838-4.514-15.18 c-0.359-13.344,3.957-15.62,3.957-15.62l-0.62,0.027c3.261-1.673,6.066-4.316,7.917-7.804c4.823-9.072,1.372-20.341-7.702-25.165 C72.94-2.641,61.674,0.802,56.854,9.883c-1.982,3.725-2.545,7.817-1.919,11.683l-0.212-0.326c0,0,1.093,4.842-10.258,11.888 c-11.349,7.05-16.469,3.54-16.469,3.54l0.326,0.48c-0.325-0.201-0.636-0.406-0.975-0.583C18.269,31.741,7,35.188,2.178,44.266 c-4.82,9.077-1.372,20.341,7.703,25.167c6.766,3.591,14.744,2.59,20.365-1.914l-0.122,0.236c0,0,4.132-3.399,16.04,2.994 c9.4,5.044,10.796,9.988,10.975,11.846c-0.246,6.893,3.347,13.654,9.847,17.107c9.075,4.825,20.344,1.375,25.164-7.701 C96.974,82.926,93.528,71.656,84.45,66.836z M63.466,69.282c-1.504,0.532-5.801,1.121-14.847-3.73 c-9.797-5.26-11.251-9.654-11.464-10.973c0.139-1.6,0.05-3.197-0.223-4.755l0.06,0.09c0,0-0.798-4.274,10.412-11.235 c10.033-6.228,14.594-4.989,15.443-4.664c0.546,0.371,1.112,0.717,1.706,1.033c1.129,0.6,2.293,1.07,3.472,1.418 c1.38,1.314,3.92,5.045,4.184,14.854c0.27,9.883-2.634,13.694-4.217,15.042C66.362,67.1,64.836,68.085,63.466,69.282z' fill='#0C479C'/>
+ <g>
+ <path d='M62.239,8.1c-5.415,5.923-5.529,14.636-0.312,19.566c-2.579-2.483-2.523-7.651,0.083-12.597 c0.335-0.443,1.306-1.49,2.725-1.014c0.143,0.049,0.237,0.062,0.292,0.053c0.321,0.069,0.65,0.11,0.99,0.095 c2.155-0.098,3.822-1.921,3.725-4.077c-0.044-0.967-0.445-1.823-1.065-2.48c5.002-3.277,10.742-3.652,13.094-1.504l0.09,0.006 C76.488,1.242,67.705,2.119,62.239,8.1z' fill='#FFFFFF'/>
+ </g>
+ <g>
+ <path d='M7.632,62.845c-0.046-0.047-0.093-0.102-0.141-0.148c0.03,0.031,0.059,0.069,0.095,0.102L7.632,62.845z' fill='#FFFFFF'/>
+ <path d='M7.805,43.13c-5.416,5.924-5.529,14.635-0.313,19.566c-2.578-2.484-2.523-7.652,0.083-12.598 c0.336-0.444,1.308-1.49,2.727-1.014c0.141,0.049,0.236,0.061,0.292,0.054c0.321,0.069,0.651,0.11,0.99,0.095 c2.156-0.099,3.822-1.922,3.725-4.076c-0.045-0.967-0.445-1.824-1.063-2.48c4.999-3.276,10.74-3.654,13.092-1.505l0.089,0.008 C22.054,36.271,13.269,37.147,7.805,43.13z' fill='#FFFFFF'/>
+ </g>
+ <g>
+ <path d='M65.256,92.504c-0.047-0.048-0.094-0.102-0.141-0.148c0.029,0.031,0.059,0.069,0.094,0.101L65.256,92.504z' fill='#FFFFFF'/>
+ <path d='M65.428,72.786c-5.416,5.926-5.529,14.639-0.313,19.569c-2.58-2.483-2.523-7.653,0.082-12.597 c0.336-0.445,1.307-1.49,2.727-1.014c0.143,0.047,0.235,0.061,0.292,0.053c0.32,0.069,0.651,0.11,0.99,0.096 c2.154-0.1,3.82-1.924,3.723-4.08c-0.044-0.966-0.445-1.822-1.063-2.479c5-3.275,10.739-3.652,13.093-1.504l0.088,0.007 C79.677,65.93,70.891,66.807,65.428,72.786z' fill='#FFFFFF'/>
+ </g>
+ </g>
+</svg>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ku...@us...> - 2007-08-27 15:51:14
|
Revision: 68
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=68&view=rev
Author: kurzum
Date: 2007-08-27 08:51:12 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
warnings
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/server/ClientState.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWSStart.java
trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java
Modified: trunk/src/dl-learner/org/dllearner/server/ClientState.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/ClientState.java 2007-08-27 15:49:25 UTC (rev 67)
+++ trunk/src/dl-learner/org/dllearner/server/ClientState.java 2007-08-27 15:51:12 UTC (rev 68)
@@ -110,7 +110,7 @@
AtomicConcept SelectedConcept=new AtomicConcept(Concept);
ArrayList<String> al=new ArrayList<String>();
Individual indtmp=null;
- Set<AtomicConcept> ConceptSet=null;
+ //Set<AtomicConcept> ConceptSet=null;
AtomicConcept ac=null;
@@ -206,8 +206,8 @@
AtomicConcept SelectedConcept=new AtomicConcept(Concept);
ArrayList<String> ret=new ArrayList<String>();
Individual indtmp=null;
- Set<AtomicConcept> ConceptSet=null;
- AtomicConcept ac=null;
+ //Set<AtomicConcept> ConceptSet=null;
+ //AtomicConcept ac=null;
Random r=new Random();
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWSStart.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWSStart.java 2007-08-27 15:49:25 UTC (rev 67)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWSStart.java 2007-08-27 15:51:12 UTC (rev 68)
@@ -19,9 +19,9 @@
public static void main(String[] args) {
//String url = "http://139.18.114.78:8181/services";
- String url="";
+ /*String url="";
if (args.length > 0)
- url = args[0];
+ url = args[0];*/
try{
InetSocketAddress isa=new InetSocketAddress("localhost",8181);
Modified: trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java 2007-08-27 15:49:25 UTC (rev 67)
+++ trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java 2007-08-27 15:51:12 UTC (rev 68)
@@ -34,6 +34,10 @@
}
+ /**
+ * @override
+ */
+ @Override
public void run(){
try{
c.setStatus("still running");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ku...@us...> - 2007-08-27 15:49:30
|
Revision: 67
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=67&view=rev
Author: kurzum
Date: 2007-08-27 08:49:25 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
warning
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIDIGConverter.java
Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIDIGConverter.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIDIGConverter.java 2007-08-27 15:20:20 UTC (rev 66)
+++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIDIGConverter.java 2007-08-27 15:49:25 UTC (rev 67)
@@ -16,7 +16,6 @@
import org.dllearner.OntologyFileFormat;
import org.semanticweb.owl.apibinding.OWLManager;
-import org.semanticweb.owl.model.OWLOntology;
import org.semanticweb.owl.model.OWLOntologyCreationException;
import org.semanticweb.owl.model.OWLOntologyManager;
import org.w3c.dom.Document;
@@ -33,8 +32,9 @@
/* Load an ontology from a physical URI */
OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
- OWLOntology ontology = manager.loadOntologyFromPhysicalURI(file.toURI());
-
+ //the next function could return an ontology
+ manager.loadOntologyFromPhysicalURI(file.toURI());
+
DIGTranslatorImpl dig=new DIGTranslatorImpl(manager);
Document doc=dig.createTellsDocument(kbURI.toString());
dig.translateToDIG(manager.getOntologies(), doc, doc.getDocumentElement() );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-27 15:22:18
|
Revision: 66
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=66&view=rev
Author: jenslehmann
Date: 2007-08-27 08:20:20 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
recommit due to Subclipse problems
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/parser/DLLearner.java
trunk/src/dl-learner/org/dllearner/parser/DLLearnerConstants.java
trunk/src/dl-learner/org/dllearner/parser/DLLearnerTokenManager.java
trunk/src/dl-learner/org/dllearner/parser/DLLearnerTreeConstants.java
Modified: trunk/src/dl-learner/org/dllearner/parser/DLLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/DLLearner.java 2007-08-27 15:13:33 UTC (rev 65)
+++ trunk/src/dl-learner/org/dllearner/parser/DLLearner.java 2007-08-27 15:20:20 UTC (rev 66)
@@ -22,8 +22,8 @@
import org.dllearner.ConfigurationOption;
import org.dllearner.utilities.*;
-@SuppressWarnings({"all"})
-public class DLLearner/*@bgen(jjtree)*/implements DLLearnerTreeConstants, DLLearnerConstants {/*@bgen(jjtree)*/
+// @SuppressWarnings({"all"})
+public @SuppressWarnings("all") class DLLearner/*@bgen(jjtree)*/implements DLLearnerTreeConstants, DLLearnerConstants {/*@bgen(jjtree)*/
protected static JJTDLLearnerState jjtree = new JJTDLLearnerState();
private static ConceptComparator conceptComparator = new ConceptComparator();
// hier wird Parse-Fehler angezeigt, obwohl eigentlich alles stimmt??
@@ -2027,8 +2027,8 @@
}
public DLLearner(java.io.InputStream stream, String encoding) {
if (jj_initialized_once) {
- System.out.println("ERROR: Second call to constructor of static parser. You must");
- System.out.println(" either use ReInit() or set the JavaCC option STATIC to false");
+ System.out.println("ERROR: Second call to constructor of static parser. ");
+ System.out.println(" You must either use ReInit() or set the JavaCC option STATIC to false");
System.out.println(" during parser generation.");
throw new Error();
}
@@ -2058,8 +2058,8 @@
public DLLearner(java.io.Reader stream) {
if (jj_initialized_once) {
- System.out.println("ERROR: Second call to constructor of static parser. You must");
- System.out.println(" either use ReInit() or set the JavaCC option STATIC to false");
+ System.out.println("ERROR: Second call to constructor of static parser. ");
+ System.out.println(" You must either use ReInit() or set the JavaCC option STATIC to false");
System.out.println(" during parser generation.");
throw new Error();
}
@@ -2086,8 +2086,8 @@
public DLLearner(DLLearnerTokenManager tm) {
if (jj_initialized_once) {
- System.out.println("ERROR: Second call to constructor of static parser. You must");
- System.out.println(" either use ReInit() or set the JavaCC option STATIC to false");
+ System.out.println("ERROR: Second call to constructor of static parser. ");
+ System.out.println(" You must either use ReInit() or set the JavaCC option STATIC to false");
System.out.println(" during parser generation.");
throw new Error();
}
@@ -2218,9 +2218,6 @@
static public ParseException generateParseException() {
jj_expentries.removeAllElements();
boolean[] la1tokens = new boolean[39];
- for (int i = 0; i < 39; i++) {
- la1tokens[i] = false;
- }
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -2249,7 +2246,7 @@
jj_add_error_token(0, 0);
int[][] exptokseq = new int[jj_expentries.size()][];
for (int i = 0; i < jj_expentries.size(); i++) {
- exptokseq[i] = (int[])jj_expentries.elementAt(i);
+ exptokseq[i] = jj_expentries.elementAt(i);
}
return new ParseException(token, exptokseq, tokenImage);
}
Modified: trunk/src/dl-learner/org/dllearner/parser/DLLearnerConstants.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/DLLearnerConstants.java 2007-08-27 15:13:33 UTC (rev 65)
+++ trunk/src/dl-learner/org/dllearner/parser/DLLearnerConstants.java 2007-08-27 15:20:20 UTC (rev 66)
@@ -1,7 +1,7 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. DLLearnerConstants.java */
package org.dllearner.parser;
-public interface DLLearnerConstants {
+public @SuppressWarnings("all") interface DLLearnerConstants {
int EOF = 0;
int SINGLE_LINE_COMMENT = 5;
Modified: trunk/src/dl-learner/org/dllearner/parser/DLLearnerTokenManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/DLLearnerTokenManager.java 2007-08-27 15:13:33 UTC (rev 65)
+++ trunk/src/dl-learner/org/dllearner/parser/DLLearnerTokenManager.java 2007-08-27 15:20:20 UTC (rev 66)
@@ -18,8 +18,7 @@
import org.dllearner.ConfigurationOption;
import org.dllearner.utilities.*;
-@SuppressWarnings({"all"})
-public class DLLearnerTokenManager implements DLLearnerConstants
+public @SuppressWarnings("all") class DLLearnerTokenManager implements DLLearnerConstants
{
public static java.io.PrintStream debugStream = System.out;
public static void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
Modified: trunk/src/dl-learner/org/dllearner/parser/DLLearnerTreeConstants.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/DLLearnerTreeConstants.java 2007-08-27 15:13:33 UTC (rev 65)
+++ trunk/src/dl-learner/org/dllearner/parser/DLLearnerTreeConstants.java 2007-08-27 15:20:20 UTC (rev 66)
@@ -2,7 +2,7 @@
package org.dllearner.parser;
-public interface DLLearnerTreeConstants
+public @SuppressWarnings("all") interface DLLearnerTreeConstants
{
public int JJTSTART = 0;
public int JJTCONFOPTION = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ku...@us...> - 2007-08-27 15:14:21
|
Revision: 65
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=65&view=rev
Author: kurzum
Date: 2007-08-27 08:13:33 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
fixed the warnings
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/server/ClientState.java
trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java
trunk/src/dl-learner/org/dllearner/server/exceptions/ClientNotKnownException.java
trunk/src/dl-learner/org/dllearner/server/exceptions/NoOntologySelectedException.java
trunk/src/dl-learner/org/dllearner/server/exceptions/OntologyURLNotValid.java
Modified: trunk/src/dl-learner/org/dllearner/server/ClientState.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/ClientState.java 2007-08-27 15:04:36 UTC (rev 64)
+++ trunk/src/dl-learner/org/dllearner/server/ClientState.java 2007-08-27 15:13:33 UTC (rev 65)
@@ -110,7 +110,7 @@
AtomicConcept SelectedConcept=new AtomicConcept(Concept);
ArrayList<String> al=new ArrayList<String>();
Individual indtmp=null;
- Set ConceptSet=null;
+ Set<AtomicConcept> ConceptSet=null;
AtomicConcept ac=null;
@@ -173,8 +173,8 @@
{
ac=superConcepts.get(jj);
p("next this: "+ac.getName());
- Set negatives=rs.retrieval(ac);
- Iterator i2 = negatives.iterator();
+ Set<Individual> negatives=rs.retrieval(ac);
+ Iterator<Individual> i2 = negatives.iterator();
indtmp=null;
while(i2.hasNext()){
@@ -206,15 +206,15 @@
AtomicConcept SelectedConcept=new AtomicConcept(Concept);
ArrayList<String> ret=new ArrayList<String>();
Individual indtmp=null;
- Set ConceptSet=null;
+ Set<AtomicConcept> ConceptSet=null;
AtomicConcept ac=null;
Random r=new Random();
System.out.println("selectAConcept: "+Concept);
// add all positives
- Set positives=rs.retrieval(SelectedConcept);
- Iterator i = positives.iterator();
+ Set<Individual> positives=rs.retrieval(SelectedConcept);
+ Iterator<Individual> i = positives.iterator();
while(i.hasNext()){
indtmp=(Individual)i.next();
p("added "+indtmp.getName()+" to positives");
@@ -242,9 +242,9 @@
public ArrayList<AtomicConcept> subsumesAll(AtomicConcept c){
- Set s=rs.getAtomicConcepts();
+ Set<AtomicConcept> s=rs.getAtomicConcepts();
ArrayList<AtomicConcept> ret=new ArrayList<AtomicConcept>();
- Iterator i=s.iterator();
+ Iterator<AtomicConcept> i=s.iterator();
while (i.hasNext()) {
AtomicConcept element = (AtomicConcept) i.next();
if(rs.subsumes(element, c))
@@ -257,7 +257,7 @@
}
public String[] getPositiveExamples(){
String[] ret=new String[positiveExamples.size()];
- Iterator i=positiveExamples.iterator();
+ Iterator<Individual> i=positiveExamples.iterator();
int a=0;
while (i.hasNext()){
ret[a++]=((Individual)i.next()).getName();
@@ -267,7 +267,7 @@
}
public String[] getNegativeExamples(){
String[] ret=new String[negativeExamples.size()];
- Iterator i=negativeExamples.iterator();
+ Iterator<Individual> i=negativeExamples.iterator();
int a=0;
while (i.hasNext()){
ret[a++]=((Individual)i.next()).getName();
@@ -278,7 +278,7 @@
public String[] getIgnoredConcepts() {
String[] ret=new String[ignoredConcept.size()];
- Iterator i=ignoredConcept.iterator();
+ Iterator<String> i=ignoredConcept.iterator();
int a=0;
while (i.hasNext()){
ret[a++]=((String)i.next());
@@ -334,7 +334,7 @@
SortedSet<Individual> s=rs.getIndividuals();
//System.out.println(s);
String[] ret=new String[s.size()];
- Iterator i=s.iterator();
+ Iterator<Individual> i=s.iterator();
int a=0;
while (i.hasNext()){
ret[a++]=((Individual)i.next()).getName();
@@ -491,8 +491,8 @@
}
public String[] getIndividualsForARole(String Role)throws NoOntologySelectedException{
- Map m=rs.getRoleMembers(new AtomicRole(Role));
- Set s=m.keySet();
+ Map<Individual,SortedSet<Individual>> m=rs.getRoleMembers(new AtomicRole(Role));
+ Set<Individual> s=m.keySet();
return SortedSet2StringListIndividuals(s);
}
@@ -521,10 +521,10 @@
//this.lm.notify();
}
- public String[] SortedSet2StringListIndividuals(Set s){
+ public String[] SortedSet2StringListIndividuals(Set<Individual> s){
String[] ret=new String[s.size()];
- Iterator i=s.iterator();
+ Iterator<Individual> i=s.iterator();
int a=0;
while (i.hasNext()){
ret[a++]=((Individual)i.next()).getName();
@@ -533,10 +533,10 @@
return ret;
}
- public String[] SortedSet2StringListConcepts(Set s){
+ public String[] SortedSet2StringListConcepts(Set<AtomicConcept> s){
String[] ret=new String[s.size()];
- Iterator i=s.iterator();
+ Iterator<AtomicConcept> i=s.iterator();
int a=0;
while (i.hasNext()){
ret[a++]=((AtomicConcept)i.next()).getName();
@@ -544,10 +544,10 @@
Arrays.sort(ret);
return ret;
}
- public String[] SortedSet2StringListRoles(Set s){
+ public String[] SortedSet2StringListRoles(Set<AtomicRole> s){
String[] ret=new String[s.size()];
- Iterator i=s.iterator();
+ Iterator<AtomicRole> i=s.iterator();
int a=0;
while (i.hasNext()){
ret[a++]=((AtomicRole)i.next()).getName();
Modified: trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java 2007-08-27 15:04:36 UTC (rev 64)
+++ trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java 2007-08-27 15:13:33 UTC (rev 65)
@@ -37,6 +37,7 @@
public void run(){
try{
c.setStatus("still running");
+ if(active);
active=true;
c.setStatus("running");
Modified: trunk/src/dl-learner/org/dllearner/server/exceptions/ClientNotKnownException.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/exceptions/ClientNotKnownException.java 2007-08-27 15:04:36 UTC (rev 64)
+++ trunk/src/dl-learner/org/dllearner/server/exceptions/ClientNotKnownException.java 2007-08-27 15:13:33 UTC (rev 65)
@@ -1,7 +1,8 @@
package org.dllearner.server.exceptions;
public class ClientNotKnownException extends Exception {
- String detail;
+ static final long serialVersionUID=100;
+ String detail;
public ClientNotKnownException (String message, String detail) {
super (message);
Modified: trunk/src/dl-learner/org/dllearner/server/exceptions/NoOntologySelectedException.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/exceptions/NoOntologySelectedException.java 2007-08-27 15:04:36 UTC (rev 64)
+++ trunk/src/dl-learner/org/dllearner/server/exceptions/NoOntologySelectedException.java 2007-08-27 15:13:33 UTC (rev 65)
@@ -1,7 +1,8 @@
package org.dllearner.server.exceptions;
public class NoOntologySelectedException extends Exception {
- String detail;
+ static final long serialVersionUID=101;
+ String detail;
public NoOntologySelectedException (String message, String detail) {
super (message);
Modified: trunk/src/dl-learner/org/dllearner/server/exceptions/OntologyURLNotValid.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/exceptions/OntologyURLNotValid.java 2007-08-27 15:04:36 UTC (rev 64)
+++ trunk/src/dl-learner/org/dllearner/server/exceptions/OntologyURLNotValid.java 2007-08-27 15:13:33 UTC (rev 65)
@@ -1,6 +1,7 @@
package org.dllearner.server.exceptions;
public class OntologyURLNotValid extends Exception {
+ static final long serialVersionUID=102;
String detail;
public OntologyURLNotValid (String message, String detail) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-27 15:04:43
|
Revision: 64
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=64&view=rev
Author: jenslehmann
Date: 2007-08-27 08:04:36 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
rebuild parser and fixed a number of warnings
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/ScoreThreeValued.java
trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java
trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java
trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparator.java
trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparator2.java
trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparatorStable.java
trunk/src/dl-learner/org/dllearner/dl/All.java
trunk/src/dl-learner/org/dllearner/dl/AtomicRole.java
trunk/src/dl-learner/org/dllearner/dl/Bottom.java
trunk/src/dl-learner/org/dllearner/dl/Concept.java
trunk/src/dl-learner/org/dllearner/dl/ConceptAssertion.java
trunk/src/dl-learner/org/dllearner/dl/Conjunction.java
trunk/src/dl-learner/org/dllearner/dl/Disjunction.java
trunk/src/dl-learner/org/dllearner/dl/Equality.java
trunk/src/dl-learner/org/dllearner/dl/Exists.java
trunk/src/dl-learner/org/dllearner/dl/FlatABox.java
trunk/src/dl-learner/org/dllearner/dl/FunctionalRoleAxiom.java
trunk/src/dl-learner/org/dllearner/dl/Inclusion.java
trunk/src/dl-learner/org/dllearner/dl/InverseRole.java
trunk/src/dl-learner/org/dllearner/dl/InverseRoleAxiom.java
trunk/src/dl-learner/org/dllearner/dl/KB.java
trunk/src/dl-learner/org/dllearner/dl/MultiConjunction.java
trunk/src/dl-learner/org/dllearner/dl/MultiDisjunction.java
trunk/src/dl-learner/org/dllearner/dl/Negation.java
trunk/src/dl-learner/org/dllearner/dl/RoleAssertion.java
trunk/src/dl-learner/org/dllearner/dl/SubRoleAxiom.java
trunk/src/dl-learner/org/dllearner/dl/SymmetricRoleAxiom.java
trunk/src/dl-learner/org/dllearner/dl/Top.java
trunk/src/dl-learner/org/dllearner/dl/TransitiveRoleAxiom.java
trunk/src/dl-learner/org/dllearner/parser/SimpleCharStream.java
trunk/src/dl-learner/org/dllearner/parser/SimpleNode.java
trunk/src/dl-learner/org/dllearner/parser/Token.java
trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/KAON2Reasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/SubsumptionHierarchy.java
trunk/src/dl-learner/org/dllearner/utilities/ConceptComparator.java
Modified: trunk/src/dl-learner/org/dllearner/ScoreThreeValued.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/ScoreThreeValued.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/ScoreThreeValued.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -124,10 +124,12 @@
errorRate = (double) errors/numberOfExamples;
}
+ @Override
public double getScore() {
return score;
}
+ @Override
public String toString() {
DecimalFormat df = new DecimalFormat("0.00");
String str = "";
Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -19,6 +19,7 @@
return 1;
}
+ @Override
public String toString() {
return "ADC";
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -88,6 +88,7 @@
return isTooWeak;
}
+ @Override
public String toString() {
String ret = concept.toString() + " [q:";
if(isTooWeak)
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparator.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparator.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -87,7 +87,9 @@
throw new RuntimeException("Cannot compare nodes, which have no evaluated quality or are too weak.");
}
+
// alle NodeComparators führen zur gleichen Ordnung
+ @Override
public boolean equals(Object o) {
return (o instanceof NodeComparator);
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparator2.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparator2.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparator2.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -53,6 +53,7 @@
throw new RuntimeException("Cannot compare nodes, which have no evaluated quality or are too weak.");
}
+ @Override
public boolean equals(Object o) {
return (o instanceof NodeComparator2);
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparatorStable.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparatorStable.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/NodeComparatorStable.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -43,6 +43,7 @@
}
// alle NodeComparators führen zur gleichen Ordnung
+ @Override
public boolean equals(Object o) {
return (o instanceof NodeComparatorStable);
}
Modified: trunk/src/dl-learner/org/dllearner/dl/All.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/All.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/All.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -84,6 +84,7 @@
}
*/
+ @Override
public String toString() {
return "ALL " + role + "." + children.get(0).toString();
}
Modified: trunk/src/dl-learner/org/dllearner/dl/AtomicRole.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/AtomicRole.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/AtomicRole.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -13,6 +13,7 @@
return 1;
}
+ @Override
public String toString() {
String name = getName();
String prefixToHide = Helper.findPrefixToHide(name);
Modified: trunk/src/dl-learner/org/dllearner/dl/Bottom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Bottom.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/Bottom.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -11,7 +11,7 @@
negSet = abox.top;
}
*/
-
+ @Override
public String toString() {
return "BOTTOM";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/Concept.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Concept.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/Concept.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -158,6 +158,7 @@
* werden dabei nicht mitgeklont, sondern nur parent und children.
*/
@SuppressWarnings("unchecked")
+ @Override
public Object clone() {
Concept node = null;
try {
Modified: trunk/src/dl-learner/org/dllearner/dl/ConceptAssertion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/ConceptAssertion.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/ConceptAssertion.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -22,6 +22,7 @@
return 1 + concept.getLength();
}
+ @Override
public String toString() {
return concept.toString() + "(" + individual + ")";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/Conjunction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Conjunction.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/Conjunction.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -20,6 +20,7 @@
addChild(c2);
}
+ @Override
public String toString() {
return "(" + children.get(0).toString() + " AND " + children.get(1).toString() + ")";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/Disjunction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Disjunction.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/Disjunction.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -19,6 +19,7 @@
addChild(c2);
}
+ @Override
public String toString() {
return "(" + children.get(0).toString() + " OR " + children.get(1).toString() + ")";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/Equality.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Equality.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/Equality.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -22,6 +22,7 @@
return 1 + concept1.getLength() + concept2.getLength();
}
+ @Override
public String toString() {
return concept1.toString() + " = " + concept2.toString();
}
Modified: trunk/src/dl-learner/org/dllearner/dl/Exists.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Exists.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/Exists.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -85,6 +85,7 @@
}
*/
+ @Override
public String toString() {
return "EXISTS " + role + "." + children.get(0).toString();
}
Modified: trunk/src/dl-learner/org/dllearner/dl/FlatABox.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/FlatABox.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/FlatABox.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -76,6 +76,7 @@
return (String) roleArray[nr];
}
+ @Override
public String toString() {
String output = "";
output += "domain: " + domain.toString() + "\n";
Modified: trunk/src/dl-learner/org/dllearner/dl/FunctionalRoleAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/FunctionalRoleAxiom.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/FunctionalRoleAxiom.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -16,6 +16,7 @@
return 1 + role.getLength();
}
+ @Override
public String toString() {
return "Functional(" + role.toString() + ")";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/Inclusion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Inclusion.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/Inclusion.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -22,6 +22,7 @@
return 1 + subConcept.getLength() + superConcept.getLength();
}
+ @Override
public String toString() {
return subConcept.toString() + " SUBCONCEPTOF " + superConcept.toString();
}
Modified: trunk/src/dl-learner/org/dllearner/dl/InverseRole.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/InverseRole.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/InverseRole.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -22,6 +22,7 @@
return 2;
}
+ @Override
public String toString() {
return getName() + "-";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/InverseRoleAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/InverseRoleAxiom.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/InverseRoleAxiom.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -22,6 +22,7 @@
return 1 + role.getLength() + inverseRole.getLength();
}
+ @Override
public String toString() {
return "Inverse(" + inverseRole + "," + role.toString() + ")";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/KB.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/KB.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/KB.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -156,6 +156,7 @@
return length;
}
+ @Override
public String toString() {
String str = "TBox["+tbox.size()+"]:\n";
for(Axiom a : tbox)
Modified: trunk/src/dl-learner/org/dllearner/dl/MultiConjunction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/MultiConjunction.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/MultiConjunction.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -33,6 +33,7 @@
return length + children.size() - 1;
}
+ @Override
public String toString() {
if(children.size()==0)
return "EMPTY_AND";
Modified: trunk/src/dl-learner/org/dllearner/dl/MultiDisjunction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/MultiDisjunction.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/MultiDisjunction.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -35,6 +35,7 @@
return length + children.size() - 1;
}
+ @Override
public String toString() {
if(children.size()==0)
return "EMPTY_OR";
Modified: trunk/src/dl-learner/org/dllearner/dl/Negation.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Negation.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/Negation.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -16,6 +16,7 @@
addChild(c);
}
+ @Override
public String toString() {
return "(NOT " +children.get(0).toString() + ")";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/RoleAssertion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/RoleAssertion.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/RoleAssertion.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -28,6 +28,7 @@
return 2 + role.getLength();
}
+ @Override
public String toString() {
return role.toString() + "(" + individual1 + "," + individual2 +")";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/SubRoleAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/SubRoleAxiom.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/SubRoleAxiom.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -22,6 +22,7 @@
return 1 + role.getLength() + subRole.getLength();
}
+ @Override
public String toString() {
return "Subrole(" + subRole + "," + role.toString() + ")";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/SymmetricRoleAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/SymmetricRoleAxiom.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/SymmetricRoleAxiom.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -16,6 +16,7 @@
return 1 + role.getLength();
}
+ @Override
public String toString() {
return "Symmetric(" + role.toString() + ")";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/Top.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Top.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/Top.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -12,6 +12,7 @@
}
*/
+ @Override
public String toString() {
return "TOP";
}
Modified: trunk/src/dl-learner/org/dllearner/dl/TransitiveRoleAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/TransitiveRoleAxiom.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/dl/TransitiveRoleAxiom.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -16,6 +16,7 @@
return role;
}
+ @Override
public String toString() {
return "Transitive(" + role.toString() + ")";
}
Modified: trunk/src/dl-learner/org/dllearner/parser/SimpleCharStream.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/SimpleCharStream.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/parser/SimpleCharStream.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -6,6 +6,7 @@
* contain only ASCII characters (without unicode processing).
*/
+@SuppressWarnings("all")
public class SimpleCharStream
{
public static final boolean staticFlag = true;
Modified: trunk/src/dl-learner/org/dllearner/parser/SimpleNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/SimpleNode.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/parser/SimpleNode.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -2,6 +2,7 @@
package org.dllearner.parser;
+@SuppressWarnings("all")
public class SimpleNode implements Node {
protected Node parent;
protected Node[] children;
Modified: trunk/src/dl-learner/org/dllearner/parser/Token.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/Token.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/parser/Token.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -4,7 +4,7 @@
/**
* Describes the input token stream.
*/
-
+@SuppressWarnings("all")
public class Token {
/**
Modified: trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -560,6 +560,7 @@
return resultsSet;
}
+ @Override
public boolean instanceCheck(Concept concept, Individual individual) {
String instanceCheckDIG = asksPrefix;
instanceCheckDIG += "<instance id= \"query_instance\">";
@@ -570,6 +571,7 @@
return parseBooleanAnswer(instanceCheckDIG);
}
+ @Override
public Set<Individual> instanceCheck(Concept concept, Set<Individual> individuals) {
String instanceCheckDIG = asksPrefix;
int id = 0;
@@ -596,6 +598,7 @@
return returnSet;
}
+ @Override
public SortedSet<Individual> retrieval(Concept concept) {
String retrievalDIG = asksPrefix;
@@ -614,6 +617,7 @@
}
// ToDo: gibt momentan nur einen Wert bei äquivalenten Klassen aus
+ @Override
public Set<AtomicConcept> getConcepts(Individual individual) {
String typesDIG = asksPrefix;
typesDIG += "<types id=\"query_types\">";
@@ -646,6 +650,7 @@
// keine getter um ein IndividualPairSet zu finden; in der XSD-Datei ist
// das in Responsegroup auch nicht definiert
// => deswegen wird hier die XML-Cursor-API verwendet
+ @Override
public Map<Individual, SortedSet<Individual>> getRoleMembers(AtomicRole atomicRole) {
String relatedIndividualsDIG = asksPrefix;
relatedIndividualsDIG += "<relatedIndividuals id=\"related_individuals\">";
@@ -691,7 +696,7 @@
return resultMap;
}
-
+ @Override
public boolean isSatisfiable() {
String satisfiableDIG = asksPrefix;
// wenn Top erfüllbar ist, dann gibt es auch ein Modell für die KB
Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -44,15 +44,18 @@
return ReasonerType.FAST_RETRIEVAL;
}
+ @Override
public SortedSetTuple<Individual> doubleRetrieval(Concept concept) {
return Helper.getIndividualTuple(fastRetrieval.calculateSets(concept));
}
+ @Override
public SortedSetTuple<Individual> doubleRetrieval(Concept concept, Concept adc) {
SortedSetTuple<String> adcSet = fastRetrieval.calculateSets(adc);
return Helper.getIndividualTuple(fastRetrieval.calculateSetsADC(concept, adcSet));
}
+ @Override
public SortedSet<Individual> retrieval(Concept concept) {
return Helper.getIndividualSet(fastRetrieval.calculateSets(concept).getPosSet());
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/KAON2Reasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/KAON2Reasoner.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/reasoning/KAON2Reasoner.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -273,6 +273,7 @@
subsumptionHierarchy = new org.dllearner.reasoning.SubsumptionHierarchy(atomicConcepts, subsumptionHierarchyUp, subsumptionHierarchyDown);
}
+ @Override
public SortedSet<Individual> retrieval(Concept c) {
SortedSet<Individual> result = new TreeSet<Individual>();
Description d = getKAON2Description(c);
@@ -358,6 +359,7 @@
throw new Error("Subsumption Error in KAON2.");
}
+ @Override
public boolean isSatisfiable() {
try {
return kaon2Reasoner.isSatisfiable();
@@ -396,6 +398,7 @@
}
*/
+ @Override
public org.dllearner.reasoning.SubsumptionHierarchy getSubsumptionHierarchy() {
return subsumptionHierarchy;
}
@@ -428,6 +431,7 @@
}
}
+ @Override
public Map<org.dllearner.dl.Individual, SortedSet<org.dllearner.dl.Individual>> getRoleMembers(AtomicRole atomicRole) {
Map<org.dllearner.dl.Individual, SortedSet<org.dllearner.dl.Individual>> returnMap = new TreeMap<org.dllearner.dl.Individual, SortedSet<org.dllearner.dl.Individual>>();
Modified: trunk/src/dl-learner/org/dllearner/reasoning/SubsumptionHierarchy.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/SubsumptionHierarchy.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/reasoning/SubsumptionHierarchy.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -97,6 +97,7 @@
subsumptionHierarchyUp = hierarchyUpNew;
}
+ @Override
public String toString() {
return toString(false);
}
Modified: trunk/src/dl-learner/org/dllearner/utilities/ConceptComparator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/ConceptComparator.java 2007-08-27 11:41:10 UTC (rev 63)
+++ trunk/src/dl-learner/org/dllearner/utilities/ConceptComparator.java 2007-08-27 15:04:36 UTC (rev 64)
@@ -156,6 +156,7 @@
// TODO: Vergleich zwischen ConceptComparators: immer identisch
// (testen, ob das bessere Performance bringt)
+ @Override
public boolean equals(Object o) {
return (o instanceof ConceptComparator);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-27 13:41:54
|
Revision: 55
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=55&view=rev
Author: jenslehmann
Date: 2007-08-25 01:43:30 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
add obtaining the role hierarchy to reasoner tasks (first step to role hierarchy support in refinement based learner)
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/reasoning/AbstractReasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/Reasoner.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java
Modified: trunk/src/dl-learner/org/dllearner/reasoning/AbstractReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/AbstractReasoner.java 2007-08-24 14:35:02 UTC (rev 54)
+++ trunk/src/dl-learner/org/dllearner/reasoning/AbstractReasoner.java 2007-08-25 08:43:30 UTC (rev 55)
@@ -90,6 +90,10 @@
throw new ReasoningMethodUnsupportedException();
}
+ public RoleHierarchy getRoleHierarchy() throws ReasoningMethodUnsupportedException {
+ throw new ReasoningMethodUnsupportedException();
+ }
+
public Set<AtomicConcept> getConcepts(Individual i) throws ReasoningMethodUnsupportedException {
throw new ReasoningMethodUnsupportedException();
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/Reasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/Reasoner.java 2007-08-24 14:35:02 UTC (rev 54)
+++ trunk/src/dl-learner/org/dllearner/reasoning/Reasoner.java 2007-08-25 08:43:30 UTC (rev 55)
@@ -40,6 +40,8 @@
public SubsumptionHierarchy getSubsumptionHierarchy() throws ReasoningMethodUnsupportedException;
+ public RoleHierarchy getRoleHierarchy() throws ReasoningMethodUnsupportedException;
+
public SortedSet<Individual> retrieval(Concept concept) throws ReasoningMethodUnsupportedException;
public Map<Individual, SortedSet<Individual>> getRoleMembers(AtomicRole atomicRole) throws ReasoningMethodUnsupportedException;
Added: trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java 2007-08-25 08:43:30 UTC (rev 55)
@@ -0,0 +1,46 @@
+/**
+ * Copyright (C) 2007, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.reasoning;
+
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.dllearner.dl.AtomicConcept;
+import org.dllearner.dl.AtomicRole;
+import org.dllearner.dl.Concept;
+import org.dllearner.utilities.RoleComparator;
+
+/**
+ * Represents a hierarchy of roles.
+ *
+ * @author Jens Lehmann
+ *
+ */
+public class RoleHierarchy {
+
+ RoleComparator rc = new RoleComparator();
+
+ public RoleHierarchy(Set<AtomicRole> atomicRoles, TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyUp , TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyDown) {
+
+
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-26 12:07:40
|
Revision: 59
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=59&view=rev
Author: jenslehmann
Date: 2007-08-25 09:10:25 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
added ignore flag to log directory:
in the future the log directory should be used for all kinds of logging actions
(search trees, DIG protocol etc.)
small improvement in Javadoc build script
Modified Paths:
--------------
trunk/javadoc.xml
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- .settings
.project
.classpath
classes
+ .settings
.project
.classpath
classes
log
Modified: trunk/javadoc.xml
===================================================================
--- trunk/javadoc.xml 2007-08-25 16:04:07 UTC (rev 58)
+++ trunk/javadoc.xml 2007-08-25 16:10:25 UTC (rev 59)
@@ -20,7 +20,7 @@
use="true"
version="true"
linksource="true"
- bottom="DL-Learner is licenced under the terms of the GNU General Public License.<br />Copyright &#169; 2007 Jens Lehmann"
+ bottom="<img style='float:right' src='http://sflogo.sourceforge.net/sflogo.php?group_id=203619&type=1' width='88' height='31' border='0' alt='SourceForge.net Logo' /> DL-Learner is licenced under the terms of the GNU General Public License.<br />Copyright &#169; 2007 Jens Lehmann"
Encoding="ISO-8859-1"
windowtitle="DL-Learner Javadoc">
<taglet name="org.dllearner.utilities.ToDoTaglet" path="classes" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-26 11:10:15
|
Revision: 56
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=56&view=rev
Author: jenslehmann
Date: 2007-08-25 09:01:51 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
fixed father example
Modified Paths:
--------------
trunk/examples/father.conf
Modified: trunk/examples/father.conf
===================================================================
--- trunk/examples/father.conf 2007-08-25 08:43:30 UTC (rev 55)
+++ trunk/examples/father.conf 2007-08-25 16:01:51 UTC (rev 56)
@@ -27,8 +27,6 @@
showInternalKB = true;
showSubsumptionHierarchy = true;
-refinement.ignoredConcepts = { father };
-
/** background knowledge ***/
BOTTOM = (male AND female).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-26 11:09:13
|
Revision: 58
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=58&view=rev
Author: jenslehmann
Date: 2007-08-25 09:04:07 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
several changes to enable role hierarchy DIG reasoning
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/Main.java
trunk/src/dl-learner/org/dllearner/reasoning/AbstractReasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/Reasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java
Modified: trunk/src/dl-learner/org/dllearner/Main.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/Main.java 2007-08-25 16:02:32 UTC (rev 57)
+++ trunk/src/dl-learner/org/dllearner/Main.java 2007-08-25 16:04:07 UTC (rev 58)
@@ -1,3 +1,23 @@
+/**
+ * Copyright (C) 2007, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
package org.dllearner;
import java.io.BufferedReader;
@@ -265,6 +285,21 @@
System.out.println("OK ("
+ Helper.prettyPrintNanoSeconds(subHierTime, true, false) + ")");
+ // prepare role hierarchy
+ System.out.print("Preparing Role Hierarchy ... ");
+ long roleHierTimeStart = System.nanoTime();
+ try {
+ reasoner.prepareRoleHierarchy();
+ // System.out.println();
+ // System.out.println(reasoner.getRoleHierarchy());
+ } catch (ReasoningMethodUnsupportedException e1) {
+ System.out.println("Tried to construct the role hierarchy, but the reasoner "
+ + "does not support it. Currently only DIG reasoners support this feature.");
+ }
+ long roleHierTime = System.nanoTime() - roleHierTimeStart;
+ System.out.println("OK ("
+ + Helper.prettyPrintNanoSeconds(roleHierTime, true, false) + ")");
+
// Beispiele anzeigen
boolean oneLineExampleInfo = true;
int maxExampleStringLength = posExamples.toString().length();
Modified: trunk/src/dl-learner/org/dllearner/reasoning/AbstractReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/AbstractReasoner.java 2007-08-25 16:02:32 UTC (rev 57)
+++ trunk/src/dl-learner/org/dllearner/reasoning/AbstractReasoner.java 2007-08-25 16:04:07 UTC (rev 58)
@@ -90,6 +90,10 @@
throw new ReasoningMethodUnsupportedException();
}
+ public void prepareRoleHierarchy() throws ReasoningMethodUnsupportedException {
+ throw new ReasoningMethodUnsupportedException();
+ }
+
public RoleHierarchy getRoleHierarchy() throws ReasoningMethodUnsupportedException {
throw new ReasoningMethodUnsupportedException();
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java 2007-08-25 16:02:32 UTC (rev 57)
+++ trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java 2007-08-25 16:04:07 UTC (rev 58)
@@ -1,3 +1,23 @@
+/**
+ * Copyright (C) 2007, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
package org.dllearner.reasoning;
import java.io.File;
@@ -25,6 +45,7 @@
import org.dllearner.dl.Top;
import org.dllearner.utilities.ConceptComparator;
import org.dllearner.utilities.Helper;
+import org.dllearner.utilities.RoleComparator;
import org.kr.dl.dig.v1_1.Concepts;
import org.kr.dl.dig.v1_1.Csynonyms;
import org.kr.dl.dig.v1_1.IdType;
@@ -35,6 +56,12 @@
import org.kr.dl.dig.v1_1.Rsynonyms;
import org.kr.dl.dig.v1_1.IndividualSetDocument.IndividualSet;
+/**
+ * DIG 1.1 implementation of the reasoner interface.
+ *
+ * @author Jens Lehmann
+ *
+ */
public class DIGReasoner extends AbstractReasoner {
// Variablen für Reasoner
@@ -54,11 +81,19 @@
// unterschiedlich sind;
// alternativ wäre auch eine Indizierung über Strings möglich
ConceptComparator conceptComparator = new ConceptComparator();
+ RoleComparator roleComparator = new RoleComparator();
SubsumptionHierarchy subsumptionHierarchy;
+ RoleHierarchy roleHierarchy;
// enthält atomare Konzepte, sowie Top und Bottom
Set<Concept> allowedConceptsInSubsumptionHierarchy;
- // imports not supported yet
+ /**
+ * Creates a DIG reasoner object.
+ *
+ * @param kb Internal knowledge base.
+ * @param url URL of the DIG reasoner e.g. http://localhost:8081.
+ * @param imports Files to import (format and physical location of each file).
+ */
public DIGReasoner(KB kb, URL url, Map<URL,OntologyFileFormat> imports) {
this.imports = imports;
this.kb = kb;
@@ -136,6 +171,10 @@
}
+ /**
+ * Construct a subsumption hierarchy using DIG queries. After calling this
+ * method one can ask for children or parents in the subsumption hierarchy.
+ */
public void prepareSubsumptionHierarchy() {
allowedConceptsInSubsumptionHierarchy = new TreeSet<Concept>(conceptComparator);
allowedConceptsInSubsumptionHierarchy.addAll(Config.Refinement.allowedConcepts);
@@ -172,6 +211,26 @@
subsumptionHierarchy = new SubsumptionHierarchy(Config.Refinement.allowedConcepts, subsumptionHierarchyUp, subsumptionHierarchyDown);
}
+ /**
+ * Constructs a role hierarchy using DIG queries. After calling this method,
+ * one can query parents or children of roles.
+ *
+ * @todo Does not yet take ignored roles into account.
+ */
+ @Override
+ public void prepareRoleHierarchy() {
+ TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyUp = new TreeMap<AtomicRole,TreeSet<AtomicRole>>(roleComparator);
+ TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyDown = new TreeMap<AtomicRole,TreeSet<AtomicRole>>(roleComparator);
+
+ // Refinement atomarer Konzepte
+ for(AtomicRole role : atomicRoles) {
+ roleHierarchyDown.put(role, getMoreSpecialRolesDIG(role));
+ roleHierarchyUp.put(role, getMoreGeneralRolesDIG(role));
+ }
+
+ roleHierarchy = new RoleHierarchy(Config.Refinement.allowedRoles, roleHierarchyUp, roleHierarchyDown);
+ }
+
// eigentlich müsste man klonen um sicherzustellen, dass der parent-Link
// bei null bleibt; bei der aktuellen Implementierung ist der parent-Link
// nicht immer null, was bei GP negative Auswirkungen haben könnte
@@ -371,6 +430,11 @@
return subsumptionHierarchy;
}
+ @Override
+ public RoleHierarchy getRoleHierarchy() {
+ return roleHierarchy;
+ }
+
private TreeSet<Concept> getMoreGeneralConceptsDIG(Concept concept) {
String moreGeneralDIG = asksPrefix;
moreGeneralDIG += "<parents id=\"query_parents\">";
@@ -448,6 +512,54 @@
return resultsSet;
}
+ private TreeSet<AtomicRole> getMoreGeneralRolesDIG(AtomicRole role) {
+ String moreGeneralRolesDIG = asksPrefix;
+ moreGeneralRolesDIG += "<rparents id=\"query_parents\">";
+ moreGeneralRolesDIG += "<ratom name=\"" + role.getName() + "\" />";
+ moreGeneralRolesDIG += "</rparents></asks>";
+
+ ResponsesDocument rd = connector.asks(moreGeneralRolesDIG);
+ TreeSet<AtomicRole> resultsSet = new TreeSet<AtomicRole>(roleComparator);
+ Roles[] rolesArray = rd.getResponses().getRoleSetArray()[0].getSynonymsArray();
+
+ for(int i=0; i<rolesArray.length; i++) {
+ Named[] atoms = rolesArray[i].getRatomArray();
+
+ for(Named atom : atoms) {
+ AtomicRole ar = new AtomicRole(atom.getName());
+ //if(Config.Refinement.allowedRoles.contains(ar))
+ resultsSet.add(ar);
+ }
+ }
+
+ // System.out.println(rd);
+
+ return resultsSet;
+ }
+
+ private TreeSet<AtomicRole> getMoreSpecialRolesDIG(AtomicRole role) {
+ String moreSpecialRolesDIG = asksPrefix;
+ moreSpecialRolesDIG += "<rchildren id=\"query_children\">";
+ moreSpecialRolesDIG += "<ratom name=\"" + role.getName() + "\" />";
+ moreSpecialRolesDIG += "</rchildren></asks>";
+
+ ResponsesDocument rd = connector.asks(moreSpecialRolesDIG);
+ TreeSet<AtomicRole> resultsSet = new TreeSet<AtomicRole>(roleComparator);
+ Roles[] rolesArray = rd.getResponses().getRoleSetArray()[0].getSynonymsArray();
+
+ for(int i=0; i<rolesArray.length; i++) {
+ Named[] atoms = rolesArray[i].getRatomArray();
+
+ for(Named atom : atoms) {
+ AtomicRole ar = new AtomicRole(atom.getName());
+ //if(Config.Refinement.allowedRoles.contains(ar))
+ resultsSet.add(ar);
+ }
+ }
+
+ return resultsSet;
+ }
+
public boolean instanceCheck(Concept concept, Individual individual) {
String instanceCheckDIG = asksPrefix;
instanceCheckDIG += "<instance id= \"query_instance\">";
Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java 2007-08-25 16:02:32 UTC (rev 57)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java 2007-08-25 16:04:07 UTC (rev 58)
@@ -76,5 +76,4 @@
public void prepareSubsumptionHierarchy() {
// hier muss nichts getan werden
}
-
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/Reasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/Reasoner.java 2007-08-25 16:02:32 UTC (rev 57)
+++ trunk/src/dl-learner/org/dllearner/reasoning/Reasoner.java 2007-08-25 16:04:07 UTC (rev 58)
@@ -1,3 +1,23 @@
+/**
+ * Copyright (C) 2007, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
package org.dllearner.reasoning;
import java.util.Map;
@@ -11,9 +31,9 @@
import org.dllearner.utilities.SortedSetTuple;
/**
- * Auflisten aller Reasoning-Methoden.
+ * Reasoner Interface. Lists all available reasoning methods.
*
- * @author jl
+ * @author Jens Lehmann
*
*/
public interface Reasoner {
@@ -25,6 +45,7 @@
// => erstellt auch vereinfachte Sichten auf Subsumptionhierarchie
// (siehe einfacher Traversal in Diplomarbeit)
public void prepareSubsumptionHierarchy();
+ public void prepareRoleHierarchy() throws ReasoningMethodUnsupportedException;
public boolean subsumes(Concept superConcept, Concept subConcept) throws ReasoningMethodUnsupportedException;
Modified: trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java 2007-08-25 16:02:32 UTC (rev 57)
+++ trunk/src/dl-learner/org/dllearner/reasoning/RoleHierarchy.java 2007-08-25 16:04:07 UTC (rev 58)
@@ -20,27 +20,74 @@
package org.dllearner.reasoning;
import java.util.Set;
+import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.dllearner.dl.AtomicConcept;
import org.dllearner.dl.AtomicRole;
-import org.dllearner.dl.Concept;
import org.dllearner.utilities.RoleComparator;
/**
* Represents a hierarchy of roles.
*
+ * @todo Currently, the role hierarchy pruning algorithm (analogous to the
+ * subsumption hierarchy) is not implemented.
+ *
* @author Jens Lehmann
*
*/
public class RoleHierarchy {
RoleComparator rc = new RoleComparator();
+ TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyUp;
+ TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyDown;
+ TreeSet<AtomicRole> mostGeneralRoles = new TreeSet<AtomicRole>(rc);
+ TreeSet<AtomicRole> mostSpecialRoles = new TreeSet<AtomicRole>(rc);
public RoleHierarchy(Set<AtomicRole> atomicRoles, TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyUp , TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyDown) {
+ this.roleHierarchyUp = roleHierarchyUp;
+ this.roleHierarchyDown = roleHierarchyDown;
-
+ // find most general and most special roles
+ for(AtomicRole role : atomicRoles) {
+ if(getMoreGeneralRoles(role).size()==0)
+ mostGeneralRoles.add(role);
+ if(getMoreSpecialRoles(role).size()==0)
+ mostSpecialRoles.add(role);
+ }
}
+ @SuppressWarnings("unchecked")
+ public SortedSet<AtomicRole> getMoreGeneralRoles(AtomicRole role) {
+ // we clone all concepts before returning them such that they cannot be
+ // modified externally
+ return (TreeSet<AtomicRole>) roleHierarchyUp.get(role).clone();
+ }
+
+ @SuppressWarnings("unchecked")
+ public SortedSet<AtomicRole> getMoreSpecialRoles(AtomicRole role) {
+ return (TreeSet<AtomicRole>) roleHierarchyDown.get(role).clone();
+ }
+
+ @Override
+ public String toString() {
+ String str = "";
+ for(AtomicRole role : mostGeneralRoles) {
+ str += toString(roleHierarchyDown, role, 0);
+ }
+ return str;
+ }
+
+ private String toString(TreeMap<AtomicRole,TreeSet<AtomicRole>> hierarchy, AtomicRole role, int depth) {
+ String str = "";
+ for(int i=0; i<depth; i++)
+ str += " ";
+ str += role.toString() + "\n";
+ Set<AtomicRole> tmp = hierarchy.get(role);
+ if(tmp!=null) {
+ for(AtomicRole c : tmp)
+ str += toString(hierarchy, c, depth+1);
+ }
+ return str;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-26 11:08:21
|
Revision: 57
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=57&view=rev
Author: jenslehmann
Date: 2007-08-25 09:02:32 -0700 (Sat, 25 Aug 2007)
Log Message:
-----------
created new simple learning example for subrole testing
Added Paths:
-----------
trunk/examples/daughter.conf
Added: trunk/examples/daughter.conf
===================================================================
--- trunk/examples/daughter.conf (rev 0)
+++ trunk/examples/daughter.conf 2007-08-25 16:02:32 UTC (rev 57)
@@ -0,0 +1,55 @@
+/**
+ * Example "grandfather with daughter"
+ *
+ * possible solution:
+ * male AND EXISTS hasDaughter.EXISTS hasChild.TOP
+ * male AND EXISTS hasChild.(female AND EXISTS hasChild.TOP)
+ *
+ * Copyright (C) 2007, Jens Lehmann
+ */
+
+// search tree protocol
+refinement.writeSearchTree = true;
+refinement.searchTreeFile = "log/searchTreeDaughter.txt";
+
+// control output
+showIndividuals = true;
+showConcepts = true;
+showRoles = true;
+showInternalKB = true;
+showSubsumptionHierarchy = true;
+
+/** background knowledge ***/
+BOTTOM = (male AND female).
+
+Subrole(hasSon, hasChild).
+Subrole(hasDaughter, hasChild).
+
+// persons
+male(markus).
+male(stefan).
+male(heinz).
+male(bernd).
+male(franz).
+female(anna).
+female(gabi).
+female(michelle).
+
+// children
+hasChild(stefan,markus).
+hasChild(markus,anna).
+hasChild(bernd,gabi).
+hasChild(gabi,anna).
+hasChild(anna,heinz).
+hasChild(franz,heinz).
+hasChild(franz,michelle).
+
+/** examples **/
+-father(stefan).
++father(markus).
++father(bernd).
+-father(heinz).
+-father(anna).
+-father(gabi).
+-father(michelle).
+-father(franz).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-24 14:35:04
|
Revision: 54
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=54&view=rev
Author: jenslehmann
Date: 2007-08-24 07:35:02 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
fixed some warnings
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/dl/Individual.java
trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java
trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
Modified: trunk/src/dl-learner/org/dllearner/dl/Individual.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Individual.java 2007-08-24 14:17:37 UTC (rev 53)
+++ trunk/src/dl-learner/org/dllearner/dl/Individual.java 2007-08-24 14:35:02 UTC (rev 54)
@@ -17,7 +17,7 @@
* @author jl
*
*/
-public class Individual implements KBElement, Comparable {
+public class Individual implements KBElement, Comparable<Individual> {
// public static int idCounter = 0;
@@ -48,13 +48,14 @@
return name;
}
- public int compareTo(Object arg0) {
- // TODO Auto-generated method stub
- return name.compareTo(((Individual)arg0).name);
+ public int compareTo(Individual o) {
+ return name.compareTo(o.name);
}
-
+
@Override
public boolean equals(Object o) {
- return (compareTo(o)==0);
+ return (compareTo((Individual)o)==0);
}
+
+
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java 2007-08-24 14:17:37 UTC (rev 53)
+++ trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java 2007-08-24 14:35:02 UTC (rev 54)
@@ -119,8 +119,9 @@
System.exit(0);
} else {
long importTime = System.currentTimeMillis() - importStartTime;
- System.out.println("OK");
+ System.out.println("OK (" + importTime + " ms)");
// (" + JenaOWLDIGConverter.nrOfStatementsLastConversion + " statements, "+ importTime + " ms)");
+
}
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java 2007-08-24 14:17:37 UTC (rev 53)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java 2007-08-24 14:35:02 UTC (rev 54)
@@ -31,7 +31,7 @@
// Algorithmus wird ueber Rekursion und
// Delegation zur Helper-Klasse implementiert
- public SortedSetTuple<String> calculateSetsADC(Concept concept, SortedSetTuple adcSet) {
+ public SortedSetTuple<String> calculateSetsADC(Concept concept, SortedSetTuple<String> adcSet) {
if(concept instanceof Top) {
return new SortedSetTuple<String>(abox.top,abox.bottom);
} else if(concept instanceof Bottom) {
Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java 2007-08-24 14:17:37 UTC (rev 53)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java 2007-08-24 14:35:02 UTC (rev 54)
@@ -49,7 +49,7 @@
}
public SortedSetTuple<Individual> doubleRetrieval(Concept concept, Concept adc) {
- SortedSetTuple adcSet = fastRetrieval.calculateSets(adc);
+ SortedSetTuple<String> adcSet = fastRetrieval.calculateSets(adc);
return Helper.getIndividualTuple(fastRetrieval.calculateSetsADC(concept, adcSet));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2007-08-24 14:17:39
|
Revision: 53
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=53&view=rev
Author: jenslehmann
Date: 2007-08-24 07:17:37 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
added ToDo taglet
Modified Paths:
--------------
trunk/javadoc.xml
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/utilities/ToDoTaglet.java
Modified: trunk/javadoc.xml
===================================================================
--- trunk/javadoc.xml 2007-08-24 13:00:57 UTC (rev 52)
+++ trunk/javadoc.xml 2007-08-24 14:17:37 UTC (rev 53)
@@ -22,7 +22,8 @@
linksource="true"
bottom="DL-Learner is licenced under the terms of the GNU General Public License.<br />Copyright &#169; 2007 Jens Lehmann"
Encoding="ISO-8859-1"
- windowtitle="DL-Learner Javadoc"
- />
+ windowtitle="DL-Learner Javadoc">
+ <taglet name="org.dllearner.utilities.ToDoTaglet" path="classes" />
+ </javadoc>
</target>
</project>
Added: trunk/src/dl-learner/org/dllearner/utilities/ToDoTaglet.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/ToDoTaglet.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/utilities/ToDoTaglet.java 2007-08-24 14:17:37 UTC (rev 53)
@@ -0,0 +1,151 @@
+package org.dllearner.utilities;
+
+import java.util.Map;
+
+import com.sun.javadoc.Tag;
+import com.sun.tools.doclets.Taglet;
+
+/**
+ * Small taglet for showing todo-markers in Javadoc-runs.
+ *
+ * Parts of the code are taken from the JDK Javadoc.
+ *
+ * @author Jens Lehmann
+ *
+ */
+public class ToDoTaglet implements Taglet {
+
+ private static final String NAME = "todo";
+ private static final String HEADER = "To Do:";
+
+ /**
+ * Return the name of this custom tag.
+ */
+ public String getName() {
+ return NAME;
+ }
+
+ /**
+ * Will return true since <code>@todo</code>
+ * can be used in field documentation.
+ * @return true since <code>@todo</code>
+ * can be used in field documentation and false
+ * otherwise.
+ */
+ public boolean inField() {
+ return true;
+ }
+
+ /**
+ * Will return true since <code>@todo</code>
+ * can be used in constructor documentation.
+ * @return true since <code>@todo</code>
+ * can be used in constructor documentation and false
+ * otherwise.
+ */
+ public boolean inConstructor() {
+ return true;
+ }
+
+ /**
+ * Will return true since <code>@todo</code>
+ * can be used in method documentation.
+ * @return true since <code>@todo</code>
+ * can be used in method documentation and false
+ * otherwise.
+ */
+ public boolean inMethod() {
+ return true;
+ }
+
+ /**
+ * Will return true since <code>@todo</code>
+ * can be used in method documentation.
+ * @return true since <code>@todo</code>
+ * can be used in overview documentation and false
+ * otherwise.
+ */
+ public boolean inOverview() {
+ return true;
+ }
+
+ /**
+ * Will return true since <code>@todo</code>
+ * can be used in package documentation.
+ * @return true since <code>@todo</code>
+ * can be used in package documentation and false
+ * otherwise.
+ */
+ public boolean inPackage() {
+ return true;
+ }
+
+ /**
+ * Will return true since <code>@todo</code>
+ * can be used in type documentation (classes or interfaces).
+ * @return true since <code>@todo</code>
+ * can be used in type documentation and false
+ * otherwise.
+ */
+ public boolean inType() {
+ return true;
+ }
+
+ /**
+ * Will return false since <code>@todo</code>
+ * is not an inline tag.
+ * @return false since <code>@todo</code>
+ * is not an inline tag.
+ */
+
+ public boolean isInlineTag() {
+ return false;
+ }
+
+ /**
+ * Register this Taglet.
+ * @param tagletMap the map to register this tag to.
+ */
+ @SuppressWarnings({"unchecked"})
+ public static void register(Map tagletMap) {
+ ToDoTaglet tag = new ToDoTaglet();
+ Taglet t = (Taglet) tagletMap.get(tag.getName());
+ if (t != null) {
+ tagletMap.remove(tag.getName());
+ }
+ tagletMap.put(tag.getName(), tag);
+ }
+
+ /**
+ * Given the <code>Tag</code> representation of this custom
+ * tag, return its string representation.
+ * @param tag the <code>Tag</code> representation of this custom tag.
+ */
+ public String toString(Tag tag) {
+ return "<DT><B>" + HEADER + "</B><DD>"
+ + "<table cellpadding=2 cellspacing=0><tr><td bgcolor=\"#DC8080\">"
+ + tag.text()
+ + "</td></tr></table></DD>\n";
+ }
+
+ /**
+ * Given an array of <code>Tag</code>s representing this custom
+ * tag, return its string representation.
+ * @param tags the array of <code>Tag</code>s representing of this custom tag.
+ */
+ public String toString(Tag[] tags) {
+ if (tags.length == 0) {
+ return null;
+ }
+ String result = "\n<DT><B>" + HEADER + "</B><DD>";
+ result += "<table cellpadding=2 cellspacing=0><tr><td bgcolor=\"#DC8080\">";
+ for (int i = 0; i < tags.length; i++) {
+ if (i > 0) {
+ result += ", ";
+ }
+ result += tags[i].text();
+ }
+ return result + "</td></tr></table></DD>\n";
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
3 messages has been excluded from this view by a project administrator.
![http://aksw.org/Projects/DLLearner/files?get=dllearner.gif"](http://aksw.org/Projects/DLLearner/files?get=dllearner.gif"){kind=link}