Menu
▾
▴
dl-learner-svn
|
From: <ku...@us...> - 2010-10-08 18:15:42
|
Revision: 2359
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2359&view=rev
Author: kurzum
Date: 2010-10-08 18:15:36 +0000 (Fri, 08 Oct 2010)
Log Message:
-----------
removed autosparql, because it wasn't compiling\n added h2 dependancy
Modified Paths:
--------------
trunk/components-core/pom.xml
trunk/pom.xml
Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml 2010-10-08 13:06:38 UTC (rev 2358)
+++ trunk/components-core/pom.xml 2010-10-08 18:15:36 UTC (rev 2359)
@@ -121,6 +121,11 @@
<groupId>net.sourceforge.dig</groupId>
<artifactId>dig-xmlbeans</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-10-08 13:06:38 UTC (rev 2358)
+++ trunk/pom.xml 2010-10-08 18:15:36 UTC (rev 2359)
@@ -27,7 +27,7 @@
<module>protege</module>
<module>evalplugin</module>
<module>sparql-query-generator</module>
- <module>autosparql</module>
+ <!--module>autosparql</module-->
</modules>
<build>
@@ -246,7 +246,14 @@
<artifactId>dig-xmlbeans</artifactId>
<version>1.1</version>
</dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.2.143</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2010-10-09 09:08:14
|
Revision: 2363
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2363&view=rev
Author: jenslehmann
Date: 2010-10-09 09:08:07 +0000 (Sat, 09 Oct 2010)
Log Message:
-----------
configured svn:ignore for autosparql
Removed Paths:
-------------
trunk/autosparql/.classpath
trunk/autosparql/.project
trunk/autosparql/war/WEB-INF/classes/
trunk/autosparql/war/WEB-INF/lib/
trunk/sparql-query-generator/.settings/org.eclipse.jdt.core.prefs
Property Changed:
----------------
trunk/autosparql/
trunk/autosparql/war/
trunk/autosparql/war/WEB-INF/
Property changes on: trunk/autosparql
___________________________________________________________________
Added: svn:ignore
+ .settings
.project
.classpath
target
Deleted: trunk/autosparql/.classpath
===================================================================
--- trunk/autosparql/.classpath 2010-10-08 21:43:43 UTC (rev 2362)
+++ trunk/autosparql/.classpath 2010-10-09 09:08:07 UTC (rev 2363)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="war/WEB-INF/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="war/WEB-INF/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="output" path="war/WEB-INF/classes"/>
-</classpath>
Deleted: trunk/autosparql/.project
===================================================================
--- trunk/autosparql/.project 2010-10-08 21:43:43 UTC (rev 2362)
+++ trunk/autosparql/.project 2010-10-09 09:08:07 UTC (rev 2363)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>autosparql</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
Property changes on: trunk/autosparql/war
___________________________________________________________________
Added: svn:ignore
+ org.dllearner.autosparql.Application
Property changes on: trunk/autosparql/war/WEB-INF
___________________________________________________________________
Added: svn:ignore
+ lib
classes
Deleted: trunk/sparql-query-generator/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/sparql-query-generator/.settings/org.eclipse.jdt.core.prefs 2010-10-08 21:43:43 UTC (rev 2362)
+++ trunk/sparql-query-generator/.settings/org.eclipse.jdt.core.prefs 2010-10-09 09:08:07 UTC (rev 2363)
@@ -1,6 +0,0 @@
-#Fri Sep 17 14:51:23 CEST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-10-10 10:28:16
|
Revision: 2369
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2369&view=rev
Author: lorenz_b
Date: 2010-10-10 10:28:09 +0000 (Sun, 10 Oct 2010)
Log Message:
-----------
Continued autosparql component.
Modified Paths:
--------------
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/InteractivePanel.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorImpl.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/Generalisation.java
trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/DBPediaTestScript.java
trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ExamplesList.txt
Added Paths:
-----------
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/exception/
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/exception/SPARQLQueryException.java
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java 2010-10-09 20:14:16 UTC (rev 2368)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java 2010-10-10 10:28:09 UTC (rev 2369)
@@ -2,6 +2,7 @@
import java.util.List;
+import org.dllearner.autosparql.client.exception.SPARQLQueryException;
import org.dllearner.autosparql.client.model.Example;
import com.extjs.gxt.ui.client.data.PagingLoadConfig;
@@ -15,7 +16,7 @@
PagingLoadResult<Example> getSearchResult(String searchTerm, PagingLoadConfig config);
- Example getSimilarExample(List<String> posExamples, List<String> negExamples);
+ Example getSimilarExample(List<String> posExamples, List<String> negExamples) throws SPARQLQueryException;
/**
* Utility class to get the RPC Async interface from client-side code
Added: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/exception/SPARQLQueryException.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/exception/SPARQLQueryException.java (rev 0)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/exception/SPARQLQueryException.java 2010-10-10 10:28:09 UTC (rev 2369)
@@ -0,0 +1,30 @@
+package org.dllearner.autosparql.client.exception;
+
+import java.io.Serializable;
+
+public class SPARQLQueryException extends Exception implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3205559196686634580L;
+
+ private String query;
+
+ public SPARQLQueryException(){
+ }
+
+ public SPARQLQueryException(String query){
+ this.query = query;
+ }
+
+ public SPARQLQueryException(Exception e, String query){
+ super(e);
+ this.query = query;
+ }
+
+ public String getQuery(){
+ return query;
+ }
+
+}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-09 20:14:16 UTC (rev 2368)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-10 10:28:09 UTC (rev 2369)
@@ -2,6 +2,7 @@
import org.dllearner.autosparql.client.AppEvents;
import org.dllearner.autosparql.client.SPARQLService;
+import org.dllearner.autosparql.client.exception.SPARQLQueryException;
import org.dllearner.autosparql.client.model.Example;
import org.dllearner.autosparql.client.widget.ExamplesPanel;
import org.dllearner.autosparql.client.widget.InteractivePanel;
@@ -19,6 +20,7 @@
import com.extjs.gxt.ui.client.widget.button.Button;
import com.extjs.gxt.ui.client.widget.layout.RowLayout;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.RootPanel;
public class ApplicationView extends View {
@@ -113,11 +115,17 @@
@Override
public void onFailure(Throwable caught) {
- // TODO Auto-generated method stub
+ String details = caught.getMessage();
+ if(caught instanceof SPARQLQueryException){
+ details = "An error occured while sending the following query:\n"
+ + ((SPARQLQueryException)caught).getQuery();
+ }
+ System.out.println(details);
+ MessageBox.alert("Error", details, null);
}
});
- }else if(event.getType() == AppEvents.AddNegExample){
+ } else if(event.getType() == AppEvents.AddNegExample){
examplesPanel.addNegativeExample((Example) event.getData());
} else if(event.getType() == AppEvents.RemoveExample){
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/InteractivePanel.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/InteractivePanel.java 2010-10-09 20:14:16 UTC (rev 2368)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/InteractivePanel.java 2010-10-10 10:28:09 UTC (rev 2369)
@@ -100,8 +100,11 @@
addPosButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
@Override
public void componentSelected(ButtonEvent ce) {
- AppEvent event = new AppEvent(AppEvents.AddPosExample, model);
+ AppEvent event = new AppEvent(AppEvents.AddExample, model);
+ event.setData("type", Example.Type.POSITIVE);
+ event.setData("example", model);
Dispatcher.forwardEvent(event);
+ examplesStore.remove(model);
}
});
Button addNegButton = new Button("-");
@@ -109,8 +112,11 @@
addNegButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
@Override
public void componentSelected(ButtonEvent ce) {
- AppEvent event = new AppEvent(AppEvents.AddNegExample, model);
+ AppEvent event = new AppEvent(AppEvents.AddExample, model);
+ event.setData("type", Example.Type.NEGATIVE);
+ event.setData("example", model);
Dispatcher.forwardEvent(event);
+ examplesStore.remove(model);
}
});
p.add(addPosButton);
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-09 20:14:16 UTC (rev 2368)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-10 10:28:09 UTC (rev 2369)
@@ -6,6 +6,7 @@
import javax.servlet.http.HttpSession;
import org.dllearner.autosparql.client.SPARQLService;
+import org.dllearner.autosparql.client.exception.SPARQLQueryException;
import org.dllearner.autosparql.client.model.Example;
import org.dllearner.sparqlquerygenerator.SPARQLQueryGenerator;
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
@@ -69,7 +70,7 @@
@Override
public Example getSimilarExample(List<String> posExamples,
- List<String> negExamples) {
+ List<String> negExamples) throws SPARQLQueryException{
System.out.println("RETRIEVING NEXT SIMILIAR EXAMPLE");
System.out.println("POS EXAMPLES: " + posExamples);
System.out.println("NEG EXAMPLES: " + negExamples);
@@ -87,9 +88,16 @@
SPARQLQueryGenerator gen = new SPARQLQueryGeneratorImpl(getEndpoint().getURL().toString());
List<String> queries = gen.getSPARQLQueries(new HashSet<String>(posExamples), new HashSet<String>(negExamples));
query = queries.get(0);
+ System.out.println("QUERY:\n" + query);
}
query = query + " LIMIT 2";
- String result = selectCache.executeSelectQuery(getEndpoint(), query);
+ String result = "";
+ try {
+ result = selectCache.executeSelectQuery(getEndpoint(), query);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new SPARQLQueryException(e, encodeHTML(query));
+ }
ResultSetRewindable rs = ExtractionDBCache.convertJSONtoResultSet(result);
String uri;
@@ -120,4 +128,22 @@
return new Example(uri, label, imageURL, comment);
}
+ public String encodeHTML(String s)
+ {
+ StringBuffer out = new StringBuffer();
+ for(int i=0; i<s.length(); i++)
+ {
+ char c = s.charAt(i);
+ if(c > 127 || c=='"' || c=='<' || c=='>')
+ {
+ out.append("&#"+(int)c+";");
+ }
+ else
+ {
+ out.append(c);
+ }
+ }
+ return out.toString();
+ }
+
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorImpl.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorImpl.java 2010-10-09 20:14:16 UTC (rev 2368)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorImpl.java 2010-10-10 10:28:09 UTC (rev 2369)
@@ -252,7 +252,7 @@
sb.append("?o").append(i-1).append(" ").append("?p").append(i).append(" ").append("?o").append(i).append(".\n");
}
- sb.append("FILTER (regex (?p0, \"http://dbpedia.org/property\") && !regex(?p1, \"http://dbpedia.org/property/wikiPageUsesTemplate\"))");
+ sb.append("FILTER (!regex (?p0, \"http://dbpedia.org/property\"))");
sb.append("}\n");
sb.append("ORDER BY ");
for(int i = 0; i < recursionDepth; i++){
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/Generalisation.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/Generalisation.java 2010-10-09 20:14:16 UTC (rev 2368)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/Generalisation.java 2010-10-10 10:28:09 UTC (rev 2369)
@@ -3,6 +3,8 @@
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
import org.dllearner.sparqlquerygenerator.datastructures.impl.QueryTreeImpl;
+import com.hp.hpl.jena.vocabulary.RDF;
+
public class Generalisation<N> {
public QueryTree<N> generalise(QueryTree<N> queryTree){
@@ -11,6 +13,7 @@
copy.setUserObject((N)"?");
pruneTree(copy, 0.5);
+ retainTypeEdges(copy);
return copy;
}
@@ -32,5 +35,13 @@
}
}
+ private void retainTypeEdges(QueryTree<N> tree){
+ for(QueryTree<N> child : tree.getChildren()){
+ if(!tree.getEdge(child).equals(RDF.type.toString())){
+ tree.removeChild((QueryTreeImpl<N>) child);
+ }
+ }
+ }
+
}
Modified: trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/DBPediaTestScript.java
===================================================================
--- trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/DBPediaTestScript.java 2010-10-09 20:14:16 UTC (rev 2368)
+++ trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/DBPediaTestScript.java 2010-10-10 10:28:09 UTC (rev 2369)
@@ -41,8 +41,8 @@
*/
public class DBPediaTestScript {
-// private static final String DBPEDIA_ENDPOINT_URL = "http://dbpedia.org/sparql/";
- private static final String DBPEDIA_ENDPOINT_URL = "http://dbpedia-live.openlinksw.com/sparql/";
+ private static final String DBPEDIA_ENDPOINT_URL = "http://dbpedia.org/sparql/";
+// private static final String DBPEDIA_ENDPOINT_URL = "http://dbpedia-live.openlinksw.com/sparql/";
public static void main(String[] args) throws IOException{
Modified: trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ExamplesList.txt
===================================================================
--- trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ExamplesList.txt 2010-10-09 20:14:16 UTC (rev 2368)
+++ trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ExamplesList.txt 2010-10-10 10:28:09 UTC (rev 2369)
@@ -1,2 +1,2 @@
-+http://dbpedia.org/resource/Gottfried_Leibniz
-+http://dbpedia.org/resource/Max_Immelmann
\ No newline at end of file
++http://dbpedia.org/resource/Leipzig
++http://dbpedia.org/resource/Dresden
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-10-12 14:35:01
|
Revision: 2382
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2382&view=rev
Author: lorenz_b
Date: 2010-10-12 14:34:55 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
Continued autosparql component.
Modified Paths:
--------------
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ExamplesPanel.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/InteractivePanel.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLSearch.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ModelCreationTest.java
Added Paths:
-----------
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
Property Changed:
----------------
trunk/autosparql/
Property changes on: trunk/autosparql
___________________________________________________________________
Modified: svn:ignore
- .settings
.project
.classpath
target
select-cache
construct-cache
.lobs.db
+ .settings
.project
.classpath
target
log
select-cache
construct-cache
tomcat
select-cache
construct-cache
.lobs.db
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-12 14:30:20 UTC (rev 2381)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-12 14:34:55 UTC (rev 2382)
@@ -6,6 +6,7 @@
import org.dllearner.autosparql.client.model.Example;
import org.dllearner.autosparql.client.widget.ExamplesPanel;
import org.dllearner.autosparql.client.widget.InteractivePanel;
+import org.dllearner.autosparql.client.widget.ResultPanel;
import org.dllearner.autosparql.client.widget.SearchPanel;
import com.extjs.gxt.ui.client.Registry;
@@ -15,6 +16,7 @@
import com.extjs.gxt.ui.client.mvc.AppEvent;
import com.extjs.gxt.ui.client.mvc.Controller;
import com.extjs.gxt.ui.client.mvc.View;
+import com.extjs.gxt.ui.client.widget.LayoutContainer;
import com.extjs.gxt.ui.client.widget.MessageBox;
import com.extjs.gxt.ui.client.widget.Viewport;
import com.extjs.gxt.ui.client.widget.button.Button;
@@ -32,6 +34,7 @@
private SearchPanel searchPanel;
private ExamplesPanel examplesPanel;
private InteractivePanel interactivePanel;
+ private ResultPanel resultPanel;
public ApplicationView(Controller controller) {
super(controller);
@@ -49,7 +52,7 @@
createSearchPanel();
createExamplesPanel();
- createInteractivePanel();
+ createInteractiveAndResultPanel();
// registry serves as a global context
Registry.register(VIEWPORT, viewport);
@@ -68,11 +71,22 @@
viewport.add(examplesPanel);
}
- private void createInteractivePanel(){
+ private void createInteractiveAndResultPanel(){
+ LayoutContainer c = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
interactivePanel = new InteractivePanel();
- viewport.add(interactivePanel);
+ c.add(interactivePanel);
+
+ resultPanel = new ResultPanel();
+ c.add(resultPanel);
+
+ viewport.add(c);
}
+ private void createResultPanel(){
+ resultPanel = new ResultPanel();
+ viewport.add(resultPanel);
+ }
+
@Override
protected void handleEvent(AppEvent event) {
if (event.getType() == AppEvents.Init) {
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ExamplesPanel.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ExamplesPanel.java 2010-10-12 14:30:20 UTC (rev 2381)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ExamplesPanel.java 2010-10-12 14:34:55 UTC (rev 2382)
@@ -3,7 +3,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.dllearner.autosparql.client.AppEvents;
import org.dllearner.autosparql.client.model.Example;
import com.extjs.gxt.ui.client.Style.Orientation;
@@ -11,8 +10,6 @@
import com.extjs.gxt.ui.client.data.ModelData;
import com.extjs.gxt.ui.client.event.ButtonEvent;
import com.extjs.gxt.ui.client.event.SelectionListener;
-import com.extjs.gxt.ui.client.mvc.AppEvent;
-import com.extjs.gxt.ui.client.mvc.Dispatcher;
import com.extjs.gxt.ui.client.store.ListStore;
import com.extjs.gxt.ui.client.widget.ContentPanel;
import com.extjs.gxt.ui.client.widget.LayoutContainer;
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/InteractivePanel.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/InteractivePanel.java 2010-10-12 14:30:20 UTC (rev 2381)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/InteractivePanel.java 2010-10-12 14:34:55 UTC (rev 2382)
@@ -30,8 +30,8 @@
public class InteractivePanel extends ContentPanel {
- private static final int WIDTH = 300;
- private static final int HEIGHT = 600;
+ private static final int WIDTH = 500;
+ private static final int HEIGHT = 300;
private ListStore<Example> examplesStore;
Added: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java (rev 0)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java 2010-10-12 14:34:55 UTC (rev 2382)
@@ -0,0 +1,179 @@
+package org.dllearner.autosparql.client.widget;
+
+import java.util.ArrayList;
+
+import org.dllearner.autosparql.client.AppEvents;
+import org.dllearner.autosparql.client.model.Example;
+
+import com.extjs.gxt.ui.client.Style.Orientation;
+import com.extjs.gxt.ui.client.core.XTemplate;
+import com.extjs.gxt.ui.client.data.BasePagingLoader;
+import com.extjs.gxt.ui.client.data.ModelData;
+import com.extjs.gxt.ui.client.data.PagingLoadResult;
+import com.extjs.gxt.ui.client.data.PagingLoader;
+import com.extjs.gxt.ui.client.data.RpcProxy;
+import com.extjs.gxt.ui.client.event.ButtonEvent;
+import com.extjs.gxt.ui.client.event.SelectionListener;
+import com.extjs.gxt.ui.client.mvc.AppEvent;
+import com.extjs.gxt.ui.client.mvc.Dispatcher;
+import com.extjs.gxt.ui.client.store.ListStore;
+import com.extjs.gxt.ui.client.widget.ContentPanel;
+import com.extjs.gxt.ui.client.widget.VerticalPanel;
+import com.extjs.gxt.ui.client.widget.button.Button;
+import com.extjs.gxt.ui.client.widget.grid.ColumnConfig;
+import com.extjs.gxt.ui.client.widget.grid.ColumnData;
+import com.extjs.gxt.ui.client.widget.grid.ColumnModel;
+import com.extjs.gxt.ui.client.widget.grid.Grid;
+import com.extjs.gxt.ui.client.widget.grid.GridCellRenderer;
+import com.extjs.gxt.ui.client.widget.grid.GridViewConfig;
+import com.extjs.gxt.ui.client.widget.grid.RowExpander;
+import com.extjs.gxt.ui.client.widget.layout.RowData;
+import com.extjs.gxt.ui.client.widget.layout.RowLayout;
+import com.extjs.gxt.ui.client.widget.toolbar.PagingToolBar;
+import com.google.gwt.event.dom.client.ErrorEvent;
+import com.google.gwt.event.dom.client.ErrorHandler;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.Image;
+
+public class ResultPanel extends ContentPanel {
+
+ private static final int WIDTH = 500;
+ private static final int HEIGHT = 300;
+
+ private PagingLoader<PagingLoadResult<ModelData>> loader;
+
+ public ResultPanel(){
+ setLayout(new RowLayout(Orientation.HORIZONTAL));
+ setHeading("Result");
+ setCollapsible(true);
+ setAnimCollapse(false);
+ setSize(WIDTH, HEIGHT);
+
+ createResultGrid();
+ }
+
+ private void createResultGrid(){
+ RpcProxy<PagingLoadResult<Example>> proxy = new RpcProxy<PagingLoadResult<Example>>() {
+
+ @Override
+ protected void load(Object loadConfig,
+ AsyncCallback<PagingLoadResult<Example>> callback) {
+ }
+ };
+
+ loader = new BasePagingLoader<PagingLoadResult<ModelData>>(proxy);
+
+ final PagingToolBar toolbar = new PagingToolBar(10);
+ toolbar.bind(loader);
+
+
+ ListStore<Example> store = new ListStore<Example>(loader);
+
+ ArrayList<ColumnConfig> columns = new ArrayList<ColumnConfig>();
+
+ XTemplate tpl = XTemplate.create("<p><b>Comment:</b><br>{comment}</p>");
+ RowExpander expander = new RowExpander();
+ expander.setTemplate(tpl);
+ columns.add(expander);
+
+ GridCellRenderer<Example> imageRender = new GridCellRenderer<Example>() {
+
+ @Override
+ public Object render(Example model, String property,
+ ColumnData config, int rowIndex, int colIndex,
+ ListStore<Example> store, Grid<Example> grid) {
+ final Image image = new Image(model.getImageURL());
+ image.addErrorHandler(new ErrorHandler() {
+
+ @Override
+ public void onError(ErrorEvent event) {
+ image.setUrl("no_images.jpeg");
+
+ }
+ });
+ image.setPixelSize(40, 40);
+ return image;
+ }
+
+ };
+
+ ColumnConfig c = new ColumnConfig();
+// c.setId("imageURL");
+// c.setWidth(50);
+// c.setRenderer(imageRender);
+// columns.add(c);
+
+ c = new ColumnConfig();
+ c.setId("label");
+ c.setHeader("Label");
+ c.setSortable(true);
+ columns.add(c);
+
+ GridCellRenderer<Example> buttonRender = new GridCellRenderer<Example>() {
+
+ @Override
+ public Object render(final Example model, String property,
+ ColumnData config, int rowIndex, int colIndex,
+ ListStore<Example> store, Grid<Example> grid) {
+ VerticalPanel p = new VerticalPanel();
+ p.setSize(25, 50);
+ Button addPosButton = new Button("+");
+ addPosButton.setSize(20, 20);
+ addPosButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
+ @Override
+ public void componentSelected(ButtonEvent ce) {
+ AppEvent event = new AppEvent(AppEvents.AddExample);
+ event.setData("example", model);
+ event.setData("type", Example.Type.POSITIVE);
+ Dispatcher.forwardEvent(event);
+ }
+ });
+ Button addNegButton = new Button("-");
+ addNegButton.setSize(20, 20);
+ addNegButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
+ @Override
+ public void componentSelected(ButtonEvent ce) {
+ AppEvent event = new AppEvent(AppEvents.AddExample);
+ event.setData("example", model);
+ event.setData("type", Example.Type.NEGATIVE);
+ Dispatcher.forwardEvent(event);
+ }
+ });
+ p.add(addPosButton);
+ p.add(addNegButton);
+ return p;
+ }
+
+ };
+
+ c = new ColumnConfig();
+ c.setId("");
+ c.setWidth(50);
+ c.setRenderer(buttonRender);
+ columns.add(c);
+
+ ColumnModel cm = new ColumnModel(columns);
+
+ Grid<Example> grid = new Grid<Example>(store, cm);
+// grid.setHideHeaders(true);
+ grid.setAutoExpandColumn("label");
+ grid.setLoadMask(true);
+ grid.addPlugin(expander);
+ grid.getView().setEmptyText("DUMMY TEXT");
+ grid.getView().setViewConfig(new GridViewConfig(){
+ @Override
+ public String getRowStyle(ModelData model, int rowIndex,
+ ListStore<ModelData> ds) {
+ // TODO Auto-generated method stub
+ if(rowIndex % 2 == 0){
+ return "row-Style-Odd";
+ } else {
+ return "row-Style-Even";
+ }
+ }
+ });
+
+ add(grid, new RowData(1, 1));
+ add(toolbar, new RowData(1, -1));
+ }
+}
Added: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java (rev 0)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-10-12 14:34:55 UTC (rev 2382)
@@ -0,0 +1,181 @@
+package org.dllearner.autosparql.server;
+
+import java.util.HashSet;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.dllearner.autosparql.client.exception.SPARQLQueryException;
+import org.dllearner.autosparql.client.model.Example;
+import org.dllearner.sparqlquerygenerator.SPARQLQueryGenerator;
+import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
+import org.dllearner.sparqlquerygenerator.impl.SPARQLQueryGeneratorImpl;
+
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSetRewindable;
+import com.hp.hpl.jena.sparql.vocabulary.FOAF;
+import com.hp.hpl.jena.vocabulary.RDFS;
+
+public class ExampleFinder {
+
+ private SparqlEndpoint endpoint;
+ private ExtractionDBCache selectCache;
+ private ExtractionDBCache constructCache;
+
+ private List<String> posExamples;
+ private List<String> negExamples;
+
+ private static final Logger logger = Logger.getLogger(ExampleFinder.class);
+
+ public ExampleFinder(SparqlEndpoint endpoint, ExtractionDBCache selectCache, ExtractionDBCache constructCache){
+ this.endpoint = endpoint;
+ this.selectCache = selectCache;
+ this.constructCache = constructCache;
+ }
+
+ public Example findSimilarExample(List<String> posExamples,
+ List<String> negExamples) throws SPARQLQueryException{
+ this.posExamples = posExamples;
+ this.negExamples = negExamples;
+
+ if(posExamples.size() == 1 && negExamples.isEmpty()){
+ QueryTreeGenerator treeGen = new QueryTreeGenerator(constructCache, endpoint, 5000);
+ QueryTree<String> tree = treeGen.getQueryTree(posExamples.get(0));
+ return findExampleByGeneralisation(tree);
+ } else {
+ return findExampleByLGG(posExamples, negExamples);
+ }
+
+ }
+
+ private Example findExampleByGeneralisation(List<String> posExamples,
+ List<String> negExamples) throws SPARQLQueryException{
+ logger.info("USING GENERALISATION");
+
+ QueryTreeGenerator treeGen = new QueryTreeGenerator(constructCache, endpoint, 5000);
+ QueryTree<String> tree = treeGen.getQueryTree(posExamples.get(0));
+ logger.info("QUERY BEFORE GENERALISATION: \n\n" + tree.toSPARQLQueryString());
+ Generalisation<String> generalisation = new Generalisation<String>();
+ QueryTree<String> genTree = generalisation.generalise(tree);
+ String query = genTree.toSPARQLQueryString();
+ logger.info("QUERY AFTER GENERALISATION: \n\n" + query);
+
+ query = query + " LIMIT 10";
+ String result = "";
+ try {
+ result = selectCache.executeSelectQuery(endpoint, query);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new SPARQLQueryException(e, encodeHTML(query));
+ }
+
+ ResultSetRewindable rs = ExtractionDBCache.convertJSONtoResultSet(result);
+ String uri;
+ QuerySolution qs;
+ while(rs.hasNext()){
+ qs = rs.next();
+ uri = qs.getResource("x0").getURI();
+ if(!posExamples.contains(uri) && !negExamples.contains(uri)){
+ return getExample(uri);
+ }
+ }
+ return null;
+ }
+
+ private Example findExampleByGeneralisation(QueryTree<String> tree) throws SPARQLQueryException{
+ logger.info("USING GENERALISATION");
+ logger.info("QUERY BEFORE GENERALISATION: \n\n" + tree.toSPARQLQueryString());
+ Generalisation<String> generalisation = new Generalisation<String>();
+ QueryTree<String> genTree = generalisation.generalise(tree);
+ String query = genTree.toSPARQLQueryString();
+ logger.info("QUERY AFTER GENERALISATION: \n\n" + query);
+
+ query = query + " LIMIT 10";
+ String result = "";
+ try {
+ result = selectCache.executeSelectQuery(endpoint, query);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new SPARQLQueryException(e, encodeHTML(query));
+ }
+
+ ResultSetRewindable rs = ExtractionDBCache.convertJSONtoResultSet(result);
+ String uri;
+ QuerySolution qs;
+ while(rs.hasNext()){
+ qs = rs.next();
+ uri = qs.getResource("x0").getURI();
+ if(!posExamples.contains(uri) && !negExamples.contains(uri)){
+ return getExample(uri);
+ }
+ }
+ return findExampleByGeneralisation(genTree);
+ }
+
+ private Example findExampleByLGG(List<String> posExamples,
+ List<String> negExamples) throws SPARQLQueryException{
+ SPARQLQueryGenerator gen = new SPARQLQueryGeneratorImpl(endpoint.getURL().toString());
+ List<String> queries = gen.getSPARQLQueries(new HashSet<String>(posExamples), new HashSet<String>(negExamples));
+ for(String query : queries){
+ query = query + " LIMIT 10";
+ String result = "";
+ try {
+ result = selectCache.executeSelectQuery(endpoint, query);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new SPARQLQueryException(e, encodeHTML(query));
+ }
+
+ ResultSetRewindable rs = ExtractionDBCache.convertJSONtoResultSet(result);
+ String uri;
+ QuerySolution qs;
+ while(rs.hasNext()){
+ qs = rs.next();
+ uri = qs.getResource("x0").getURI();
+ if(!posExamples.contains(uri) && !negExamples.contains(uri)){
+ return getExample(uri);
+ }
+ }
+ }
+
+ return null;
+ }
+
+ private Example getExample(String uri){
+ StringBuilder sb = new StringBuilder();
+ sb.append("SELECT ?label ?imageURL ?comment WHERE{\n");
+ sb.append("<").append(uri).append("> <").append(RDFS.label.getURI()).append("> ").append("?label.\n");
+ sb.append("OPTIONAL{\n");
+ sb.append("<").append(uri).append("> <").append(FOAF.depiction.getURI()).append("> ").append("?imageURL.\n");
+ sb.append("}\n");
+ sb.append("OPTIONAL{\n");
+ sb.append("<").append(uri).append("> <").append(RDFS.comment.getURI()).append("> ").append("?comment.\n");
+ sb.append("FILTER(LANGMATCHES(LANG(?comment),'en'))\n");
+ sb.append("}\n");
+ sb.append("FILTER(LANGMATCHES(LANG(?label),'en'))\n");
+ sb.append("}");
+
+ ResultSetRewindable rs = ExtractionDBCache.convertJSONtoResultSet(selectCache.executeSelectQuery(endpoint, sb.toString()));
+ QuerySolution qs = rs.next();
+ String label = qs.getLiteral("label").getLexicalForm();
+ String imageURL = "";
+ if(qs.getResource("imageURL") != null){
+ imageURL = qs.getResource("imageURL").getURI();
+ }
+
+ String comment = qs.getLiteral("comment").getLexicalForm();
+ return new Example(uri, label, imageURL, comment);
+ }
+
+ public String encodeHTML(String s) {
+ StringBuffer out = new StringBuffer();
+ for (int i = 0; i < s.length(); i++) {
+ char c = s.charAt(i);
+ if (c > 127 || c == '"' || c == '<' || c == '>') {
+ out.append("&#" + (int) c + ";");
+ } else {
+ out.append(c);
+ }
+ }
+ return out.toString();
+ }
+}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLSearch.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLSearch.java 2010-10-12 14:30:20 UTC (rev 2381)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLSearch.java 2010-10-12 14:34:55 UTC (rev 2382)
@@ -111,8 +111,6 @@
sb.append("}\n");
sb.append("LIMIT ").append(limit);
sb.append(" OFFSET ").append(offset);
- System.out.println(sb.toString());
- GWT.log(sb.toString());
return sb.toString();
}
@@ -123,8 +121,6 @@
sb.append("?object <").append(RDFS.label).append("> ?label.\n");
sb.append("?label bif:contains \"").append(searchTerm).append("\".\n");
sb.append("}\n");
- System.out.println(sb.toString());
- GWT.log(sb.toString());
return sb.toString();
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-12 14:30:20 UTC (rev 2381)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-12 14:34:55 UTC (rev 2382)
@@ -5,6 +5,7 @@
import javax.servlet.http.HttpSession;
+import org.apache.log4j.Logger;
import org.dllearner.autosparql.client.SPARQLService;
import org.dllearner.autosparql.client.exception.SPARQLQueryException;
import org.dllearner.autosparql.client.model.Example;
@@ -34,6 +35,8 @@
private ExtractionDBCache constructCache;
private ExtractionDBCache selectCache;
+ private static final Logger logger = Logger.getLogger(SPARQLServiceImpl.class);
+
public SPARQLServiceImpl(){
constructCache = new ExtractionDBCache("construct-cache");
selectCache = new ExtractionDBCache("select-cache");
@@ -71,82 +74,14 @@
@Override
public Example getSimilarExample(List<String> posExamples,
List<String> negExamples) throws SPARQLQueryException{
- System.out.println("RETRIEVING NEXT SIMILIAR EXAMPLE");
- System.out.println("POS EXAMPLES: " + posExamples);
- System.out.println("NEG EXAMPLES: " + negExamples);
- String query = null;
- if(posExamples.size() == 1 && negExamples.isEmpty()){
- System.out.println("USING GENERALISATION");
- QueryTreeGenerator treeGen = new QueryTreeGenerator(constructCache, getEndpoint(), 3000);
- QueryTree<String> tree = treeGen.getQueryTree(posExamples.get(0));
- System.out.println(tree.toSPARQLQueryString());
- Generalisation<String> generalisation = new Generalisation<String>();
- QueryTree<String> genTree = generalisation.generalise(tree);
- query = genTree.toSPARQLQueryString();
- System.out.println("GENERALISED QUERY: \n" + query);
- } else {
- SPARQLQueryGenerator gen = new SPARQLQueryGeneratorImpl(getEndpoint().getURL().toString());
- List<String> queries = gen.getSPARQLQueries(new HashSet<String>(posExamples), new HashSet<String>(negExamples));
- query = queries.get(0);
-
- }
- query = query + " LIMIT 10";
- System.out.println("SENDING QUERY:\n" + query);
- String result = "";
- try {
- result = selectCache.executeSelectQuery(getEndpoint(), query);
- } catch (Exception e) {
- e.printStackTrace();
- throw new SPARQLQueryException(e, encodeHTML(query));
- }
+ logger.info("RETRIEVING NEXT SIMILIAR EXAMPLE");
+ logger.info("POS EXAMPLES: " + posExamples);
+ logger.info("NEG EXAMPLES: " + negExamples);
- ResultSetRewindable rs = ExtractionDBCache.convertJSONtoResultSet(result);
- String uri;
- QuerySolution qs;
- while(rs.hasNext()){
- qs = rs.next();
- uri = qs.getResource("x0").getURI();
- if(!posExamples.contains(uri) && !negExamples.contains(uri)){
- return getExample(uri);
- }
- }
- return null;
- }
-
- private Example getExample(String uri){
- StringBuilder sb = new StringBuilder();
- sb.append("SELECT ?label ?imageURL ?comment WHERE{");
- sb.append("<").append(uri).append("> <").append(RDFS.label.getURI()).append("> ").append("?label.");
- sb.append("<").append(uri).append("> <").append(FOAF.depiction.getURI()).append("> ").append("?imageURL.");
- sb.append("<").append(uri).append("> <").append(RDFS.comment.getURI()).append("> ").append("?comment.");
- sb.append("FILTER(LANGMATCHES(LANG(?label),'en'))");
- sb.append("FILTER(LANGMATCHES(LANG(?comment),'en'))");
- sb.append("}");
+ ExampleFinder exFinder = new ExampleFinder(getEndpoint(), selectCache, constructCache);
+ Example example = exFinder.findSimilarExample(posExamples, negExamples);
- ResultSetRewindable rs = ExtractionDBCache.convertJSONtoResultSet(selectCache.executeSelectQuery(getEndpoint(), sb.toString()));
- QuerySolution qs = rs.next();
- String label = qs.getLiteral("label").getLexicalForm();
- String imageURL = qs.getResource("imageURL").getURI();
- String comment = qs.getLiteral("comment").getLexicalForm();
- return new Example(uri, label, imageURL, comment);
+ return example;
}
- public String encodeHTML(String s)
- {
- StringBuffer out = new StringBuffer();
- for(int i=0; i<s.length(); i++)
- {
- char c = s.charAt(i);
- if(c > 127 || c=='"' || c=='<' || c=='>')
- {
- out.append("&#"+(int)c+";");
- }
- else
- {
- out.append(c);
- }
- }
- return out.toString();
- }
-
}
Modified: trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ModelCreationTest.java
===================================================================
--- trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ModelCreationTest.java 2010-10-12 14:30:20 UTC (rev 2381)
+++ trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ModelCreationTest.java 2010-10-12 14:34:55 UTC (rev 2382)
@@ -35,7 +35,6 @@
ConsoleAppender consoleAppender = new ConsoleAppender(layout);
FileAppender fileAppender = new FileAppender(layout,
"log/model_test.log", false);
- Logger logger = Logger.getRootLogger();
logger.removeAllAppenders();
logger.addAppender(consoleAppender);
logger.addAppender(fileAppender);
@@ -65,7 +64,7 @@
logger.debug("Chunk strategy returned " + (model1.size() - model2.size()) + " more triple.");
diff.add(model1.difference(model2));
} else if(model2.size() > model1.size()){
- logger.debug("Inremental strategy returned " + (model2.size() - model1.size()) + " more triple.");
+ logger.debug("Incremental strategy returned " + (model2.size() - model1.size()) + " more triple.");
diff.add(model2.difference(model1));
} else {
logger.debug("Both strategies returned the same number of triple.");
@@ -83,7 +82,7 @@
for(Iterator<Statement> i = diff.listStatements();i.hasNext(); st = i.next()){
System.out.println(st);
}
- assertTrue(model1.size() == model2.size());
+// assertTrue(model1.size() == model2.size());
} catch (MalformedURLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sha...@us...> - 2010-10-12 21:58:19
|
Revision: 2383
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2383&view=rev
Author: shadowtm
Date: 2010-10-12 21:58:13 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
Excluded certain tests from running in components-core.
Modified Paths:
--------------
trunk/autosparql/pom.xml
trunk/components-core/pom.xml
trunk/pom.xml
Modified: trunk/autosparql/pom.xml
===================================================================
--- trunk/autosparql/pom.xml 2010-10-12 14:34:55 UTC (rev 2382)
+++ trunk/autosparql/pom.xml 2010-10-12 21:58:13 UTC (rev 2383)
@@ -25,12 +25,6 @@
</properties>
- <repositories>
- <repository>
- <id>GXT</id>
- <url>http://maven.jahia.org/maven2/</url>
- </repository>
- </repositories>
<dependencies>
<!-- GWT dependencies (from central repo) -->
@@ -58,7 +52,6 @@
<dependency>
<groupId>com.extjs</groupId>
<artifactId>gxt</artifactId>
- <version>2.2.0</version>
</dependency>
<dependency>
Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml 2010-10-12 14:34:55 UTC (rev 2382)
+++ trunk/components-core/pom.xml 2010-10-12 21:58:13 UTC (rev 2383)
@@ -16,6 +16,25 @@
<version>1.0-SNAPSHOT</version>
</parent>
+ <build>
+ <plugins>
+ <!--Surefire - for JUnits-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <excludes>
+ <exclude>org/dllearner/test/*</exclude>
+ <exclude>org/dllearner/test/junit/TestOntologies.java</exclude>
+ <!--This line excludes inner classes-->
+ <exclude>**/*$*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<!-- THIS IS FROM THE UNIBAS REPO-->
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-10-12 14:34:55 UTC (rev 2382)
+++ trunk/pom.xml 2010-10-12 21:58:13 UTC (rev 2383)
@@ -31,6 +31,16 @@
</modules>
<build>
+ <pluginManagement>
+ <plugins>
+ <!--Surefire - for JUnits-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<!--Maven Compiler Plugin-->
@@ -107,6 +117,12 @@
<version>1.2.16</version>
</dependency>
+ <dependency>
+ <groupId>com.extjs</groupId>
+ <artifactId>gxt</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+
<!--Available via central, we use the latest with minor mods to DL Learner source (IE Dig related code)-->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
@@ -291,6 +307,10 @@
<url>http://projectlombok.org/mavenrepo</url>
</repository>
+ <repository>
+ <id>GXT</id>
+ <url>http://maven.jahia.org/maven2/</url>
+ </repository>
</repositories>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sha...@us...> - 2010-10-13 19:47:03
|
Revision: 2388
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2388&view=rev
Author: shadowtm
Date: 2010-10-13 19:46:51 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
Added plugin to create components-core test jar so that the interfaces tests could reuse some of the code that was stored there. Cleaned up the parent pom to specify the plugins in pluginsManagement rather than in plugins. This was causing all plugins to be run for all modules implicitly. Now, if the child components wish to use a particular plugin they will have to specify it explicity with its pom.
At this version, the entire project is building successfully with a maven install.
Modified Paths:
--------------
trunk/components-core/pom.xml
trunk/interfaces/pom.xml
trunk/pom.xml
Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml 2010-10-13 15:16:16 UTC (rev 2387)
+++ trunk/components-core/pom.xml 2010-10-13 19:46:51 UTC (rev 2388)
@@ -22,7 +22,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
<configuration>
<excludes>
<exclude>org/dllearner/test/*</exclude>
@@ -32,6 +31,18 @@
</excludes>
</configuration>
</plugin>
+ <!--Jar the tests up into a separate jar so other components tests' can leverage them-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: trunk/interfaces/pom.xml
===================================================================
--- trunk/interfaces/pom.xml 2010-10-13 15:16:16 UTC (rev 2387)
+++ trunk/interfaces/pom.xml 2010-10-13 19:46:51 UTC (rev 2388)
@@ -15,15 +15,38 @@
<artifactId>dllearner-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
+
+ <build>
+ <plugins>
+ <!--Surefire - for JUnits-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/dllearner/test/junit/OWLlinkTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
-
<dependencies>
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>components-core</artifactId>
</dependency>
+
+ <!--Added the dependency of the core tests so that they will be accessible from the tests in this component-->
<dependency>
<groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dllearner</groupId>
<artifactId>components-ext</artifactId>
</dependency>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-10-13 15:16:16 UTC (rev 2387)
+++ trunk/pom.xml 2010-10-13 19:46:51 UTC (rev 2388)
@@ -31,6 +31,11 @@
</modules>
<build>
+ <!--
+ - Plugin Management defines the plugins that the child components can use
+ - It's good practice to do this as we can ensure all children use common versions
+ - of the plugins, and we can look in one place to see all plugin dependencies.
+ -->
<pluginManagement>
<plugins>
<!--Surefire - for JUnits-->
@@ -39,47 +44,55 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
</plugin>
+ <!--Maven Compiler Plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <!--We use 1.6-->
+ <source>${compiler.version}</source>
+ <target>${compiler.version}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
+ <!--
+ - Maven Jar Plugin - if you want to create and/or sign jars.
+ - I'm putting this in so we can create a jar for the test classes
+ - in components core so that other components' tests can leverage them
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <!--JAR the Sources-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--JAR the Java docs-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
- <plugins>
-
- <!--Maven Compiler Plugin-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <!--We use 1.6-->
- <source>${compiler.version}</source>
- <target>${compiler.version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <!--JAR the Sources-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--JAR the Java docs-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<dependencyManagement>
@@ -221,8 +234,16 @@
<version>${dllearner.version}</version>
</dependency>
+ <!--This is the jar of the tests from components-core-->
<dependency>
<groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ <version>${dllearner.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dllearner</groupId>
<artifactId>components-ext</artifactId>
<version>${dllearner.version}</version>
</dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-10-15 10:51:40
|
Revision: 2394
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2394&view=rev
Author: lorenz_b
Date: 2010-10-15 10:51:31 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
Continued autosparql component.
Modified Paths:
--------------
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SparqlEndpoint.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/BruteForceNBRStrategy.java
trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/DBPediaTestScript.java
trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ExamplesList.txt
trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/NBRTest.java
Added Paths:
-----------
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/model/Endpoint.java
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java 2010-10-14 17:40:43 UTC (rev 2393)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java 2010-10-15 10:51:31 UTC (rev 2394)
@@ -3,6 +3,7 @@
import java.util.List;
import org.dllearner.autosparql.client.exception.SPARQLQueryException;
+import org.dllearner.autosparql.client.model.Endpoint;
import org.dllearner.autosparql.client.model.Example;
import com.extjs.gxt.ui.client.data.PagingLoadConfig;
@@ -20,6 +21,10 @@
PagingLoadResult<Example> getCurrentQueryResult(PagingLoadConfig config) throws SPARQLQueryException;
+ void setEndpoint(Endpoint endpoint);
+
+ List<Endpoint> getEndpoints();
+
/**
* Utility class to get the RPC Async interface from client-side code
*/
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java 2010-10-14 17:40:43 UTC (rev 2393)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java 2010-10-15 10:51:31 UTC (rev 2394)
@@ -2,6 +2,7 @@
import java.util.List;
+import org.dllearner.autosparql.client.model.Endpoint;
import org.dllearner.autosparql.client.model.Example;
import com.extjs.gxt.ui.client.data.PagingLoadConfig;
@@ -21,4 +22,8 @@
void getCurrentQueryResult(PagingLoadConfig config, AsyncCallback<PagingLoadResult<Example>> callback);
+ void setEndpoint(Endpoint endpoint, AsyncCallback<Void> callback);
+
+ void getEndpoints(AsyncCallback<List<Endpoint>> callback);
+
}
Added: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/model/Endpoint.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/model/Endpoint.java (rev 0)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/model/Endpoint.java 2010-10-15 10:51:31 UTC (rev 2394)
@@ -0,0 +1,27 @@
+package org.dllearner.autosparql.client.model;
+
+
+import com.extjs.gxt.ui.client.data.BaseModel;
+
+public class Endpoint extends BaseModel{
+
+
+ private static final long serialVersionUID = -3347290446256124889L;
+
+ public Endpoint(){
+ }
+
+ public Endpoint(int id, String label){
+ set("id", id);
+ set("label", label);
+ }
+
+ public String getLabel(){
+ return get("label");
+ }
+
+ public int getID(){
+ return get("id");
+ }
+
+}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-14 17:40:43 UTC (rev 2393)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-15 10:51:31 UTC (rev 2394)
@@ -1,8 +1,11 @@
package org.dllearner.autosparql.client.view;
+import java.util.List;
+
import org.dllearner.autosparql.client.AppEvents;
import org.dllearner.autosparql.client.SPARQLService;
import org.dllearner.autosparql.client.exception.SPARQLQueryException;
+import org.dllearner.autosparql.client.model.Endpoint;
import org.dllearner.autosparql.client.model.Example;
import org.dllearner.autosparql.client.widget.ExamplesPanel;
import org.dllearner.autosparql.client.widget.InfoPanel;
@@ -15,15 +18,19 @@
import com.extjs.gxt.ui.client.Style.Orientation;
import com.extjs.gxt.ui.client.event.Listener;
import com.extjs.gxt.ui.client.event.MessageBoxEvent;
+import com.extjs.gxt.ui.client.event.SelectionChangedEvent;
+import com.extjs.gxt.ui.client.event.SelectionChangedListener;
import com.extjs.gxt.ui.client.mvc.AppEvent;
import com.extjs.gxt.ui.client.mvc.Controller;
import com.extjs.gxt.ui.client.mvc.View;
+import com.extjs.gxt.ui.client.store.ListStore;
import com.extjs.gxt.ui.client.util.Margins;
import com.extjs.gxt.ui.client.widget.HtmlContainer;
import com.extjs.gxt.ui.client.widget.LayoutContainer;
import com.extjs.gxt.ui.client.widget.MessageBox;
import com.extjs.gxt.ui.client.widget.Viewport;
import com.extjs.gxt.ui.client.widget.button.Button;
+import com.extjs.gxt.ui.client.widget.form.ComboBox;
import com.extjs.gxt.ui.client.widget.layout.BorderLayout;
import com.extjs.gxt.ui.client.widget.layout.BorderLayoutData;
import com.extjs.gxt.ui.client.widget.layout.FitLayout;
@@ -103,8 +110,10 @@
LayoutContainer vPanel = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
mainPanel.add(vPanel, new RowData(0.3, 1, new Margins(0, 5, 0, 0)));
+ vPanel.add(createEndpointSelector(), new RowData(-1, -1, new Margins(0, 0, 10, 0)));
+
dummyPanel = new LayoutContainer(new FitLayout());
- vPanel.add(dummyPanel, new RowData(1, 0.3, new Margins(0, 0, 10, 0)));
+ vPanel.add(dummyPanel, new RowData(1, 0.2, new Margins(0, 0, 10, 0)));
infoPanel = new InfoPanel();
dummyPanel.add(infoPanel);
@@ -112,7 +121,7 @@
interactivePanel = new InteractivePanel();
searchPanel = new SearchPanel();
- vPanel.add(searchPanel, new RowData(1, 0.7, new Margins(5, 0, 0, 0)));
+ vPanel.add(searchPanel, new RowData(1, 0.8, new Margins(5, 0, 0, 0)));
vPanel = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
mainPanel.add(vPanel, new RowData(0.7, 1, new Margins(0, 0, 0, 5)));
@@ -152,6 +161,7 @@
}
private void createHeaderPanel(){
+ LayoutContainer c = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
StringBuffer sb = new StringBuffer();
sb.append("<div id='demo-theme'></div><div id=demo-title>AutoSPARQL</div>");
@@ -163,13 +173,58 @@
final Image logo = new Image("dl-learner_logo.gif");
logo.setHeight("30px");
headerPanel.add(logo, "#demo-theme");
+
+ c.add(headerPanel);
+ c.add(createEndpointSelector());
BorderLayoutData data = new BorderLayoutData(LayoutRegion.NORTH, 33);
data.setMargins(new Margins());
- viewport.add(headerPanel, data);
+ viewport.add(c, data);
+
Registry.register(HEADER_PANEL, headerPanel);
}
+ private ComboBox<Endpoint> createEndpointSelector(){
+ final ListStore<Endpoint> endpoints = new ListStore<Endpoint>();
+ SPARQLService.Util.getInstance().getEndpoints(new AsyncCallback<List<Endpoint>>() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+
+ }
+
+ @Override
+ public void onSuccess(List<Endpoint> result) {
+ endpoints.add(result);
+
+ }
+
+ });
+
+ ComboBox<Endpoint> combo = new ComboBox<Endpoint>();
+ combo.setEditable(false);
+ combo.setEmptyText("Select an endpoint...");
+ combo.setDisplayField("label");
+ combo.setWidth(150);
+ combo.setStore(endpoints);
+ combo.setTypeAhead(true);
+ combo.addSelectionChangedListener(new SelectionChangedListener<Endpoint>() {
+ @Override
+ public void selectionChanged(SelectionChangedEvent<Endpoint> se) {
+ SPARQLService.Util.getInstance().setEndpoint(se.getSelectedItem(), new AsyncCallback<Void>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ }
+ @Override
+ public void onSuccess(Void result) {
+ }
+ });
+ }
+ });
+
+ return combo;
+ }
+
private void createResultPanel(){
resultPanel = new ResultPanel();
viewport.add(resultPanel);
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-14 17:40:43 UTC (rev 2393)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-15 10:51:31 UTC (rev 2394)
@@ -8,6 +8,7 @@
import org.apache.log4j.Logger;
import org.dllearner.autosparql.client.SPARQLService;
import org.dllearner.autosparql.client.exception.SPARQLQueryException;
+import org.dllearner.autosparql.client.model.Endpoint;
import org.dllearner.autosparql.client.model.Example;
import com.extjs.gxt.ui.client.data.BasePagingLoadResult;
@@ -60,7 +61,7 @@
}
private SparqlEndpoint getEndpoint(){
- SparqlEndpoint endpoint = SparqlEndpoint.getEndpointDBpediaAKSW();//(SparqlEndpoint) getSession().getAttribute(ENDPOINT);
+ SparqlEndpoint endpoint = (SparqlEndpoint) getSession().getAttribute(ENDPOINT);
return endpoint;
}
@@ -149,5 +150,30 @@
return newQuery;
}
+
+ @Override
+ public void setEndpoint(Endpoint endpoint) {
+ switch(endpoint.getID()){
+ case 0:setEndpoint(SparqlEndpoint.getEndpointDBpedia());break;
+ case 1:setEndpoint(SparqlEndpoint.getEndpointDBpediaLive());break;
+ case 2:setEndpoint(SparqlEndpoint.getEndpointDBpediaAKSW());break;
+ case 3:setEndpoint(SparqlEndpoint.getEndpointDBpediaHanne());break;
+ case 4:setEndpoint(SparqlEndpoint.getEndpointLinkedGeoData());break;
+ default:setEndpoint(SparqlEndpoint.getEndpointDBpedia());break;
+ }
+ }
+
+ @Override
+ public List<Endpoint> getEndpoints() {
+ List<Endpoint> endpoints = new ArrayList<Endpoint>();
+
+ endpoints.add(new Endpoint(0, "DBpedia"));
+ endpoints.add(new Endpoint(1, "DBpedia_Live"));
+ endpoints.add(new Endpoint(2, "DBpedia@AKSW"));
+ endpoints.add(new Endpoint(3, "DBpedia@Hanne"));
+ endpoints.add(new Endpoint(4, "LinkedGeoData"));
+
+ return endpoints;
+ }
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SparqlEndpoint.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SparqlEndpoint.java 2010-10-14 17:40:43 UTC (rev 2393)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SparqlEndpoint.java 2010-10-15 10:51:31 UTC (rev 2394)
@@ -173,6 +173,42 @@
defaultGraphURIs.add("http://dbpedia.org");
return new SparqlEndpoint(u, defaultGraphURIs, new LinkedList<String>());
}
+
+ public static SparqlEndpoint getEndpointDBpediaHanne() {
+ URL u = null;
+ try {
+ u = new URL("http://hanne.aksw.org:8892/sparql");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ LinkedList<String> defaultGraphURIs=new LinkedList<String>();
+ defaultGraphURIs.add("http://dbpedia.org");
+ return new SparqlEndpoint(u, defaultGraphURIs, new LinkedList<String>());
+ }
+
+ public static SparqlEndpoint getEndpointDBpediaLive() {
+ URL u = null;
+ try {
+ u = new URL("http://dbpedia-live.openlinksw.com/sparql");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ LinkedList<String> defaultGraphURIs=new LinkedList<String>();
+ defaultGraphURIs.add("http://dbpedia.org");
+ return new SparqlEndpoint(u, defaultGraphURIs, new LinkedList<String>());
+ }
+
+ public static SparqlEndpoint getEndpointLinkedGeoData() {
+ URL u = null;
+ try {
+ u = new URL("http://linkedgeodata.org/sparql");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ LinkedList<String> defaultGraphURIs=new LinkedList<String>();
+ //TODO defaultGraphURIs.add("http://geonames.org");
+ return new SparqlEndpoint(u, defaultGraphURIs, new LinkedList<String>());
+ }
public static SparqlEndpoint getEndpointLOCALGeonames() {
URL u = null;
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/BruteForceNBRStrategy.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/BruteForceNBRStrategy.java 2010-10-14 17:40:43 UTC (rev 2393)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/BruteForceNBRStrategy.java 2010-10-15 10:51:31 UTC (rev 2394)
@@ -19,9 +19,11 @@
*/
package org.dllearner.sparqlquerygenerator.operations.nbr.strategy;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import org.apache.log4j.Logger;
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
import org.dllearner.sparqlquerygenerator.datastructures.impl.QueryTreeImpl;
@@ -31,11 +33,21 @@
*
*/
public class BruteForceNBRStrategy<N> implements NBRStrategy<N> {
+
+ private static final Logger logger = Logger.getLogger(BruteForceNBRStrategy.class);
@Override
public QueryTree<N> computeNBR(QueryTree<N> posExampleTree, Set<QueryTree<N>> negExampleTrees) {
+ logger.info("Making NBR on");
+ logger.info(posExampleTree.getStringRepresentation());
+ logger.info("with negative examples");
+ for(QueryTree<N> tree : negExampleTrees){
+ logger.info(tree.getStringRepresentation());
+ }
+
QueryTree<N> nbr = new QueryTreeImpl<N>(posExampleTree);
if(subsumesTrees(posExampleTree, negExampleTrees)){
+ logger.info("Warning: Positive example already covers all negative examples. Skipping NBR computation...");
return nbr;
}
@@ -70,7 +82,18 @@
@Override
public Set<QueryTree<N>> computeNBRs(QueryTree<N> posExampleTree,
Set<QueryTree<N>> negExampleTrees) {
+ logger.info("Making NBR on");
+ logger.info(posExampleTree.getStringRepresentation());
+ logger.info("with negative examples");
+ for(QueryTree<N> tree : negExampleTrees){
+ logger.info(tree.getStringRepresentation());
+ }
+ if(subsumesTrees(posExampleTree, negExampleTrees)){
+ logger.info("Warning: Positive example already covers all negative examples. Skipping NBR computation...");
+ return Collections.singleton(posExampleTree);
+ }
+
Set<QueryTree<N>> nbrs = new HashSet<QueryTree<N>>();
compute(posExampleTree, negExampleTrees, nbrs);
Modified: trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/DBPediaTestScript.java
===================================================================
--- trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/DBPediaTestScript.java 2010-10-14 17:40:43 UTC (rev 2393)
+++ trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/DBPediaTestScript.java 2010-10-15 10:51:31 UTC (rev 2394)
@@ -33,6 +33,7 @@
import org.apache.log4j.SimpleLayout;
import org.dllearner.sparqlquerygenerator.impl.SPARQLQueryGeneratorImpl;
import org.dllearner.sparqlquerygenerator.operations.lgg.LGGGeneratorImpl;
+import org.dllearner.sparqlquerygenerator.operations.nbr.strategy.BruteForceNBRStrategy;
/**
*
@@ -55,8 +56,9 @@
logger.addAppender(consoleAppender);
logger.addAppender(fileAppender);
logger.setLevel(Level.INFO);
- Logger.getLogger(SPARQLQueryGeneratorImpl.class).setLevel(Level.DEBUG);
- Logger.getLogger(LGGGeneratorImpl.class).setLevel(Level.OFF);
+ Logger.getLogger(SPARQLQueryGeneratorImpl.class).setLevel(Level.INFO);
+ Logger.getLogger(LGGGeneratorImpl.class).setLevel(Level.INFO);
+ Logger.getLogger(BruteForceNBRStrategy.class).setLevel(Level.INFO);
SPARQLQueryGenerator gen = new SPARQLQueryGeneratorImpl(DBPEDIA_ENDPOINT_URL);
Modified: trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ExamplesList.txt
===================================================================
--- trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ExamplesList.txt 2010-10-14 17:40:43 UTC (rev 2393)
+++ trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/ExamplesList.txt 2010-10-15 10:51:31 UTC (rev 2394)
@@ -1,2 +1,3 @@
-+http://dbpedia.org/resource/Harley_Race
--http://dbpedia.org/resource/Barack_Obama
\ No newline at end of file
++http://dbpedia.org/resource/University_of_Leipzig
++http://dbpedia.org/resource/Leipzig_school_%28sociology%29
+-http://dbpedia.org/resource/Ackermann%E2%80%93Teubner_Memorial_Award
\ No newline at end of file
Modified: trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/NBRTest.java
===================================================================
--- trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/NBRTest.java 2010-10-14 17:40:43 UTC (rev 2393)
+++ trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/NBRTest.java 2010-10-15 10:51:31 UTC (rev 2394)
@@ -51,7 +51,7 @@
int cnt = 1;
for(QueryTree<String> tree : posExampleTrees){
System.out.println("POSITIVE EXAMPLE TREE " + cnt);
- tree.dump();
+ System.out.println(tree.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt++;
}
@@ -59,14 +59,14 @@
QueryTree<String> lgg = lggGenerator.getLGG(posExampleTrees);
System.out.println("LGG");
- lgg.dump();
+ System.out.println(lgg.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt = 1;
for(QueryTree<String> tree : negExampleTrees){
System.out.println("NEGATIVE EXAMPLE TREE " + cnt);
- tree.dump();
+ System.out.println(tree.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt++;
}
@@ -74,7 +74,7 @@
QueryTree<String> nbr = nbrGenerator.getNBR(lgg, negExampleTrees);
System.out.println("NBR");
- nbr.dump();
+ System.out.println(nbr.getStringRepresentation());
}
@@ -89,7 +89,7 @@
int cnt = 1;
for(QueryTree<String> tree : posExampleTrees){
System.out.println("POSITIVE EXAMPLE TREE " + cnt);
- tree.dump();
+ System.out.println(tree.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt++;
}
@@ -97,14 +97,14 @@
QueryTree<String> lgg = lggGenerator.getLGG(posExampleTrees);
System.out.println("LGG");
- lgg.dump();
+ System.out.println(lgg.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt = 1;
for(QueryTree<String> tree : negExampleTrees){
System.out.println("NEGATIVE EXAMPLE TREE " + cnt);
- tree.dump();
+ System.out.println(tree.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt++;
}
@@ -113,7 +113,7 @@
cnt = 1;
for(QueryTree<String> tree : nbrs){
System.out.println("NBR " + cnt);
- tree.dump();
+ System.out.println(tree.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt++;
}
@@ -130,7 +130,7 @@
int cnt = 1;
for(QueryTree<String> tree : posExampleTrees){
System.out.println("POSITIVE EXAMPLE TREE " + cnt);
- tree.dump();
+ System.out.println(tree.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt++;
}
@@ -138,14 +138,14 @@
QueryTree<String> lgg = lggGenerator.getLGG(posExampleTrees);
System.out.println("LGG");
- lgg.dump();
+ System.out.println(lgg.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt = 1;
for(QueryTree<String> tree : negExampleTrees){
System.out.println("NEGATIVE EXAMPLE TREE " + cnt);
- tree.dump();
+ System.out.println(tree.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt++;
}
@@ -153,7 +153,7 @@
QueryTree<String> nbr = nbrGenerator.getNBR(lgg, negExampleTrees);
System.out.println("NBR");
- nbr.dump();
+ System.out.println(nbr.getStringRepresentation());
}
@Test
@@ -167,7 +167,7 @@
int cnt = 1;
for(QueryTree<String> tree : posExampleTrees){
System.out.println("POSITIVE EXAMPLE TREE " + cnt);
- tree.dump();
+ System.out.println(tree.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt++;
}
@@ -175,14 +175,14 @@
QueryTree<String> lgg = lggGenerator.getLGG(posExampleTrees);
System.out.println("LGG");
- lgg.dump();
+ System.out.println(lgg.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt = 1;
for(QueryTree<String> tree : negExampleTrees){
System.out.println("NEGATIVE EXAMPLE TREE " + cnt);
- tree.dump();
+ System.out.println(tree.getStringRepresentation());
System.out.println("-----------------------------------------------");
cnt++;
}
@@ -190,7 +190,7 @@
QueryTree<String> nbr = nbrGenerator.getNBR(lgg, negExampleTrees);
System.out.println("NBR");
-// nbr.dump();
+ System.out.println(nbr.getStringRepresentation());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sha...@us...> - 2010-10-15 17:36:11
|
Revision: 2395
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2395&view=rev
Author: shadowtm
Date: 2010-10-15 17:36:05 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
Excluded tests that were failing from running.
Modified Paths:
--------------
trunk/autosparql/pom.xml
trunk/sparql-query-generator/pom.xml
Modified: trunk/autosparql/pom.xml
===================================================================
--- trunk/autosparql/pom.xml 2010-10-15 10:51:31 UTC (rev 2394)
+++ trunk/autosparql/pom.xml 2010-10-15 17:36:05 UTC (rev 2395)
@@ -106,16 +106,17 @@
artifact here. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
<configuration> <webXml>target/web.xml</webXml> <warSourceExcludes>.gwt-tmp/**</warSourceExcludes>
</configuration> </plugin> -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- </configuration>
- </plugin>
+
+ <!--Surefire - for JUnits-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/dllearner/sparqlquerygenerator/NBRTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: trunk/sparql-query-generator/pom.xml
===================================================================
--- trunk/sparql-query-generator/pom.xml 2010-10-15 10:51:31 UTC (rev 2394)
+++ trunk/sparql-query-generator/pom.xml 2010-10-15 17:36:05 UTC (rev 2395)
@@ -1,43 +1,61 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>dllearner-parent</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>dllearner-parent</artifactId>
+ <groupId>org.dllearner</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
<groupId>org.dllearner</groupId>
+ <artifactId>sparql-query-generator</artifactId>
<version>1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.dllearner</groupId>
- <artifactId>sparql-query-generator</artifactId>
- <version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- </dependency>
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.jamonapi</groupId>
- <artifactId>jamon</artifactId>
- </dependency>
+ <build>
+ <plugins>
+ <!--Surefire - for JUnits-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/dllearner/sparqlquerygenerator/NBRTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jamonapi</groupId>
+ <artifactId>jamon</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-10-18 08:13:13
|
Revision: 2396
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2396&view=rev
Author: lorenz_b
Date: 2010-10-18 08:13:06 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Fixed compiler error.
Added test for finding examples.
Modified Paths:
--------------
trunk/autosparql/pom.xml
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/model/Endpoint.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/NBRGenerator.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/NBRGeneratorImpl.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/BruteForceNBRStrategy.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/NBRStrategy.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/TagNonSubsumingPartsNBRStrategy.java
trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/NBRTest.java
Added Paths:
-----------
trunk/autosparql/src/test/java/org/dllearner/autosparql/server/
trunk/autosparql/src/test/java/org/dllearner/autosparql/server/ExampleFinderTest.java
Modified: trunk/autosparql/pom.xml
===================================================================
--- trunk/autosparql/pom.xml 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/autosparql/pom.xml 2010-10-18 08:13:06 UTC (rev 2396)
@@ -67,18 +67,20 @@
<artifactId>h2</artifactId>
</dependency>
<dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>sparql-query-generator</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>sparql-query-generator</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/model/Endpoint.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/model/Endpoint.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/model/Endpoint.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -21,7 +21,7 @@
}
public int getID(){
- return get("id");
+ return (Integer)get("id");
}
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -36,6 +36,7 @@
import com.extjs.gxt.ui.client.widget.layout.FitLayout;
import com.extjs.gxt.ui.client.widget.layout.RowData;
import com.extjs.gxt.ui.client.widget.layout.RowLayout;
+import com.extjs.gxt.ui.client.widget.tips.QuickTip;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.RootPanel;
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -193,6 +193,10 @@
return out.toString();
}
+ public void setEndpoint(SparqlEndpoint endpoint){
+ this.endpoint = endpoint;
+ }
+
public String getCurrentQuery(){
return currentQuery;
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -58,6 +58,7 @@
public void setEndpoint(SparqlEndpoint endpoint){
getSession().setAttribute(ENDPOINT, endpoint);
+// getExampleFinder().setEndpoint(endpoint);
}
private SparqlEndpoint getEndpoint(){
@@ -136,7 +137,7 @@
private String modifyQuery(String query){
String newQuery = query.replace("SELECT ?x0 WHERE {",
- "SELECT ?x0 ?label WHERE{\n?x0 <" + RDFS.label + "> ?label.");
+ "SELECT DISTINCT ?x0 ?label WHERE{\n?x0 <" + RDFS.label + "> ?label.");
return newQuery;
Added: trunk/autosparql/src/test/java/org/dllearner/autosparql/server/ExampleFinderTest.java
===================================================================
--- trunk/autosparql/src/test/java/org/dllearner/autosparql/server/ExampleFinderTest.java (rev 0)
+++ trunk/autosparql/src/test/java/org/dllearner/autosparql/server/ExampleFinderTest.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -0,0 +1,30 @@
+package org.dllearner.autosparql.server;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.dllearner.autosparql.client.exception.SPARQLQueryException;
+import org.junit.Test;
+
+public class ExampleFinderTest {
+
+ private static final SparqlEndpoint endpoint = SparqlEndpoint.getEndpointDBpediaAKSW();
+
+ @Test
+ public void test1(){
+ try {
+ ExampleFinder f = new ExampleFinder(endpoint, new ExtractionDBCache("select-cache"), new ExtractionDBCache("construct-cache"));
+
+ List<String> posExamples = new ArrayList<String>();
+ posExamples.add("http://dbpedia.org/resource/University_of_Leipzig");
+
+ List<String> negExamples = new ArrayList<String>();
+ negExamples.add("http://dbpedia.org/resource/Ackermann%E2%80%93Teubner_Memorial_Award");
+
+ System.out.println(f.findSimilarExample(posExamples, negExamples));
+ } catch (SPARQLQueryException e) {
+ e.printStackTrace();
+ }
+ }
+
+}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/NBRGenerator.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/NBRGenerator.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/NBRGenerator.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -19,6 +19,7 @@
*/
package org.dllearner.sparqlquerygenerator.operations.nbr;
+import java.util.List;
import java.util.Set;
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
@@ -34,13 +35,13 @@
QueryTree<N> getNBR(QueryTree<N> posExampleTree, Set<QueryTree<N>> negExampleTrees);
- Set<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree, QueryTree<N> negExampleTree);
+ List<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree, QueryTree<N> negExampleTree);
- Set<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree, Set<QueryTree<N>> negExampleTrees);
+ List<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree, Set<QueryTree<N>> negExampleTrees);
- Set<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree, QueryTree<N> negExampleTree, int limit);
+ List<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree, QueryTree<N> negExampleTree, int limit);
- Set<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree, Set<QueryTree<N>> negExampleTrees, int limit);
+ List<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree, Set<QueryTree<N>> negExampleTrees, int limit);
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/NBRGeneratorImpl.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/NBRGeneratorImpl.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/NBRGeneratorImpl.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -20,6 +20,7 @@
package org.dllearner.sparqlquerygenerator.operations.nbr;
import java.util.Collections;
+import java.util.List;
import java.util.Set;
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
@@ -57,26 +58,26 @@
}
@Override
- public Set<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree,
+ public List<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree,
QueryTree<N> negExampleTree) {
return strategy.computeNBRs(posExampleTree, Collections.singleton(negExampleTree));
}
@Override
- public Set<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree,
+ public List<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree,
Set<QueryTree<N>> negExampleTrees) {
return strategy.computeNBRs(posExampleTree, negExampleTrees);
}
@Override
- public Set<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree,
+ public List<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree,
QueryTree<N> negExampleTree, int limit) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Set<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree,
+ public List<QueryTree<N>> getNBRs(QueryTree<N> posExampleTree,
Set<QueryTree<N>> negExampleTrees, int limit) {
// TODO Auto-generated method stub
return null;
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/BruteForceNBRStrategy.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/BruteForceNBRStrategy.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/BruteForceNBRStrategy.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -19,8 +19,10 @@
*/
package org.dllearner.sparqlquerygenerator.operations.nbr.strategy;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.apache.log4j.Logger;
@@ -80,7 +82,7 @@
}
@Override
- public Set<QueryTree<N>> computeNBRs(QueryTree<N> posExampleTree,
+ public List<QueryTree<N>> computeNBRs(QueryTree<N> posExampleTree,
Set<QueryTree<N>> negExampleTrees) {
logger.info("Making NBR on");
logger.info(posExampleTree.getStringRepresentation());
@@ -91,10 +93,10 @@
if(subsumesTrees(posExampleTree, negExampleTrees)){
logger.info("Warning: Positive example already covers all negative examples. Skipping NBR computation...");
- return Collections.singleton(posExampleTree);
+ return Collections.singletonList(posExampleTree);
}
- Set<QueryTree<N>> nbrs = new HashSet<QueryTree<N>>();
+ List<QueryTree<N>> nbrs = new ArrayList<QueryTree<N>>();
compute(posExampleTree, negExampleTrees, nbrs);
@@ -102,7 +104,7 @@
}
private void compute(QueryTree<N> posExampleTree,
- Set<QueryTree<N>> negExampleTrees, Set<QueryTree<N>> nbrs) {
+ Set<QueryTree<N>> negExampleTrees, List<QueryTree<N>> nbrs) {
QueryTree<N> nbr = new QueryTreeImpl<N>(posExampleTree);
if(subsumesTrees(posExampleTree, negExampleTrees)){
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -52,7 +52,7 @@
}
@Override
- public Set<QueryTree<N>> computeNBRs(QueryTree<N> posExampleTree,
+ public List<QueryTree<N>> computeNBRs(QueryTree<N> posExampleTree,
Set<QueryTree<N>> negExampleTrees) {
// TODO Auto-generated method stub
return null;
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/NBRStrategy.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/NBRStrategy.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/NBRStrategy.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -19,6 +19,7 @@
*/
package org.dllearner.sparqlquerygenerator.operations.nbr.strategy;
+import java.util.List;
import java.util.Set;
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
@@ -32,6 +33,6 @@
QueryTree<N> computeNBR(QueryTree<N> posExampleTree, Set<QueryTree<N>> negExampleTrees);
- Set<QueryTree<N>> computeNBRs(QueryTree<N> posExampleTree, Set<QueryTree<N>> negExampleTrees);
+ List<QueryTree<N>> computeNBRs(QueryTree<N> posExampleTree, Set<QueryTree<N>> negExampleTrees);
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/TagNonSubsumingPartsNBRStrategy.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/TagNonSubsumingPartsNBRStrategy.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/TagNonSubsumingPartsNBRStrategy.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -19,6 +19,7 @@
*/
package org.dllearner.sparqlquerygenerator.operations.nbr.strategy;
+import java.util.List;
import java.util.Set;
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
@@ -45,7 +46,7 @@
}
@Override
- public Set<QueryTree<N>> computeNBRs(QueryTree<N> posExampleTree,
+ public List<QueryTree<N>> computeNBRs(QueryTree<N> posExampleTree,
Set<QueryTree<N>> negExampleTrees) {
// TODO Auto-generated method stub
return null;
Modified: trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/NBRTest.java
===================================================================
--- trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/NBRTest.java 2010-10-15 17:36:05 UTC (rev 2395)
+++ trunk/sparql-query-generator/src/test/java/org/dllearner/sparqlquerygenerator/NBRTest.java 2010-10-18 08:13:06 UTC (rev 2396)
@@ -19,6 +19,7 @@
*/
package org.dllearner.sparqlquerygenerator;
+import java.util.List;
import java.util.Set;
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
@@ -109,7 +110,7 @@
cnt++;
}
- Set<QueryTree<String>> nbrs = nbrGenerator.getNBRs(lgg, negExampleTrees);
+ List<QueryTree<String>> nbrs = nbrGenerator.getNBRs(lgg, negExampleTrees);
cnt = 1;
for(QueryTree<String> tree : nbrs){
System.out.println("NBR " + cnt);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-10-18 16:04:41
|
Revision: 2397
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2397&view=rev
Author: lorenz_b
Date: 2010-10-18 16:04:34 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Continued autosparql component.
Modified Paths:
--------------
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
trunk/autosparql/src/main/resources/org/dllearner/autosparql/public/Application.css
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLService.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -21,6 +21,8 @@
PagingLoadResult<Example> getCurrentQueryResult(PagingLoadConfig config) throws SPARQLQueryException;
+ String getCurrentQuery() throws SPARQLQueryException;
+
void setEndpoint(Endpoint endpoint);
List<Endpoint> getEndpoints();
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/SPARQLServiceAsync.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -22,6 +22,8 @@
void getCurrentQueryResult(PagingLoadConfig config, AsyncCallback<PagingLoadResult<Example>> callback);
+ void getCurrentQuery(AsyncCallback<String> callback);
+
void setEndpoint(Endpoint endpoint, AsyncCallback<Void> callback);
void getEndpoints(AsyncCallback<List<Endpoint>> callback);
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -273,7 +273,8 @@
public void onSuccess(Example result) {
interactivePanel.unmask();
interactivePanel.setExample(result);
- resultPanel.updateTable();
+ resultPanel.refresh(examplesPanel.getPositiveExamplesURIs(),
+ examplesPanel.getNegativeExamplesUris());
}
@Override
@@ -297,7 +298,7 @@
} else if(event.getType() == AppEvents.ShowInteractiveMode){
showInteractivePanel();
} else if(event.getType() == AppEvents.UpdateResultTable){
- resultPanel.updateTable();
+ resultPanel.refresh(examplesPanel.getPositiveExamplesURIs(), examplesPanel.getNegativeExamplesUris());
}
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ResultPanel.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -1,6 +1,7 @@
package org.dllearner.autosparql.client.widget;
import java.util.ArrayList;
+import java.util.List;
import org.dllearner.autosparql.client.SPARQLService;
import org.dllearner.autosparql.client.model.Example;
@@ -14,6 +15,9 @@
import com.extjs.gxt.ui.client.data.RpcProxy;
import com.extjs.gxt.ui.client.store.ListStore;
import com.extjs.gxt.ui.client.widget.ContentPanel;
+import com.extjs.gxt.ui.client.widget.TabItem;
+import com.extjs.gxt.ui.client.widget.TabPanel;
+import com.extjs.gxt.ui.client.widget.Text;
import com.extjs.gxt.ui.client.widget.grid.ColumnConfig;
import com.extjs.gxt.ui.client.widget.grid.ColumnModel;
import com.extjs.gxt.ui.client.widget.grid.Grid;
@@ -29,6 +33,16 @@
private static final int HEIGHT = 300;
private PagingLoader<PagingLoadResult<ModelData>> loader;
+
+ private List<String> posExamples;
+ private List<String> negExamples;
+
+ private TabPanel mainPanel;
+
+ private TabItem queryResultTab;
+ private TabItem queryTab;
+ private TabItem graphTab;
+
public ResultPanel(){
setLayout(new RowLayout(Orientation.HORIZONTAL));
@@ -37,7 +51,16 @@
setAnimCollapse(false);
setSize(WIDTH, HEIGHT);
+ mainPanel = new TabPanel();
+ mainPanel.setResizeTabs(true);
+ mainPanel.setTabScroll(true);
+ mainPanel.setAnimScroll(true);
+
+ add(mainPanel, new RowData(1, 1));
+
createResultGrid();
+ createQueryTab();
+ createGraphTab();
}
private void createResultGrid(){
@@ -80,20 +103,72 @@
public String getRowStyle(ModelData model, int rowIndex,
ListStore<ModelData> ds) {
// TODO Auto-generated method stub
- if(rowIndex % 2 == 0){
- return "row-Style-Odd";
- } else {
- return "row-Style-Even";
+// if(rowIndex % 2 == 0){
+// return "row-Style-Odd";
+// } else {
+// return "row-Style-Even";
+// }
+ String uri = model.get("uri");
+ if(posExamples.contains(uri)){
+ return "row-Style-Positive";
+ } else if(negExamples.contains(uri)){
+ return "row-Style-Negative";
+ } else if(rowIndex % 2 == 0){
+ return "row-Style-Odd";
+ } else {
+ return "row-Style-Even";
+
}
}
});
+ queryResultTab = new TabItem("Table");
+ queryResultTab.setLayout(new RowLayout(Orientation.VERTICAL));
+ queryResultTab.add(grid, new RowData(1, 1));
+ queryResultTab.add(toolbar, new RowData(1, -1));
+ mainPanel.add(queryResultTab);
- add(grid, new RowData(1, 1));
- setBottomComponent(toolbar);
+// add(grid, new RowData(1, 1));
+// setBottomComponent(toolbar);
// add(toolbar, new RowData(1, -1));
}
- public void updateTable(){
+ private void createQueryTab(){
+ queryTab = new TabItem("Query");
+ mainPanel.add(queryTab);
+ }
+
+ private void createGraphTab(){
+ graphTab = new TabItem("Graph");
+ mainPanel.add(graphTab);
+ }
+
+ public void refresh(List<String> posExamples, List<String> negExamples){
+ this.posExamples = posExamples;
+ this.negExamples = negExamples;
+
+ updateTable();
+ updateQuery();
+ }
+
+ private void updateTable(){
loader.load();
}
+
+ private void updateQuery(){
+ SPARQLService.Util.getInstance().getCurrentQuery(new AsyncCallback<String>() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void onSuccess(String result) {
+ queryTab.removeAll();
+ queryTab.addText(result);
+ }
+ });
+
+ }
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -28,6 +28,8 @@
private String currentQuery;
+ private QueryTree<String> currentQueryTree;
+
public ExampleFinder(SparqlEndpoint endpoint, ExtractionDBCache selectCache, ExtractionDBCache constructCache){
this.endpoint = endpoint;
this.selectCache = selectCache;
@@ -87,8 +89,11 @@
logger.info("USING GENERALISATION");
logger.info("QUERY BEFORE GENERALISATION: \n\n" + tree.toSPARQLQueryString(true));
Generalisation<String> generalisation = new Generalisation<String>();
+
QueryTree<String> genTree = generalisation.generalise(tree);
+
currentQuery = genTree.toSPARQLQueryString(true);
+ currentQueryTree = genTree;
logger.info("QUERY AFTER GENERALISATION: \n\n" + currentQuery);
currentQuery = currentQuery + " ORDER BY ?x0 LIMIT 10";
@@ -200,4 +205,8 @@
public String getCurrentQuery(){
return currentQuery;
}
+
+ public String getCurrentQueryHTML(){
+ return encodeHTML(currentQuery);
+ }
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/SPARQLServiceImpl.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -61,24 +61,6 @@
// getExampleFinder().setEndpoint(endpoint);
}
- private SparqlEndpoint getEndpoint(){
- SparqlEndpoint endpoint = (SparqlEndpoint) getSession().getAttribute(ENDPOINT);
- return endpoint;
- }
-
- private ExampleFinder getExampleFinder(){
- ExampleFinder exFinder = (ExampleFinder) getSession().getAttribute(EXAMPLE_FINDER);
- if(exFinder == null){
- exFinder = new ExampleFinder(getEndpoint(), selectCache, constructCache);
- getSession().setAttribute(EXAMPLE_FINDER, exFinder);
- }
- return exFinder;
- }
-
- private HttpSession getSession(){
- return getThreadLocalRequest().getSession();
- }
-
@Override
public Example getSimilarExample(List<String> posExamples,
List<String> negExamples) throws SPARQLQueryException{
@@ -135,23 +117,6 @@
return result;
}
- private String modifyQuery(String query){
- String newQuery = query.replace("SELECT ?x0 WHERE {",
- "SELECT DISTINCT ?x0 ?label WHERE{\n?x0 <" + RDFS.label + "> ?label.");
-
-
- return newQuery;
- }
-
- private String getCountQuery(String query){
- String newQuery = query.replace("SELECT ?x0",
- "SELECT COUNT(DISTINCT ?x0)");
- newQuery = newQuery.substring(0, newQuery.indexOf('}') + 1);
- System.out.println("COUNT query: " + newQuery);
-
- return newQuery;
- }
-
@Override
public void setEndpoint(Endpoint endpoint) {
switch(endpoint.getID()){
@@ -176,5 +141,43 @@
return endpoints;
}
+
+ @Override
+ public String getCurrentQuery() throws SPARQLQueryException {
+ return getExampleFinder().getCurrentQueryHTML();
+ }
+ private String modifyQuery(String query){
+ String newQuery = query.replace("SELECT ?x0 WHERE {",
+ "SELECT DISTINCT ?x0 ?label WHERE{\n?x0 <" + RDFS.label + "> ?label.");
+
+ return newQuery;
+ }
+
+ private SparqlEndpoint getEndpoint(){
+ SparqlEndpoint endpoint = (SparqlEndpoint) getSession().getAttribute(ENDPOINT);
+ return endpoint;
+ }
+
+ private ExampleFinder getExampleFinder(){
+ ExampleFinder exFinder = (ExampleFinder) getSession().getAttribute(EXAMPLE_FINDER);
+ if(exFinder == null){
+ exFinder = new ExampleFinder(getEndpoint(), selectCache, constructCache);
+ getSession().setAttribute(EXAMPLE_FINDER, exFinder);
+ }
+ return exFinder;
+ }
+
+ private HttpSession getSession(){
+ return getThreadLocalRequest().getSession();
+ }
+
+ private String getCountQuery(String query){
+ String newQuery = query.replace("SELECT ?x0",
+ "SELECT COUNT(DISTINCT ?x0)");
+ newQuery = newQuery.substring(0, newQuery.indexOf('}') + 1);
+
+ return newQuery;
+ }
+
}
Modified: trunk/autosparql/src/main/resources/org/dllearner/autosparql/public/Application.css
===================================================================
--- trunk/autosparql/src/main/resources/org/dllearner/autosparql/public/Application.css 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/autosparql/src/main/resources/org/dllearner/autosparql/public/Application.css 2010-10-18 16:04:34 UTC (rev 2397)
@@ -8,6 +8,14 @@
}
+ .row-Style-Positive{
+ background-color: green;
+ }
+
+ .row-Style-Negative{
+ background-color: red;
+ }
+
.x-grid3-row td.x-grid3-cell{
vertical-align: middle;
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java 2010-10-18 08:13:06 UTC (rev 2396)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java 2010-10-18 16:04:34 UTC (rev 2397)
@@ -39,6 +39,8 @@
filters.add("http://dbpedia.org/property/pageId");
filters.add("http://dbpedia.org/property/revisionId");
filters.add("http://dbpedia.org/ontology/abstract");
+ filters.add("http://dbpedia.org/ontology/thumbnail");
+ filters.add("http://dbpedia.org/property/wikiPageUsesTemplate");
return filters;
}
@@ -58,7 +60,8 @@
List<String> filters = new ArrayList<String>();
filters.add("http://purl.org/dc/elements/1.1/language");
-
+ filters.add("http://purl.org/dc/elements/1.1/rights");
+
return filters;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sha...@us...> - 2010-10-18 17:10:26
|
Revision: 2399
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2399&view=rev
Author: shadowtm
Date: 2010-10-18 17:10:19 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Fixing GWT problems by changing the scope of the servlet to compile so that it would be visible to the gwt maven plugin which runs during the compile phase.
Modified Paths:
--------------
trunk/autosparql/pom.xml
trunk/pom.xml
Modified: trunk/autosparql/pom.xml
===================================================================
--- trunk/autosparql/pom.xml 2010-10-18 16:34:09 UTC (rev 2398)
+++ trunk/autosparql/pom.xml 2010-10-18 17:10:19 UTC (rev 2399)
@@ -14,30 +14,17 @@
<name>AutoSPARQL</name>
<version>${dllearner.version}</version>
- <properties>
-
- <!-- convenience to define GWT version in one place -->
- <gwt.version>2.0.4</gwt.version>
-
- <!-- tell the compiler we can use 1.6 -->
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
-
- </properties>
-
<dependencies>
<!-- GWT dependencies (from central repo) -->
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
- <version>${gwt.version}</version>
- <scope>runtime</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
- <version>${gwt.version}</version>
<scope>provided</scope>
</dependency>
@@ -45,7 +32,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
@@ -69,7 +55,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.15</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -89,7 +74,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<goals>
@@ -101,7 +85,6 @@
</executions>
<configuration>
<runTarget>org.dllearner.autosparql.Application/Application.html</runTarget>
- <localWorkers/>
</configuration>
</plugin>
<!-- If you want to use the target/web.xml file mergewebxml produces,
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-10-18 16:34:09 UTC (rev 2398)
+++ trunk/pom.xml 2010-10-18 17:10:19 UTC (rev 2399)
@@ -17,6 +17,8 @@
<dllearner.version>1.0-SNAPSHOT</dllearner.version>
<protege.version>1.0-SNAPSHOT</protege.version>
<evalplugin.version>1.0-SNAPSHOT</evalplugin.version>
+ <!-- convenience to define GWT version in one place -->
+ <gwt.version>2.0.4</gwt.version>
</properties>
<modules>
@@ -91,6 +93,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gwt-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -290,6 +297,17 @@
<version>1.2.143</version>
</dependency>
+ <!--GWT Dependencies-->
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <version>${gwt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>${gwt.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sha...@us...> - 2010-11-10 21:35:37
|
Revision: 2420
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2420&view=rev
Author: shadowtm
Date: 2010-11-10 21:35:29 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
[maven-release-plugin] prepare branch 1.0.1
Modified Paths:
--------------
trunk/autosparql/pom.xml
trunk/components-core/pom.xml
trunk/components-ext/pom.xml
trunk/evalplugin/pom.xml
trunk/interfaces/pom.xml
trunk/pom.xml
trunk/protege/pom.xml
trunk/scripts/pom.xml
trunk/sparql-query-generator/pom.xml
Modified: trunk/autosparql/pom.xml
===================================================================
--- trunk/autosparql/pom.xml 2010-11-10 21:34:05 UTC (rev 2419)
+++ trunk/autosparql/pom.xml 2010-11-10 21:35:29 UTC (rev 2420)
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!-- POM generated by gwt-maven-plugin archetype -->
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>dllearner-parent</artifactId>
<groupId>org.dllearner</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.1</version>
</parent>
<groupId>org.dllearner</groupId>
<artifactId>autosparql</artifactId>
<packaging>war</packaging>
<name>AutoSPARQL</name>
- <version>${dllearner.version}</version>
+ <version>1.0.1</version>
<dependencies>
@@ -62,7 +61,7 @@
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>sparql-query-generator</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml 2010-11-10 21:34:05 UTC (rev 2419)
+++ trunk/components-core/pom.xml 2010-11-10 21:35:29 UTC (rev 2420)
@@ -1,167 +1,166 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
- <version>${dllearner.version}</version>
- <packaging>jar</packaging>
-
- <name>DL Learner Core Components</name>
- <url>http://maven.apache.org</url>
-
- <parent>
- <groupId>org.dllearner</groupId>
- <artifactId>dllearner-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <build>
- <plugins>
- <!--Surefire - for JUnits-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/dllearner/test/*</exclude>
- <exclude>org/dllearner/test/junit/TestOntologies.java</exclude>
- <!--This line excludes inner classes-->
- <exclude>**/*$*</exclude>
- </excludes>
- </configuration>
- </plugin>
- <!--Jar the tests up into a separate jar so other components tests' can leverage them-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- THIS IS FROM THE UNIBAS REPO-->
- <dependency>
- <groupId>net.sourceforge.owlapi</groupId>
- <artifactId>owlapi</artifactId>
- </dependency>
-
- <!-- THIS IS FROM THE UNIBAS REPO-->
- <dependency>
- <groupId>com.owldl</groupId>
- <artifactId>pellet</artifactId>
- <exclusions>
- <exclusion> <!-- declare the exclusion here -->
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <!--Available via central, we use the latest with minor mods to DL Learner source (IE Dig related code)-->
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- </dependency>
-
- <!--SwingX is in central-->
- <dependency>
- <groupId>org.swinglabs</groupId>
- <artifactId>swingx</artifactId>
- </dependency>
-
-
- <!--JSON is in Central-->
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </dependency>
-
-
-
- <dependency>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- </dependency>
-
-
- <!--Lucene is in Central-->
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.ini4j</groupId>
- <artifactId>ini4j</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.factplusplus</groupId>
- <artifactId>factpp-owlapi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.owlapi.owllink</groupId>
- <artifactId>owllink</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.semanticweb.hermit</groupId>
- <artifactId>hermit</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.jamonapi</groupId>
- <artifactId>jamon</artifactId>
- </dependency>
-
- <!--JENA ARQ is in central - we use the latest-->
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.dig</groupId>
- <artifactId>dig-xmlbeans</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
-
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ <version>1.0.1</version>
+ <packaging>jar</packaging>
+
+ <name>DL Learner Core Components</name>
+ <url>http://maven.apache.org</url>
+
+ <parent>
+ <groupId>org.dllearner</groupId>
+ <artifactId>dllearner-parent</artifactId>
+ <version>1.0.1</version>
+ </parent>
+
+ <build>
+ <plugins>
+ <!--Surefire - for JUnits-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/dllearner/test/*</exclude>
+ <exclude>org/dllearner/test/junit/TestOntologies.java</exclude>
+ <!--This line excludes inner classes-->
+ <exclude>**/*$*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <!--Jar the tests up into a separate jar so other components tests' can leverage them-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <!-- THIS IS FROM THE UNIBAS REPO-->
+ <dependency>
+ <groupId>net.sourceforge.owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ </dependency>
+
+ <!-- THIS IS FROM THE UNIBAS REPO-->
+ <dependency>
+ <groupId>com.owldl</groupId>
+ <artifactId>pellet</artifactId>
+ <exclusions>
+ <exclusion> <!-- declare the exclusion here -->
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <!--Available via central, we use the latest with minor mods to DL Learner source (IE Dig related code)-->
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ </dependency>
+
+ <!--SwingX is in central-->
+ <dependency>
+ <groupId>org.swinglabs</groupId>
+ <artifactId>swingx</artifactId>
+ </dependency>
+
+
+ <!--JSON is in Central-->
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+
+
+
+ <dependency>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ </dependency>
+
+
+ <!--Lucene is in Central-->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ini4j</groupId>
+ <artifactId>ini4j</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.code.factplusplus</groupId>
+ <artifactId>factpp-owlapi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.owlapi.owllink</groupId>
+ <artifactId>owllink</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.semanticweb.hermit</groupId>
+ <artifactId>hermit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jamonapi</groupId>
+ <artifactId>jamon</artifactId>
+ </dependency>
+
+ <!--JENA ARQ is in central - we use the latest-->
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.dig</groupId>
+ <artifactId>dig-xmlbeans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+
+ </dependencies>
+</project>
Modified: trunk/components-ext/pom.xml
===================================================================
--- trunk/components-ext/pom.xml 2010-11-10 21:34:05 UTC (rev 2419)
+++ trunk/components-ext/pom.xml 2010-11-10 21:35:29 UTC (rev 2420)
@@ -1,23 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.dllearner</groupId>
- <artifactId>components-ext</artifactId>
- <version>${dllearner.version}</version>
- <packaging>jar</packaging>
-
- <name>components-ext</name>
- <url>http://maven.apache.org</url>
- <parent>
- <groupId>org.dllearner</groupId>
- <artifactId>dllearner-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
- </dependency>
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-ext</artifactId>
+ <version>1.0.1</version>
+ <packaging>jar</packaging>
+
+ <name>components-ext</name>
+ <url>http://maven.apache.org</url>
+ <parent>
+ <groupId>org.dllearner</groupId>
+ <artifactId>dllearner-parent</artifactId>
+ <version>1.0.1</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/evalplugin/pom.xml
===================================================================
--- trunk/evalplugin/pom.xml 2010-11-10 21:34:05 UTC (rev 2419)
+++ trunk/evalplugin/pom.xml 2010-11-10 21:35:29 UTC (rev 2420)
@@ -1,45 +1,44 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.dllearner</groupId>
- <artifactId>evalplugin</artifactId>
- <version>${evalplugin.version}</version>
- <packaging>jar</packaging>
-
- <name>evalplugin</name>
- <url>http://maven.apache.org</url>
- <parent>
- <groupId>org.dllearner</groupId>
- <artifactId>dllearner-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
-
- <dependencies>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-ext</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>protege</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>org.protege.editor.core</groupId>
- <artifactId>org.protege.editor.core.application</artifactId>
- </dependency>
- <dependency>
- <groupId>org.protege.editor.owl</groupId>
- <artifactId>org.protege.editor.owl</artifactId>
- </dependency>
-
-
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.dllearner</groupId>
+ <artifactId>evalplugin</artifactId>
+ <version>1.0.1</version>
+ <packaging>jar</packaging>
+
+ <name>evalplugin</name>
+ <url>http://maven.apache.org</url>
+ <parent>
+ <groupId>org.dllearner</groupId>
+ <artifactId>dllearner-parent</artifactId>
+ <version>1.0.1</version>
+ </parent>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>protege</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.protege.editor.core</groupId>
+ <artifactId>org.protege.editor.core.application</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.protege.editor.owl</groupId>
+ <artifactId>org.protege.editor.owl</artifactId>
+ </dependency>
+
+
+ </dependencies>
+</project>
Modified: trunk/interfaces/pom.xml
===================================================================
--- trunk/interfaces/pom.xml 2010-11-10 21:34:05 UTC (rev 2419)
+++ trunk/interfaces/pom.xml 2010-11-10 21:35:29 UTC (rev 2420)
@@ -1,64 +1,63 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.dllearner</groupId>
- <artifactId>interfaces</artifactId>
- <version>${dllearner.version}</version>
- <packaging>jar</packaging>
-
- <name>Interfaces: GUI, CLI, Web Service </name>
- <url>http://maven.apache.org</url>
-
- <parent>
- <groupId>org.dllearner</groupId>
- <artifactId>dllearner-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <build>
- <plugins>
- <!--Surefire - for JUnits-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/dllearner/test/junit/OWLlinkTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
- </dependency>
-
- <!--Added the dependency of the core tests so that they will be accessible from the tests in this component-->
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-ext</artifactId>
- </dependency>
- <dependency>
- <groupId>com.jamonapi</groupId>
- <artifactId>jamon</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.dllearner</groupId>
+ <artifactId>interfaces</artifactId>
+ <version>1.0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Interfaces: GUI, CLI, Web Service </name>
+ <url>http://maven.apache.org</url>
+
+ <parent>
+ <groupId>org.dllearner</groupId>
+ <artifactId>dllearner-parent</artifactId>
+ <version>1.0.1</version>
+ </parent>
+
+ <build>
+ <plugins>
+ <!--Surefire - for JUnits-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/dllearner/test/junit/OWLlinkTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ </dependency>
+
+ <!--Added the dependency of the core tests so that they will be accessible from the tests in this component-->
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.jamonapi</groupId>
+ <artifactId>jamon</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-10 21:34:05 UTC (rev 2419)
+++ trunk/pom.xml 2010-11-10 21:35:29 UTC (rev 2420)
@@ -1,408 +1,406 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.dllearner</groupId>
- <artifactId>dllearner-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>DL Learner Parent Pom</name>
-
- <properties>
- <!-- tell the compiler we can use 1.6 -->
- <compiler.version>1.6</compiler.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <dllearner.version>1.0-SNAPSHOT</dllearner.version>
- <protege.version>1.0-SNAPSHOT</protege.version>
- <evalplugin.version>1.0-SNAPSHOT</evalplugin.version>
- <!-- convenience to define GWT version in one place -->
- <gwt.version>2.1-SNAPSHOT</gwt.version>
- </properties>
-
- <modules>
- <module>components-core</module>
- <module>components-ext</module>
- <module>interfaces</module>
- <module>scripts</module>
- <module>protege</module>
- <module>evalplugin</module>
- <module>sparql-query-generator</module>
- <module>autosparql</module>
- </modules>
-
-
- <!--This is the SCM information, which needs to be here so we can use the maven release plugin-->
- <scm>
- <connection>scm:svn:https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/trunk</connection>
- <developerConnection>scm:svn:https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/trunk</developerConnection>
- <url>https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/trunk</url>
- </scm>
-
- <build>
- <!--
- - Plugin Management defines the plugins that the child components can use
- - It's good practice to do this as we can ensure all children use common versions
- - of the plugins, and we can look in one place to see all plugin dependencies.
- -->
- <pluginManagement>
- <plugins>
- <!--Surefire - for JUnits-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <!--Maven Compiler Plugin-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <!--We use 1.6-->
- <source>${compiler.version}</source>
- <target>${compiler.version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
-
- <!--
- - Maven Jar Plugin - if you want to create and/or sign jars.
- - I'm putting this in so we can create a jar for the test classes
- - in components core so that other components' tests can leverage them
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <!--JAR the Sources-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--JAR the Java docs-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>gwt-maven-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencyManagement>
- <!--Dependency Management defines the dependencies at the parent level - ideally we would-->
- <!--define all the dependencies of the project here so we would have consistent versions-->
- <!--across all of the child components-->
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.owlapi</groupId>
- <artifactId>owlapi</artifactId>
- <version>3.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.owldl</groupId>
- <artifactId>pellet</artifactId>
- <version>2.2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.semanticweb.hermit</groupId>
- <artifactId>hermit</artifactId>
- <version>1.2.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>0.9.3</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
-
- <dependency>
- <groupId>com.extjs</groupId>
- <artifactId>gxt</artifactId>
- <version>2.2.0</version>
- </dependency>
-
- <!--Available via central, we use the latest with minor mods to DL Learner source (IE Dig related code)-->
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <version>2.6.3</version>
- </dependency>
- <!--SwingX is in central-->
- <dependency>
- <groupId>org.swinglabs</groupId>
- <artifactId>swingx</artifactId>
- <version>1.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20090211</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- <version>3.1</version>
- <!--This version is the one released with DL-Learner 2048-->
- </dependency>
-
- <!--Lucene is in Central-->
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>3.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.ini4j</groupId>
- <artifactId>ini4j</artifactId>
- <version>0.3.2</version>
- <!--This version is the one released with DL-Learner 2048-->
- </dependency>
-
-
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.2.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.jamonapi</groupId>
- <artifactId>jamon</artifactId>
- <version>2.7</version>
- </dependency>
-
-
- <!--JENA ARQ is in central - we use the latest-->
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- <version>2.8.5</version>
- </dependency>
-
- <!--Junits-->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.factplusplus</groupId>
- <artifactId>factpp-owlapi</artifactId>
- <version>1.4.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.owlapi.owllink</groupId>
- <artifactId>owllink</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.protege.editor.core</groupId>
- <artifactId>org.protege.editor.core.application</artifactId>
- <version>4.1.0.206</version>
- </dependency>
-
- <dependency>
- <groupId>org.protege.editor.owl</groupId>
- <artifactId>org.protege.editor.owl</artifactId>
- <version>4.1.0.206</version>
- </dependency>
-
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
- <version>${dllearner.version}</version>
- </dependency>
-
- <!--This is the jar of the tests from components-core-->
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
- <version>${dllearner.version}</version>
- <classifier>tests</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-ext</artifactId>
- <version>${dllearner.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>interfaces</artifactId>
- <version>${dllearner.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>protege</artifactId>
- <version>${protege.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.secondstring</groupId>
- <artifactId>secondstring</artifactId>
- <version>20060615</version>
- </dependency>
-
- <dependency>
- <groupId>com.jgoodies</groupId>
- <artifactId>looks</artifactId>
- <version>2.2.2</version>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.browserlauncher2</groupId>
- <artifactId>browserlauncher2</artifactId>
- <version>1.3</version>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.dig</groupId>
- <artifactId>dig-xmlbeans</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.2.143</version>
- </dependency>
-
- <!--GWT Dependencies-->
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- <version>${gwt.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-user</artifactId>
- <version>${gwt.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <repositories>
-
-
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
-
- <repository>
- <id>maven.aksw.internal</id>
- <name>University Leipzig, AKSW Maven2 Repository</name>
- <url>http://db0.aksw.org:8081/archiva/repository/internal</url>
- </repository>
-
- <repository>
- <id>maven.aksw.snapshots</id>
- <name>University Leipzig, AKSW Maven2 Repository</name>
- <url>http://db0.aksw.org:8081/archiva/repository/snapshots</url>
- </repository>
-
- <!-- This repository contains the pellet jars -->
- <repository>
- <id>pellet_etc</id>
- <url>http://on.cs.unibas.ch/maven/repository/</url>
- </repository>
-
- <!-- This repository contains the jars for the project lombok jars -->
- <repository>
- <id>projectlombok.org</id>
- <url>http://projectlombok.org/mavenrepo</url>
- </repository>
-
- <repository>
- <id>GXT</id>
- <url>http://maven.jahia.org/maven2/</url>
- </repository>
-
- <!--
- - This is so we can get the 1.3-SNAPSHOT of GWT Maven Plugin cause 1.2 is broken on the hudson
- -
- - Here's a good place to browse the repository: https://nexus.codehaus.org
- -->
- <repository>
- <id>maven.codehaus.snapshots</id>
- <name>Codehaus repository Repository</name>
- <url>https://nexus.codehaus.org/content/repositories/public</url>
- </repository>
-
- <repository>
- <id>google-maven-snapshot-repository</id>
- <name>Google Maven Snapshot Repository</name>
- <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>maven.codehaus.plugin.snapshots</id>
- <name>Codehaus plugin Repository</name>
- <url>https://nexus.codehaus.org/content/repositories/public</url>
- <snapshots><enabled>true</enabled></snapshots>
- <releases><enabled>true</enabled></releases>
- </pluginRepository>
- </pluginRepositories>
-
-
-
- <distributionManagement>
- <repository>
- <id>archiva.internal</id>
- <name>AKSW Internal Release Repository</name>
- <url>http://prod1.aksw.org:8081/archiva/repository/internal</url>
- </repository>
- <snapshotRepository>
- <id>archiva.snapshots</id>
- <name>AKSW Snapshot Repository</name>
- <url>http://prod1.aksw.org:8081/archiva/repository/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.dllearner</groupId>
+ <artifactId>dllearner-parent</artifactId>
+ <version>1.0.1</version>
+ <packaging>pom</packaging>
+ <name>DL Learner Parent Pom</name>
+
+ <properties>
+ <!-- tell the compiler we can use 1.6 -->
+ <compiler.version>1.6</compiler.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <dllearner.version>1.0.1</dllearner.version>
+ <protege.version>1.0.1</protege.version>
+ <evalplugin.version>1.0-SNAPSHOT</evalplugin.version>
+ <!-- convenience to define GWT version in one place -->
+ <gwt.version>2.1-SNAPSHOT</gwt.version>
+ </properties>
+
+ <modules>
+ <module>components-core</module>
+ <module>components-ext</module>
+ <module>interfaces</module>
+ <module>scripts</module>
+ <module>protege</module>
+ <module>evalplugin</module>
+ <module>sparql-query-generator</module>
+ <module>autosparql</module>
+ </modules>
+
+
+ <!--This is the SCM information, which needs to be here so we can use the maven release plugin-->
+ <scm>
+ <connection>scm:svn:https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/branches/1.0.1</connection>
+ <developerConnection>scm:svn:https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/branches/1.0.1</developerConnection>
+ <url>https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/branches/1.0.1</url>
+ </scm>
+
+ <build>
+ <!--
+ - Plugin Management defines the plugins that the child components can use
+ - It's good practice to do this as we can ensure all children use common versions
+ - of the plugins, and we can look in one place to see all plugin dependencies.
+ -->
+ <pluginManagement>
+ <plugins>
+ <!--Surefire - for JUnits-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <!--Maven Compiler Plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <!--We use 1.6-->
+ <source>${compiler.version}</source>
+ <target>${compiler.version}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
+ <!--
+ - Maven Jar Plugin - if you want to create and/or sign jars.
+ - I'm putting this in so we can create a jar for the test classes
+ - in components core so that other components' tests can leverage them
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <!--JAR the Sources-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--JAR the Java docs-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gwt-maven-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencyManagement>
+ <!--Dependency Management defines the dependencies at the parent level - ideally we would-->
+ <!--define all the dependencies of the project here so we would have consistent versions-->
+ <!--across all of the child components-->
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.owldl</groupId>
+ <artifactId>pellet</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.semanticweb.hermit</groupId>
+ <artifactId>hermit</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>0.9.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.extjs</groupId>
+ <artifactId>gxt</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+
+ <!--Available via central, we use the latest with minor mods to DL Learner source (IE Dig related code)-->
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.6.3</version>
+ </dependency>
+ <!--SwingX is in central-->
+ <dependency>
+ <groupId>org.swinglabs</groupId>
+ <artifactId>swingx</artifactId>
+ <version>1.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ <version>3.1</version>
+ <!--This version is the one released with DL-Learner 2048-->
+ </dependency>
+
+ <!--Lucene is in Central-->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ini4j</groupId>
+ <artifactId>ini4j</artifactId>
+ <version>0.3.2</version>
+ <!--This version is the one released with DL-Learner 2048-->
+ </dependency>
+
+
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jamonapi</groupId>
+ <artifactId>jamon</artifactId>
+ <version>2.7</version>
+ </dependency>
+
+
+ <!--JENA ARQ is in central - we use the latest-->
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq</artifactId>
+ <version>2.8.5</version>
+ </dependency>
+
+ <!--Junits-->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.code.factplusplus</groupId>
+ <artifactId>factpp-owlapi</artifactId>
+ <version>1.4.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.owlapi.owllink</groupId>
+ <artifactId>owllink</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.protege.editor.core</groupId>
+ <artifactId>org.protege.editor.core.application</artifactId>
+ <version>4.1.0.206</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.protege.editor.owl</groupId>
+ <artifactId>org.protege.editor.owl</artifactId>
+ <version>4.1.0.206</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ <version>${dllearner.version}</version>
+ </dependency>
+
+ <!--This is the jar of the tests from components-core-->
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ <version>${dllearner.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-ext</artifactId>
+ <version>${dllearner.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>interfaces</artifactId>
+ <version>${dllearner.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>protege</artifactId>
+ <version>${protege.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.secondstring</groupId>
+ <artifactId>secondstring</artifactId>
+ <version>20060615</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jgoodies</groupId>
+ <artifactId>looks</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.browserlauncher2</groupId>
+ <artifactId>browserlauncher2</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.dig</groupId>
+ <artifactId>dig-xmlbeans</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.2.143</version>
+ </dependency>
+
+ <!--GWT Dependencies-->
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <version>${gwt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>${gwt.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <repositories>
+
+
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
+ </repository>
+
+ <repository>
+ <id>maven.aksw.internal</id>
+ <name>University Leipzig, AKSW Maven2 Repository</name>
+ <url>http://db0.aksw.org:8081/archiva/repository/internal</url>
+ </repository>
+
+ <repository>
+ <id>maven.aksw.snapshots</id>
+ <name>University Leipzig, AKSW Maven2 Repository</name>
+ <url>http://db0.aksw.org:8081/archiva/repository/snapshots</url>
+ </repository>
+
+ <!-- This repository contains the pellet jars -->
+ <repository>
+ <id>pellet_etc</id>
+ <url>http://on.cs.unibas.ch/maven/repository/</url>
+ </repository>
+
+ <!-- This repository contains the jars for the project lombok jars -->
+ <repository>
+ <id>projectlombok.org</id>
+ <url>http://projectlombok.org/mavenrepo</url>
+ </repository>
+
+ <repository>
+ <id>GXT</id>
+ <url>http://maven.jahia.org/maven2/</url>
+ </repository>
+
+ <!--
+ - This is so we can get the 1.3-SNAPSHOT of GWT Maven Plugin cause 1.2 is broken on the hudson
+ -
+ - Here's a good place to browse the repository: https://nexus.codehaus.org
+ -->
+ <repository>
+ <id>maven.codehaus.snapshots</id>
+ <name>Codehaus repository Repository</name>
+ <url>https://nexus.codehaus.org/content/repositories/public</url>
+ </repository>
+
+ <repository>
+ <id>google-maven-snapshot-repository</id>
+ <name>Google Maven Snapshot Repository</name>
+ <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven.codehaus.plugin.snapshots</id>
+ <name>Codehaus plugin Repository</name>
+ <url>https://nexus.codehaus.org/content/repositories/public</url>
+ <snapshots><enabled>true</enabled></snapshots>
+ <releases><enabled>true</enabled></releases>
+ </pluginRepository>
+ </pluginRepositories>
+
+
+
+ <distributionManagement>
+ <repository>
+ <id>archiva.internal</id>
+ <name>AKSW Internal Release Repository</name>
+ <url>http://prod1.aksw.org:8081/archiva/repository/internal</url>
+ </repository>
+ <snapshotRepository>
+ <id>archiva.snapshots</id>
+ <name>AKSW Snapshot Repository</name>
+ <url>http://prod1.aksw.org:8081/archiva/repository/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
Modified: trunk/protege/pom.xml
===================================================================
--- trunk/protege/pom.xml 2010-11-10 21:34:05 UTC (rev 2419)
+++ trunk/protege/pom.xml 2010-11-10 21:35:29 UTC (rev 2420)
@@ -1,50 +1,49 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.dllearner</groupId>
- <artifactId>protege</artifactId>
- <version>${protege.version}</version>
- <packaging>jar</packaging>
-
- <name>protege</name>
- <url>http://maven.apache.org</url>
-
- <parent>
- <groupId>org.dllearner</groupId>
- <artifactId>dllearner-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
-
- <dependencies>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-ext</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.protege.editor.core</groupId>
- <artifactId>org.protege.editor.core.application</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.protege.editor.owl</groupId>
- <artifactId>org.protege.editor.owl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.browserlauncher2</groupId>
- <artifactId>browserlauncher2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.jgoodies</groupId>
- <artifactId>looks</artifactId>
- </dependency>
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.dllearner</groupId>
+ <artifactId>protege</artifactId>
+ <version>1.0.1</version>
+ <packaging>jar</packaging>
+
+ <name>protege</name>
+ <url>http://maven.apache.org</url>
+
+ <parent>
+ <groupId>org.dllearner</groupId>
+ <artifactId>dllearner-parent</artifactId>
+ <version>1.0.1</version>
+ </parent>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-ext</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.protege.editor.core</groupId>
+ <artifactId>org.protege.editor.core.application</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.protege.editor.owl</groupId>
+ <artifactId>org.protege.editor.owl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.browserlauncher2</groupId>
+ <artifactId>browserlauncher2</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jgoodies</groupId>
+ <artifactId>looks</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/scripts/pom.xml
===================================================================
--- trunk/scripts/pom.xml 2010-11-10 21:34:05 UTC (rev 2419)
+++ trunk/scripts/pom.xml 2010-11-10 21:35:29 UTC (rev 2420)
@@ -1,43 +1,42 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.dllearner</groupId>
- <artifactId>scripts</artifactId>
- <version>${dllearner.version}</version>
- <packaging>jar</packaging>
-
- <name>Executable scripts </name>
- <url>http://maven.apache.org</url>
-
- <parent>
- <groupId>org.dllearner</groupId>
- <artifactId>dllearner-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
-
- <dependencies>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-ext</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>interfaces</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.secondstring</groupId>
- <artifactId>secondstring</artifactId>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.4-701.jdbc4</version>
- </dependency>
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.dllearner</groupId>
+ <artifactId>scripts</artifactId>
+ <version>1.0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Executable scripts </name>
+ <url>http://maven.apache.org</url>
+
+ <parent>
+ <groupId>org.dllearner</groupId>
+ <artifactId>dllearner-parent</artifactId>
+ <version>1.0.1</version>
+ </parent>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>interfaces</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.secondstring</groupId>
+ <artifactId>secondstring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.4-701.jdbc4</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/sparql-query-generator/pom.xml
===================================================================
--- trunk/sparql-query-generator/pom.xml 2010-11-10 21:34:05 UTC (rev 2419)
+++ trunk/sparql-query-generator/pom.xml 2010-11-10 21:35:29 UTC (rev 2420)
@@ -1,64 +1,64 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>...
[truncated message content] |
|
From: <sha...@us...> - 2010-11-10 21:35:59
|
Revision: 2422
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2422&view=rev
Author: shadowtm
Date: 2010-11-10 21:35:53 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
[maven-release-plugin] prepare release 1.0.1
Modified Paths:
--------------
trunk/autosparql/pom.xml
trunk/components-core/pom.xml
trunk/components-ext/pom.xml
trunk/evalplugin/pom.xml
trunk/interfaces/pom.xml
trunk/pom.xml
trunk/protege/pom.xml
trunk/scripts/pom.xml
trunk/sparql-query-generator/pom.xml
Modified: trunk/autosparql/pom.xml
===================================================================
--- trunk/autosparql/pom.xml 2010-11-10 21:35:43 UTC (rev 2421)
+++ trunk/autosparql/pom.xml 2010-11-10 21:35:53 UTC (rev 2422)
@@ -5,13 +5,13 @@
<parent>
<artifactId>dllearner-parent</artifactId>
<groupId>org.dllearner</groupId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.dllearner</groupId>
<artifactId>autosparql</artifactId>
<packaging>war</packaging>
<name>AutoSPARQL</name>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<dependencies>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>sparql-query-generator</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml 2010-11-10 21:35:43 UTC (rev 2421)
+++ trunk/components-core/pom.xml 2010-11-10 21:35:53 UTC (rev 2422)
@@ -3,7 +3,7 @@
<groupId>org.dllearner</groupId>
<artifactId>components-core</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>DL Learner Core Components</name>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.dllearner</groupId>
<artifactId>dllearner-parent</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<build>
Modified: trunk/components-ext/pom.xml
===================================================================
--- trunk/components-ext/pom.xml 2010-11-10 21:35:43 UTC (rev 2421)
+++ trunk/components-ext/pom.xml 2010-11-10 21:35:53 UTC (rev 2422)
@@ -3,7 +3,7 @@
<groupId>org.dllearner</groupId>
<artifactId>components-ext</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>components-ext</name>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.dllearner</groupId>
<artifactId>dllearner-parent</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/evalplugin/pom.xml
===================================================================
--- trunk/evalplugin/pom.xml 2010-11-10 21:35:43 UTC (rev 2421)
+++ trunk/evalplugin/pom.xml 2010-11-10 21:35:53 UTC (rev 2422)
@@ -3,7 +3,7 @@
<groupId>org.dllearner</groupId>
<artifactId>evalplugin</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>evalplugin</name>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.dllearner</groupId>
<artifactId>dllearner-parent</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
Modified: trunk/interfaces/pom.xml
===================================================================
--- trunk/interfaces/pom.xml 2010-11-10 21:35:43 UTC (rev 2421)
+++ trunk/interfaces/pom.xml 2010-11-10 21:35:53 UTC (rev 2422)
@@ -3,7 +3,7 @@
<groupId>org.dllearner</groupId>
<artifactId>interfaces</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Interfaces: GUI, CLI, Web Service </name>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.dllearner</groupId>
<artifactId>dllearner-parent</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<build>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-10 21:35:43 UTC (rev 2421)
+++ trunk/pom.xml 2010-11-10 21:35:53 UTC (rev 2422)
@@ -4,7 +4,7 @@
<groupId>org.dllearner</groupId>
<artifactId>dllearner-parent</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>DL Learner Parent Pom</name>
@@ -33,9 +33,9 @@
<!--This is the SCM information, which needs to be here so we can use the maven release plugin-->
<scm>
- <connection>scm:svn:https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/branches/1.0.1</connection>
- <developerConnection>scm:svn:https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/branches/1.0.1</developerConnection>
- <url>https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/branches/1.0.1</url>
+ <connection>scm:svn:https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/trunk</connection>
+ <developerConnection>scm:svn:https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/trunk</developerConnection>
+ <url>https://dl-learner.svn.sourceforge.net/svnroot/dl-learner/trunk</url>
</scm>
<build>
Modified: trunk/protege/pom.xml
===================================================================
--- trunk/protege/pom.xml 2010-11-10 21:35:43 UTC (rev 2421)
+++ trunk/protege/pom.xml 2010-11-10 21:35:53 UTC (rev 2422)
@@ -3,7 +3,7 @@
<groupId>org.dllearner</groupId>
<artifactId>protege</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>protege</name>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.dllearner</groupId>
<artifactId>dllearner-parent</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
Modified: trunk/scripts/pom.xml
===================================================================
--- trunk/scripts/pom.xml 2010-11-10 21:35:43 UTC (rev 2421)
+++ trunk/scripts/pom.xml 2010-11-10 21:35:53 UTC (rev 2422)
@@ -3,7 +3,7 @@
<groupId>org.dllearner</groupId>
<artifactId>scripts</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Executable scripts </name>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.dllearner</groupId>
<artifactId>dllearner-parent</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
Modified: trunk/sparql-query-generator/pom.xml
===================================================================
--- trunk/sparql-query-generator/pom.xml 2010-11-10 21:35:43 UTC (rev 2421)
+++ trunk/sparql-query-generator/pom.xml 2010-11-10 21:35:53 UTC (rev 2422)
@@ -3,12 +3,12 @@
<parent>
<artifactId>dllearner-parent</artifactId>
<groupId>org.dllearner</groupId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.dllearner</groupId>
<artifactId>sparql-query-generator</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sha...@us...> - 2010-11-11 17:26:53
|
Revision: 2426
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2426&view=rev
Author: shadowtm
Date: 2010-11-11 17:26:47 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
Removed version numbers from child modules as they will inherit them from the parent - this was causing problems with the branch plugin and is the standard way to define our modules. Also moved the source pluging to the hudson_build profile so that way it will only be executed on the hudson server - this will save some time for developers when building the whole system. Removed Javadoc plugin as it was taking a lot of time and we aren't currently using that artifacts - we can add it back to the hudson_build profile in the future. When we release a version, the sources and javadoc plugins will run automatically so we need to make sure they don't run twice - that's why we only run them in the hudson_build profile.
Modified Paths:
--------------
trunk/autosparql/pom.xml
trunk/components-core/pom.xml
trunk/components-ext/pom.xml
trunk/evalplugin/pom.xml
trunk/interfaces/pom.xml
trunk/pom.xml
trunk/protege/pom.xml
trunk/scripts/pom.xml
trunk/sparql-query-generator/pom.xml
Modified: trunk/autosparql/pom.xml
===================================================================
--- trunk/autosparql/pom.xml 2010-11-10 22:27:24 UTC (rev 2425)
+++ trunk/autosparql/pom.xml 2010-11-11 17:26:47 UTC (rev 2426)
@@ -11,7 +11,6 @@
<artifactId>autosparql</artifactId>
<packaging>war</packaging>
<name>AutoSPARQL</name>
- <version>1.0-SNAPSHOT</version>
<dependencies>
Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml 2010-11-10 22:27:24 UTC (rev 2425)
+++ trunk/components-core/pom.xml 2010-11-11 17:26:47 UTC (rev 2426)
@@ -3,11 +3,10 @@
<groupId>org.dllearner</groupId>
<artifactId>components-core</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>DL Learner Core Components</name>
- <url>http://maven.apache.org</url>
+ <url>http://aksw.org/Projects/DLLearner</url>
<parent>
<groupId>org.dllearner</groupId>
Modified: trunk/components-ext/pom.xml
===================================================================
--- trunk/components-ext/pom.xml 2010-11-10 22:27:24 UTC (rev 2425)
+++ trunk/components-ext/pom.xml 2010-11-11 17:26:47 UTC (rev 2426)
@@ -3,11 +3,11 @@
<groupId>org.dllearner</groupId>
<artifactId>components-ext</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>components-ext</name>
- <url>http://maven.apache.org</url>
+ <url>http://aksw.org/Projects/DLLearner</url>
+
<parent>
<groupId>org.dllearner</groupId>
<artifactId>dllearner-parent</artifactId>
Modified: trunk/evalplugin/pom.xml
===================================================================
--- trunk/evalplugin/pom.xml 2010-11-10 22:27:24 UTC (rev 2425)
+++ trunk/evalplugin/pom.xml 2010-11-11 17:26:47 UTC (rev 2426)
@@ -3,11 +3,10 @@
<groupId>org.dllearner</groupId>
<artifactId>evalplugin</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>evalplugin</name>
- <url>http://maven.apache.org</url>
+ <url>http://aksw.org/Projects/DLLearner</url>
<parent>
<groupId>org.dllearner</groupId>
<artifactId>dllearner-parent</artifactId>
Modified: trunk/interfaces/pom.xml
===================================================================
--- trunk/interfaces/pom.xml 2010-11-10 22:27:24 UTC (rev 2425)
+++ trunk/interfaces/pom.xml 2010-11-11 17:26:47 UTC (rev 2426)
@@ -3,11 +3,9 @@
<groupId>org.dllearner</groupId>
<artifactId>interfaces</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
-
<name>Interfaces: GUI, CLI, Web Service </name>
- <url>http://maven.apache.org</url>
+ <url>http://aksw.org/Projects/DLLearner</url>
<parent>
<groupId>org.dllearner</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-10 22:27:24 UTC (rev 2425)
+++ trunk/pom.xml 2010-11-11 17:26:47 UTC (rev 2426)
@@ -7,14 +7,11 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>DL Learner Parent Pom</name>
-
+ <url>http://aksw.org/Projects/DLLearner</url>
<properties>
<!-- tell the compiler we can use 1.6 -->
<compiler.version>1.6</compiler.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <dllearner.version>1.0-SNAPSHOT</dllearner.version>
- <protege.version>1.0-SNAPSHOT</protege.version>
- <evalplugin.version>1.0-SNAPSHOT</evalplugin.version>
<!-- convenience to define GWT version in one place -->
<gwt.version>2.1-SNAPSHOT</gwt.version>
</properties>
@@ -79,27 +76,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ <version>2.1.2</version>
</plugin>
- <!--JAR the Java docs-->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>2.1-SNAPSHOT</version>
@@ -244,33 +223,33 @@
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>components-core</artifactId>
- <version>${dllearner.version}</version>
+ <version>${project.version}</version>
</dependency>
<!--This is the jar of the tests from components-core-->
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>components-core</artifactId>
- <version>${dllearner.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>components-ext</artifactId>
- <version>${dllearner.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>interfaces</artifactId>
- <version>${dllearner.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>protege</artifactId>
- <version>${protege.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -403,4 +382,26 @@
</snapshotRepository>
</distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>hudson_build</id>
+ <build>
+ <plugins>
+ <!--JAR the Sources-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: trunk/protege/pom.xml
===================================================================
--- trunk/protege/pom.xml 2010-11-10 22:27:24 UTC (rev 2425)
+++ trunk/protege/pom.xml 2010-11-11 17:26:47 UTC (rev 2426)
@@ -3,11 +3,10 @@
<groupId>org.dllearner</groupId>
<artifactId>protege</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>protege</name>
- <url>http://maven.apache.org</url>
+ <url>http://aksw.org/Projects/DLLearner</url>
<parent>
<groupId>org.dllearner</groupId>
Modified: trunk/scripts/pom.xml
===================================================================
--- trunk/scripts/pom.xml 2010-11-10 22:27:24 UTC (rev 2425)
+++ trunk/scripts/pom.xml 2010-11-11 17:26:47 UTC (rev 2426)
@@ -3,11 +3,10 @@
<groupId>org.dllearner</groupId>
<artifactId>scripts</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Executable scripts </name>
- <url>http://maven.apache.org</url>
+ <url>http://aksw.org/Projects/DLLearner</url>
<parent>
<groupId>org.dllearner</groupId>
Modified: trunk/sparql-query-generator/pom.xml
===================================================================
--- trunk/sparql-query-generator/pom.xml 2010-11-10 22:27:24 UTC (rev 2425)
+++ trunk/sparql-query-generator/pom.xml 2010-11-11 17:26:47 UTC (rev 2426)
@@ -8,9 +8,9 @@
<groupId>org.dllearner</groupId>
<artifactId>sparql-query-generator</artifactId>
- <version>1.0-SNAPSHOT</version>
-
-
+ <name>SPARQL Query Generator</name>
+ <url>http://aksw.org/Projects/DLLearner</url>
+
<build>
<plugins>
<!--Surefire - for JUnits-->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-11-12 09:53:06
|
Revision: 2428
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2428&view=rev
Author: lorenz_b
Date: 2010-11-12 09:52:59 +0000 (Fri, 12 Nov 2010)
Log Message:
-----------
Update to Pellet 2.2.2 and OWLAPI 3.1.0.
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIAxiomConvertVisitor.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java
trunk/components-core/src/test/java/org/dllearner/test/FaCTBugDemo.java
trunk/components-core/src/test/java/org/dllearner/test/HermitTest.java
trunk/pom.xml
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- .lastUsedExample
.settings
.project
.classpath
classes
log
cache
cachePersistant
reports
results
local
rdbtoonto
the_log.txt
tmp
fragmentOntology.owl
output
ling
osmdata
matching
stanley
dllearner.jar
father.inp
lgd.nt
files
errorDescription
bin
tigerResults
dbpedia_3.4.owl
dbpedia_3.4.owl.count
dbpedia_3.4.owl.expanded.count
dbpedia_3.4.owl.purged.ser
dbpedia_3.4.owl.sub.ser
dbpedia_3.4.owl.super.ser
dbpedia_3.4.owl.tar.gz
skoscategories_en.nt
skoscategories_en.nt.count
skoscategories_en.nt.expanded.count
skoscategories_en.nt.purged.ser
skoscategories_en.nt.sub.ser
skoscategories_en.nt.super.ser
skoscategories_en.nt.tar.gz
yagoclasses_links.nt
yagoclasses_links.nt.count
yagoclasses_links.nt.expanded.count
yagoclasses_links.nt.purged.ser
yagoclasses_links.nt.sub.ser
yagoclasses_links.nt.super.ser
yagoclasses_links.nt.tar.gz
target
dbpedia_3.4.owl (2)
yagoclasses_links.nt (2)
new.tar.gz
dbpedia_3.5.1.owl
dbpedia_3.5.1.owl.bz2
dbpedia_3.5.1.owl.count
dbpedia_3.5.1.owl.expanded.count
dbpedia_3.5.1.owl.purged.ser
dbpedia_3.5.1.owl.sub.ser
dbpedia_3.5.1.owl.super.ser
+ .lastUsedExample
.settings
.project
.classpath
classes
log
cache
cachePersistant
reports
results
local
rdbtoonto
the_log.txt
tmp
fragmentOntology.owl
output
ling
osmdata
matching
tomcat
stanley
dllearner.jar
father.inp
lgd.nt
files
errorDescription
bin
tigerResults
dbpedia_3.4.owl
dbpedia_3.4.owl.count
dbpedia_3.4.owl.expanded.count
dbpedia_3.4.owl.purged.ser
dbpedia_3.4.owl.sub.ser
dbpedia_3.4.owl.super.ser
dbpedia_3.4.owl.tar.gz
skoscategories_en.nt
skoscategories_en.nt.count
skoscategories_en.nt.expanded.count
skoscategories_en.nt.purged.ser
skoscategories_en.nt.sub.ser
skoscategories_en.nt.super.ser
skoscategories_en.nt.tar.gz
yagoclasses_links.nt
yagoclasses_links.nt.count
yagoclasses_links.nt.expanded.count
yagoclasses_links.nt.purged.ser
yagoclasses_links.nt.sub.ser
yagoclasses_links.nt.super.ser
yagoclasses_links.nt.tar.gz
target
dbpedia_3.4.owl (2)
yagoclasses_links.nt (2)
new.tar.gz
dbpedia_3.5.1.owl
dbpedia_3.5.1.owl.bz2
dbpedia_3.5.1.owl.count
dbpedia_3.5.1.owl.expanded.count
dbpedia_3.5.1.owl.purged.ser
dbpedia_3.5.1.owl.sub.ser
dbpedia_3.5.1.owl.super.ser
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java 2010-11-11 17:47:04 UTC (rev 2427)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java 2010-11-12 09:52:59 UTC (rev 2428)
@@ -33,11 +33,11 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.Map.Entry;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -98,13 +98,13 @@
import org.semanticweb.owlapi.model.OWLOntologyFormat;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
-import org.semanticweb.owlapi.model.OWLTypedLiteral;
import org.semanticweb.owlapi.model.RemoveAxiom;
import org.semanticweb.owlapi.model.UnknownOWLOntologyException;
import org.semanticweb.owlapi.owllink.OWLlinkHTTPXMLReasonerFactory;
import org.semanticweb.owlapi.owllink.OWLlinkReasonerConfiguration;
import org.semanticweb.owlapi.reasoner.FreshEntityPolicy;
import org.semanticweb.owlapi.reasoner.IndividualNodeSetPolicy;
+import org.semanticweb.owlapi.reasoner.InferenceType;
import org.semanticweb.owlapi.reasoner.Node;
import org.semanticweb.owlapi.reasoner.NodeSet;
import org.semanticweb.owlapi.reasoner.NullReasonerProgressMonitor;
@@ -116,7 +116,6 @@
import org.semanticweb.owlapi.vocab.PrefixOWLOntologyFormat;
import uk.ac.manchester.cs.factplusplus.owlapiv3.FaCTPlusPlusReasonerFactory;
-import uk.ac.manchester.cs.owl.owlapi.OWLStringLiteralImpl;
import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory;
@@ -375,7 +374,7 @@
boolean inconsistentOntology = !reasoner.isConsistent();
if(!inconsistentOntology) {
- reasoner.prepareReasoner();
+ reasoner.precomputeInferences(InferenceType.CLASS_HIERARCHY, InferenceType.CLASS_ASSERTIONS);
} else {
throw new ComponentInitException("Inconsistent ontologies.");
}
@@ -569,7 +568,7 @@
@Override
protected TreeSet<ObjectProperty> getSuperPropertiesImpl(ObjectProperty role) {
- NodeSet<OWLObjectProperty> properties = null;
+ NodeSet<OWLObjectPropertyExpression> properties = null;
properties = reasoner.getSuperObjectProperties(OWLAPIConverter.getOWLAPIObjectProperty(role), true);
@@ -578,7 +577,7 @@
@Override
protected TreeSet<ObjectProperty> getSubPropertiesImpl(ObjectProperty role) {
- NodeSet<OWLObjectProperty> properties = null;
+ NodeSet<OWLObjectPropertyExpression> properties = null;
properties = reasoner.getSubObjectProperties(OWLAPIConverter.getOWLAPIObjectProperty(role), true);
@@ -814,20 +813,19 @@
// convert data back to DL-Learner structures
SortedSet<Constant> is = new TreeSet<Constant>();
- for(OWLLiteral oi : constants) {
+ for(OWLLiteral literal : constants) {
// for typed constants we have to figure out the correct
// data type and value
- if(oi instanceof OWLTypedLiteral) {
- Datatype dt = OWLAPIConverter.convertDatatype(((OWLTypedLiteral)oi).getDatatype());
- is.add(new TypedConstant(oi.getLiteral(),dt));
+ if(!literal.isRDFPlainLiteral()) {
+ Datatype dt = OWLAPIConverter.convertDatatype(literal.getDatatype());
+ is.add(new TypedConstant(literal.getLiteral(), dt));
// for untyped constants we have to figure out the value
// and language tag (if any)
} else {
- OWLStringLiteralImpl ouc = (OWLStringLiteralImpl) oi;
- if(ouc.hasLang())
- is.add(new UntypedConstant(ouc.getLiteral(), ouc.getLang()));
+ if(literal.hasLang())
+ is.add(new UntypedConstant(literal.getLiteral(), literal.getLang()));
else
- is.add(new UntypedConstant(ouc.getLiteral()));
+ is.add(new UntypedConstant(literal.getLiteral()));
}
}
// only add individuals using the datatype property
@@ -869,16 +867,16 @@
return concepts;
}
- private TreeSet<ObjectProperty> getFirstObjectProperties(NodeSet<OWLObjectProperty> nodeSet) {
+ private TreeSet<ObjectProperty> getFirstObjectProperties(NodeSet<OWLObjectPropertyExpression> nodeSet) {
TreeSet<ObjectProperty> roles = new TreeSet<ObjectProperty>(roleComparator);
- for(Node<OWLObjectProperty> node : nodeSet) {
+ for(Node<OWLObjectPropertyExpression> node : nodeSet) {
if(node.isBottomNode() || node.isTopNode()){
continue;
}
// take one element from the set and ignore the rest
// (TODO: we need to make sure we always ignore the same concepts)
- OWLObjectProperty property = node.getRepresentativeElement();
- roles.add(new ObjectProperty(property.toStringID()));
+ OWLObjectPropertyExpression property = node.getRepresentativeElement();
+ roles.add(new ObjectProperty(property.asOWLObjectProperty().toStringID()));
}
roles.remove(new ObjectProperty(factory.getOWLTopObjectProperty().toStringID()));
roles.remove(new ObjectProperty(factory.getOWLBottomObjectProperty().toStringID()));
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java 2010-11-11 17:47:04 UTC (rev 2427)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java 2010-11-12 09:52:59 UTC (rev 2428)
@@ -13,11 +13,11 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.Map.Entry;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -96,7 +96,6 @@
import org.semanticweb.owlapi.model.OWLOntologyFormat;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
-import org.semanticweb.owlapi.model.OWLTypedLiteral;
import org.semanticweb.owlapi.model.RemoveAxiom;
import org.semanticweb.owlapi.model.UnknownOWLOntologyException;
import org.semanticweb.owlapi.reasoner.Node;
@@ -104,8 +103,6 @@
import org.semanticweb.owlapi.util.SimpleIRIMapper;
import org.semanticweb.owlapi.vocab.PrefixOWLOntologyFormat;
-import uk.ac.manchester.cs.owl.owlapi.OWLStringLiteralImpl;
-
import com.clarkparsia.modularity.IncrementalClassifier;
import com.clarkparsia.modularity.PelletIncremantalReasonerFactory;
import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory;
@@ -635,7 +632,7 @@
public Set<Description> getComplementClasses(Description desc){
OWLClassExpression owlDesc = OWLAPIDescriptionConvertVisitor.getOWLClassExpression(desc);
Set<Description> complements = new HashSet<Description>();
- for(OWLClass comp : reasoner.getDisjointClasses(owlDesc, false).getFlattened()){
+ for(OWLClass comp : reasoner.getDisjointClasses(owlDesc).getFlattened()){
complements.add(OWLAPIConverter.convertClass(comp));
}
return complements;
@@ -679,7 +676,7 @@
@Override
protected TreeSet<ObjectProperty> getSuperPropertiesImpl(ObjectProperty role) {
- NodeSet<OWLObjectProperty> properties = null;
+ NodeSet<OWLObjectPropertyExpression> properties = null;
properties = reasoner.getSuperObjectProperties(OWLAPIConverter.getOWLAPIObjectProperty(role), true);
@@ -688,7 +685,7 @@
@Override
protected TreeSet<ObjectProperty> getSubPropertiesImpl(ObjectProperty role) {
- NodeSet<OWLObjectProperty> properties = null;
+ NodeSet<OWLObjectPropertyExpression> properties = null;
properties = reasoner.getSubObjectProperties(OWLAPIConverter.getOWLAPIObjectProperty(role), true);
@@ -1428,20 +1425,19 @@
// convert data back to DL-Learner structures
SortedSet<Constant> is = new TreeSet<Constant>();
- for(OWLLiteral oi : constants) {
+ for(OWLLiteral literal : constants) {
// for typed constants we have to figure out the correct
// data type and value
- if(oi instanceof OWLTypedLiteral) {
- Datatype dt = OWLAPIConverter.convertDatatype(((OWLTypedLiteral)oi).getDatatype());
- is.add(new TypedConstant(oi.getLiteral(),dt));
+ if(!literal.isRDFPlainLiteral()) {
+ Datatype dt = OWLAPIConverter.convertDatatype(literal.getDatatype());
+ is.add(new TypedConstant(literal.getLiteral(), dt));
// for untyped constants we have to figure out the value
// and language tag (if any)
} else {
- OWLStringLiteralImpl ouc = (OWLStringLiteralImpl) oi;
- if(ouc.hasLang())
- is.add(new UntypedConstant(ouc.getLiteral(), ouc.getLang()));
+ if(literal.hasLang())
+ is.add(new UntypedConstant(literal.getLiteral(), literal.getLang()));
else
- is.add(new UntypedConstant(ouc.getLiteral()));
+ is.add(new UntypedConstant(literal.getLiteral()));
}
}
// only add individuals using the datatype property
@@ -1483,17 +1479,19 @@
return concepts;
}
- private TreeSet<ObjectProperty> getFirstObjectProperties(NodeSet<OWLObjectProperty> setOfSets) {
+ private TreeSet<ObjectProperty> getFirstObjectProperties(NodeSet<OWLObjectPropertyExpression> nodeSet) {
TreeSet<ObjectProperty> roles = new TreeSet<ObjectProperty>(roleComparator);
- for(Node<OWLObjectProperty> innerSet : setOfSets) {
- if(innerSet.isBottomNode() || innerSet.isTopNode()){
+ for(Node<OWLObjectPropertyExpression> node : nodeSet) {
+ if(node.isBottomNode() || node.isTopNode()){
continue;
}
// take one element from the set and ignore the rest
// (TODO: we need to make sure we always ignore the same concepts)
- OWLObjectProperty property = innerSet.iterator().next();
- roles.add(new ObjectProperty(property.toStringID()));
+ OWLObjectPropertyExpression property = node.getRepresentativeElement();
+ roles.add(new ObjectProperty(property.asOWLObjectProperty().toStringID()));
}
+ roles.remove(new ObjectProperty(factory.getOWLTopObjectProperty().toStringID()));
+ roles.remove(new ObjectProperty(factory.getOWLBottomObjectProperty().toStringID()));
return roles;
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java 2010-11-11 17:47:04 UTC (rev 2427)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java 2010-11-12 09:52:59 UTC (rev 2428)
@@ -11,11 +11,11 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.Map.Entry;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.KnowledgeSource;
@@ -86,7 +86,6 @@
import org.semanticweb.owlapi.model.OWLOntologyFormat;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
-import org.semanticweb.owlapi.model.OWLTypedLiteral;
import org.semanticweb.owlapi.model.RemoveAxiom;
import org.semanticweb.owlapi.model.UnknownOWLOntologyException;
import org.semanticweb.owlapi.reasoner.Node;
@@ -96,8 +95,6 @@
import org.semanticweb.owlapi.util.SimpleIRIMapper;
import org.semanticweb.owlapi.vocab.PrefixOWLOntologyFormat;
-import uk.ac.manchester.cs.owl.owlapi.OWLStringLiteralImpl;
-
public class ProtegeReasoner extends ReasonerComponent {
private OWLOntologyManager manager;
@@ -428,7 +425,7 @@
public Set<Description> getComplementClasses(Description desc){
OWLClassExpression owlDesc = OWLAPIDescriptionConvertVisitor.getOWLClassExpression(desc);
Set<Description> complements = new HashSet<Description>();
- for(OWLClass comp : reasoner.getDisjointClasses(owlDesc, false).getFlattened()){
+ for(OWLClass comp : reasoner.getDisjointClasses(owlDesc).getFlattened()){
complements.add(OWLAPIConverter.convertClass(comp));
}
return complements;
@@ -472,7 +469,7 @@
@Override
protected TreeSet<ObjectProperty> getSuperPropertiesImpl(ObjectProperty role) {
- NodeSet<OWLObjectProperty> properties = null;
+ NodeSet<OWLObjectPropertyExpression> properties = null;
properties = reasoner.getSuperObjectProperties(OWLAPIConverter.getOWLAPIObjectProperty(role), true);
@@ -481,7 +478,7 @@
@Override
protected TreeSet<ObjectProperty> getSubPropertiesImpl(ObjectProperty role) {
- NodeSet<OWLObjectProperty> properties = null;
+ NodeSet<OWLObjectPropertyExpression> properties = null;
properties = reasoner.getSubObjectProperties(OWLAPIConverter.getOWLAPIObjectProperty(role), true);
@@ -1221,20 +1218,19 @@
// convert data back to DL-Learner structures
SortedSet<Constant> is = new TreeSet<Constant>();
- for(OWLLiteral oi : constants) {
+ for(OWLLiteral literal : constants) {
// for typed constants we have to figure out the correct
// data type and value
- if(oi instanceof OWLTypedLiteral) {
- Datatype dt = OWLAPIConverter.convertDatatype(((OWLTypedLiteral)oi).getDatatype());
- is.add(new TypedConstant(oi.getLiteral(),dt));
+ if(!literal.isRDFPlainLiteral()) {
+ Datatype dt = OWLAPIConverter.convertDatatype(literal.getDatatype());
+ is.add(new TypedConstant(literal.getLiteral(), dt));
// for untyped constants we have to figure out the value
// and language tag (if any)
} else {
- OWLStringLiteralImpl ouc = (OWLStringLiteralImpl) oi;
- if(ouc.hasLang())
- is.add(new UntypedConstant(ouc.getLiteral(), ouc.getLang()));
+ if(literal.hasLang())
+ is.add(new UntypedConstant(literal.getLiteral(), literal.getLang()));
else
- is.add(new UntypedConstant(ouc.getLiteral()));
+ is.add(new UntypedConstant(literal.getLiteral()));
}
}
// only add individuals using the datatype property
@@ -1276,19 +1272,21 @@
return concepts;
}
- private TreeSet<ObjectProperty> getFirstObjectProperties(NodeSet<OWLObjectProperty> setOfSets) {
+ private TreeSet<ObjectProperty> getFirstObjectProperties(NodeSet<OWLObjectPropertyExpression> nodeSet) {
TreeSet<ObjectProperty> roles = new TreeSet<ObjectProperty>(roleComparator);
- for(Node<OWLObjectProperty> innerSet : setOfSets) {
- if(innerSet.isBottomNode() || innerSet.isTopNode()){
+ for(Node<OWLObjectPropertyExpression> node : nodeSet) {
+ if(node.isBottomNode() || node.isTopNode()){
continue;
}
// take one element from the set and ignore the rest
// (TODO: we need to make sure we always ignore the same concepts)
- OWLObjectProperty property = innerSet.iterator().next();
- roles.add(new ObjectProperty(property.toStringID()));
+ OWLObjectPropertyExpression property = node.getRepresentativeElement();
+ roles.add(new ObjectProperty(property.asOWLObjectProperty().toStringID()));
}
+ roles.remove(new ObjectProperty(factory.getOWLTopObjectProperty().toStringID()));
+ roles.remove(new ObjectProperty(factory.getOWLBottomObjectProperty().toStringID()));
return roles;
- }
+ }
private TreeSet<DatatypeProperty> getFirstDatatypeProperties(NodeSet<OWLDataProperty> setOfSets) {
TreeSet<DatatypeProperty> roles = new TreeSet<DatatypeProperty>(roleComparator);
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIAxiomConvertVisitor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIAxiomConvertVisitor.java 2010-11-11 17:47:04 UTC (rev 2427)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIAxiomConvertVisitor.java 2010-11-12 09:52:59 UTC (rev 2428)
@@ -58,12 +58,12 @@
import org.semanticweb.owlapi.model.OWLDataProperty;
import org.semanticweb.owlapi.model.OWLDatatype;
import org.semanticweb.owlapi.model.OWLIndividual;
+import org.semanticweb.owlapi.model.OWLLiteral;
import org.semanticweb.owlapi.model.OWLObjectProperty;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyChangeException;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import org.semanticweb.owlapi.model.OWLTypedLiteral;
/**
* A converter from DL-Learner axioms to OWL API axioms based on the visitor
@@ -168,9 +168,8 @@
public void visit(DoubleDatatypePropertyAssertion axiom) {
OWLIndividual i = factory.getOWLNamedIndividual(IRI.create(axiom.getIndividual().getName()));
OWLDataProperty dp = factory.getOWLDataProperty(IRI.create(axiom.getDatatypeProperty().getName()));
- Double value = axiom.getValue();
- OWLDatatype doubleType = factory.getDoubleOWLDatatype();
- OWLTypedLiteral valueConstant = factory.getOWLTypedLiteral(value.toString(), doubleType);
+ double value = axiom.getValue();
+ OWLLiteral valueConstant = factory.getOWLLiteral(value);
OWLAxiom axiomOWLAPI = factory.getOWLDataPropertyAssertionAxiom(dp, i, valueConstant);
addAxiom(axiomOWLAPI);
}
@@ -181,9 +180,8 @@
public void visit(BooleanDatatypePropertyAssertion axiom) {
OWLIndividual i = factory.getOWLNamedIndividual(IRI.create(axiom.getIndividual().getName()));
OWLDataProperty dp = factory.getOWLDataProperty(IRI.create(axiom.getDatatypeProperty().getName()));
- Boolean value = axiom.getValue();
- OWLDatatype booleanType = factory.getBooleanOWLDatatype();
- OWLTypedLiteral valueConstant = factory.getOWLTypedLiteral(value.toString(), booleanType);
+ boolean value = axiom.getValue();
+ OWLLiteral valueConstant = factory.getOWLLiteral(value);
OWLAxiom axiomOWLAPI = factory.getOWLDataPropertyAssertionAxiom(dp, i, valueConstant);
addAxiom(axiomOWLAPI);
}
@@ -355,8 +353,7 @@
OWLIndividual i = factory.getOWLNamedIndividual(IRI.create(axiom.getIndividual().getName()));
OWLDataProperty dp = factory.getOWLDataProperty(IRI.create(axiom.getDatatypeProperty().getName()));
String value = axiom.getValue();
- OWLDatatype stringType = factory.getOWLDatatype(IRI.create("http://www.w3.org/2001/XMLSchema#string"));
- OWLTypedLiteral valueConstant = factory.getOWLTypedLiteral(value.toString(), stringType);
+ OWLLiteral valueConstant = factory.getOWLLiteral(value);
OWLAxiom axiomOWLAPI = factory.getOWLDataPropertyAssertionAxiom(dp, i, valueConstant);
addAxiom(axiomOWLAPI);
}
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java 2010-11-11 17:47:04 UTC (rev 2427)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java 2010-11-12 09:52:59 UTC (rev 2428)
@@ -64,7 +64,6 @@
import org.semanticweb.owlapi.model.OWLIndividual;
import org.semanticweb.owlapi.model.OWLLiteral;
import org.semanticweb.owlapi.model.OWLObjectProperty;
-import org.semanticweb.owlapi.model.OWLTypedLiteral;
import org.semanticweb.owlapi.vocab.OWLFacet;
import org.semanticweb.owlapi.vocab.XSDVocabulary;
@@ -314,10 +313,10 @@
DatatypeProperty dp = (DatatypeProperty) description.getRestrictedPropertyExpression();
// currently only double restrictions implemented
SimpleDoubleDataRange dr = (SimpleDoubleDataRange) description.getDataRange();
- Double value = dr.getValue();
+ double value = dr.getValue();
OWLDatatype doubleDataType = factory.getOWLDatatype(XSDVocabulary.DOUBLE.getIRI());
- OWLTypedLiteral constant = factory.getOWLTypedLiteral(value.toString(), doubleDataType);
+ OWLLiteral constant = factory.getOWLLiteral(value);
OWLFacet facet;
if(dr instanceof DoubleMinValue)
@@ -350,13 +349,13 @@
if(constant instanceof TypedConstant) {
Datatype dt = ((TypedConstant)constant).getDatatype();
OWLDatatype odt = convertDatatype(dt);
- owlConstant = factory.getOWLTypedLiteral(constant.getLiteral(), odt);
+ owlConstant = factory.getOWLLiteral(constant.getLiteral(), odt);
} else {
UntypedConstant uc = (UntypedConstant) constant;
if(uc.hasLang()) {
- owlConstant = factory.getOWLStringLiteral(uc.getLiteral(), uc.getLang());
+ owlConstant = factory.getOWLLiteral(uc.getLiteral(), uc.getLang());
} else {
- owlConstant = factory.getOWLStringLiteral(uc.getLiteral());
+ owlConstant = factory.getOWLLiteral(uc.getLiteral(), "");
}
}
return owlConstant;
Modified: trunk/components-core/src/test/java/org/dllearner/test/FaCTBugDemo.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/FaCTBugDemo.java 2010-11-11 17:47:04 UTC (rev 2427)
+++ trunk/components-core/src/test/java/org/dllearner/test/FaCTBugDemo.java 2010-11-12 09:52:59 UTC (rev 2428)
@@ -16,6 +16,7 @@
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
+import org.semanticweb.owlapi.reasoner.InferenceType;
import org.semanticweb.owlapi.reasoner.OWLReasoner;
import uk.ac.manchester.cs.factplusplus.owlapiv3.FaCTPlusPlusReasonerFactory;
@@ -36,7 +37,7 @@
OWLReasoner reasoner = new FaCTPlusPlusReasonerFactory().createReasoner(ont);
// OWLReasoner reasoner = new PelletReasonerFactory().createReasoner(ont);:
- reasoner.prepareReasoner();
+ reasoner.precomputeInferences(InferenceType.CLASS_HIERARCHY, InferenceType.CLASS_ASSERTIONS);
OWLDataFactory factory = manager.getOWLDataFactory();
Modified: trunk/components-core/src/test/java/org/dllearner/test/HermitTest.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/HermitTest.java 2010-11-11 17:47:04 UTC (rev 2427)
+++ trunk/components-core/src/test/java/org/dllearner/test/HermitTest.java 2010-11-12 09:52:59 UTC (rev 2428)
@@ -9,6 +9,7 @@
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.reasoner.ConsoleProgressMonitor;
+import org.semanticweb.owlapi.reasoner.InferenceType;
import org.semanticweb.owlapi.reasoner.OWLReasoner;
import org.semanticweb.owlapi.reasoner.OWLReasonerConfiguration;
import org.semanticweb.owlapi.reasoner.SimpleConfiguration;
@@ -28,7 +29,7 @@
System.out.println("Using Pellet reasoner");
OWLReasoner pellet = PelletReasonerFactory.getInstance().createNonBufferingReasoner(ontology, conf);
- pellet.prepareReasoner();
+ pellet.precomputeInferences(InferenceType.CLASS_HIERARCHY, InferenceType.CLASS_ASSERTIONS);
for(OWLIndividual ind : ontology.getIndividualsInSignature(true)){
System.out.println("Individual: " + ind);
@@ -40,7 +41,7 @@
System.out.println("Using HermiT reasoner");
OWLReasoner hermit = new ReasonerFactory().createNonBufferingReasoner(ontology, conf);
- hermit.prepareReasoner();
+ hermit.precomputeInferences(InferenceType.CLASS_HIERARCHY, InferenceType.CLASS_ASSERTIONS);
for(OWLIndividual ind : ontology.getIndividualsInSignature(true)){
System.out.println("Individual: " + ind);
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-11 17:47:04 UTC (rev 2427)
+++ trunk/pom.xml 2010-11-12 09:52:59 UTC (rev 2428)
@@ -95,13 +95,13 @@
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</dependency>
<dependency>
<groupId>com.owldl</groupId>
<artifactId>pellet</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sha...@us...> - 2010-11-15 18:43:41
|
Revision: 2440
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2440&view=rev
Author: shadowtm
Date: 2010-11-15 18:43:34 +0000 (Mon, 15 Nov 2010)
Log Message:
-----------
Upgraded hermit dependency to 1.3.1 as 1.2.3 was not compatible with OWL API 3.1 - also upgraded the protege dependencies as hermit 1.3.1 needed these to run as well.
Modified Paths:
--------------
trunk/components-core/pom.xml
trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIConverter.java
trunk/components-core/src/test/java/org/dllearner/test/PelletBug.java
trunk/components-core/src/test/java/org/dllearner/test/PelletBug2.java
trunk/components-core/src/test/java/org/dllearner/test/PelletPerformanceProblem.java
trunk/pom.xml
Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml 2010-11-14 07:45:01 UTC (rev 2439)
+++ trunk/components-core/pom.xml 2010-11-15 18:43:34 UTC (rev 2440)
@@ -21,6 +21,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <!--Uncomment this when the junits are independent of a runtime directory-->
+ <!--<includes>-->
+ <!--<include>org/dllearner/test/junit/*</include>-->
+ <!--</includes>-->
<excludes>
<exclude>org/dllearner/test/*</exclude>
<exclude>org/dllearner/test/junit/TestOntologies.java</exclude>
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIConverter.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIConverter.java 2010-11-14 07:45:01 UTC (rev 2439)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIConverter.java 2010-11-15 18:43:34 UTC (rev 2440)
@@ -36,7 +36,6 @@
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.Thing;
import org.dllearner.core.owl.TypedConstant;
-import org.dllearner.core.owl.UntypedConstant;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLAxiom;
@@ -50,8 +49,6 @@
import org.semanticweb.owlapi.model.OWLLiteral;
import org.semanticweb.owlapi.model.OWLNamedIndividual;
import org.semanticweb.owlapi.model.OWLObjectProperty;
-import org.semanticweb.owlapi.model.OWLStringLiteral;
-import org.semanticweb.owlapi.model.OWLTypedLiteral;
/**
* A collection of methods for exchanging objects between OWL API and
@@ -78,7 +75,7 @@
/**
* Converts a DL-Learner description into an OWL API description.
*
- * @see OWLAPIDescriptionConvertVisitor#getOWLDescription(Description)
+ * @see OWLAPIDescriptionConvertVisitor#getOWLClassExpression(org.dllearner.core.owl.Description)
* @param description DL-Learner description.
* @return Corresponding OWL API description.
*/
@@ -154,18 +151,10 @@
Constant c;
// for typed constants we have to figure out the correct
// data type and value
- if(constant instanceof OWLTypedLiteral) {
- Datatype dt = OWLAPIConverter.convertDatatype(((OWLTypedLiteral)constant).getDatatype());
- c = new TypedConstant(constant.getLiteral(),dt);
- // for untyped constants we have to figure out the value
- // and language tag (if any)
- } else {
- OWLStringLiteral ouc = (OWLStringLiteral) constant;
- if(ouc.getLang() != null && !ouc.getLang().isEmpty())
- c = new UntypedConstant(ouc.getLiteral(), ouc.getLang());
- else
- c = new UntypedConstant(ouc.getLiteral());
- }
+
+ /** New OWL API only has the OWLLiteral */
+ Datatype dt = OWLAPIConverter.convertDatatype(constant.getDatatype());
+ c = new TypedConstant(constant.getLiteral(),dt);
return c;
}
Modified: trunk/components-core/src/test/java/org/dllearner/test/PelletBug.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/PelletBug.java 2010-11-14 07:45:01 UTC (rev 2439)
+++ trunk/components-core/src/test/java/org/dllearner/test/PelletBug.java 2010-11-15 18:43:34 UTC (rev 2440)
@@ -17,14 +17,13 @@
import org.semanticweb.owlapi.model.RemoveAxiom;
import org.semanticweb.owlapi.model.UnknownOWLOntologyException;
import org.semanticweb.owlapi.reasoner.OWLReasoner;
-import org.semanticweb.owlapi.reasoner.OWLReasonerException;
import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory;
public class PelletBug {
public static void main(String[] args) throws OWLOntologyCreationException,
- OWLReasonerException, UnknownOWLOntologyException, OWLOntologyStorageException {
+ UnknownOWLOntologyException, OWLOntologyStorageException {
OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
File f = new File("examples/family/father_oe.owl");
Modified: trunk/components-core/src/test/java/org/dllearner/test/PelletBug2.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/PelletBug2.java 2010-11-14 07:45:01 UTC (rev 2439)
+++ trunk/components-core/src/test/java/org/dllearner/test/PelletBug2.java 2010-11-15 18:43:34 UTC (rev 2440)
@@ -17,15 +17,13 @@
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
import org.semanticweb.owlapi.model.RemoveAxiom;
import org.semanticweb.owlapi.model.UnknownOWLOntologyException;
-import org.semanticweb.owlapi.reasoner.OWLReasonerException;
import com.clarkparsia.pellet.owlapiv3.PelletReasoner;
import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory;
public class PelletBug2 {
- public static void main(String[] args) throws OWLOntologyCreationException,
- OWLReasonerException, UnknownOWLOntologyException,
+ public static void main(String[] args) throws OWLOntologyCreationException, UnknownOWLOntologyException,
OWLOntologyStorageException {
// Set flags for incremental consistency
Modified: trunk/components-core/src/test/java/org/dllearner/test/PelletPerformanceProblem.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/PelletPerformanceProblem.java 2010-11-14 07:45:01 UTC (rev 2439)
+++ trunk/components-core/src/test/java/org/dllearner/test/PelletPerformanceProblem.java 2010-11-15 18:43:34 UTC (rev 2440)
@@ -29,7 +29,6 @@
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.reasoner.InferenceType;
import org.semanticweb.owlapi.reasoner.OWLReasoner;
-import org.semanticweb.owlapi.reasoner.OWLReasonerException;
import org.semanticweb.owlapi.reasoner.SimpleConfiguration;
import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory;
@@ -40,7 +39,7 @@
*/
public class PelletPerformanceProblem {
- public static void main(String[] args) throws OWLOntologyCreationException, OWLReasonerException {
+ public static void main(String[] args) throws OWLOntologyCreationException {
Logger pelletLogger = Logger.getLogger("org.mindswap.pellet");
pelletLogger.setLevel(Level.WARN);
OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-14 07:45:01 UTC (rev 2439)
+++ trunk/pom.xml 2010-11-15 18:43:34 UTC (rev 2440)
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.semanticweb.hermit</groupId>
<artifactId>hermit</artifactId>
- <version>1.2.3</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
@@ -211,13 +211,13 @@
<dependency>
<groupId>org.protege.editor.core</groupId>
<artifactId>org.protege.editor.core.application</artifactId>
- <version>4.1.0.206</version>
+ <version>4.1</version>
</dependency>
<dependency>
<groupId>org.protege.editor.owl</groupId>
<artifactId>org.protege.editor.owl</artifactId>
- <version>4.1.0.206</version>
+ <version>4.1</version>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sha...@us...> - 2010-11-18 18:20:05
|
Revision: 2453
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2453&view=rev
Author: shadowtm
Date: 2010-11-18 18:19:58 +0000 (Thu, 18 Nov 2010)
Log Message:
-----------
Updated maven poms to retrieve the versions of dependencies from the parent pom.
Modified Paths:
--------------
trunk/autosparql/pom.xml
trunk/pom.xml
trunk/scripts/pom.xml
trunk/sparql-query-generator/pom.xml
Modified: trunk/autosparql/pom.xml
===================================================================
--- trunk/autosparql/pom.xml 2010-11-18 13:16:48 UTC (rev 2452)
+++ trunk/autosparql/pom.xml 2010-11-18 18:19:58 UTC (rev 2453)
@@ -53,32 +53,23 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.aksw.commons</groupId>
<artifactId>commons</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>sparql-query-generator</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>components-core</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-18 13:16:48 UTC (rev 2452)
+++ trunk/pom.xml 2010-11-18 18:19:58 UTC (rev 2453)
@@ -14,6 +14,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- convenience to define GWT version in one place -->
<gwt.version>2.1.0</gwt.version>
+
+ <!--Define the AKSW dependency version -->
+ <aksw.version>1.0-SNAPSHOT</aksw.version>
</properties>
<modules>
@@ -88,9 +91,15 @@
</build>
<dependencyManagement>
- <!--Dependency Management defines the dependencies at the parent level - ideally we would-->
- <!--define all the dependencies of the project here so we would have consistent versions-->
- <!--across all of the child components-->
+ <!--
+ - Dependency Management defines the dependencies at the parent level
+ - These set the dependencies on a global level and the children are forced to use the defined version
+ - We do this to ensure consistent dependencies amongst all children artifacts that are generated by this pom.
+ -
+ - Children still have to include the dependency, but only the groupId and artifactId as version is retrieved from the parent.
+ -
+ - Remember, default scope is compile in Maven.
+ -->
<dependencies>
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
@@ -193,7 +202,8 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.8.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -220,6 +230,7 @@
<version>4.1</version>
</dependency>
+ <!--Dependencies that are generated as part of this parent pom-->
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>components-core</artifactId>
@@ -251,8 +262,21 @@
<artifactId>protege</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
+ <groupId>org.dllearner</groupId>
+ <artifactId>sparql-query-generator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.aksw.commons</groupId>
+ <artifactId>commons</artifactId>
+ <version>${aksw.version}</version>
+ </dependency>
+
+
+ <dependency>
<groupId>net.sourceforge.secondstring</groupId>
<artifactId>secondstring</artifactId>
<version>20060615</version>
@@ -294,6 +318,12 @@
<version>${gwt.version}</version>
</dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.4-701.jdbc4</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: trunk/scripts/pom.xml
===================================================================
--- trunk/scripts/pom.xml 2010-11-18 13:16:48 UTC (rev 2452)
+++ trunk/scripts/pom.xml 2010-11-18 18:19:58 UTC (rev 2453)
@@ -35,7 +35,6 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>8.4-701.jdbc4</version>
</dependency>
</dependencies>
</project>
Modified: trunk/sparql-query-generator/pom.xml
===================================================================
--- trunk/sparql-query-generator/pom.xml 2010-11-18 13:16:48 UTC (rev 2452)
+++ trunk/sparql-query-generator/pom.xml 2010-11-18 18:19:58 UTC (rev 2453)
@@ -46,9 +46,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2010-11-23 13:02:27
|
Revision: 2462
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2462&view=rev
Author: jenslehmann
Date: 2010-11-23 13:02:18 +0000 (Tue, 23 Nov 2010)
Log Message:
-----------
- adapted ConfigJavaGenerator to new framework
- moved to OCELConfigurator
- implemented expansionPenaltyFactor option for CELOE
=> setting it to 0.02 (default 0.1) leads to a similar behaviour as OCEL (untested)
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java
trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/OEHeuristicRuntime.java
trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ExampleBasedNode.java
trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/MultiHeuristic.java
trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/OCEL.java
trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ROLearner2.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/CELOEConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/ComponentFactory.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDRDown.java
trunk/components-core/src/main/java/org/dllearner/utilities/Files.java
trunk/components-core/src/main/java/org/dllearner/utilities/examples/ExampleDataCollector.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/ManchesterOWLSyntaxParser.java
trunk/examples/mutagenesis/train2.conf
trunk/interfaces/src/main/java/org/dllearner/gui/TreeWindow.java
trunk/scripts/src/main/java/org/dllearner/scripts/ConfigJavaGenerator.java
trunk/scripts/src/main/java/org/dllearner/scripts/DumbLPFinder.java
trunk/scripts/src/main/java/org/dllearner/scripts/NewSample.java
trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBibleComparison.java
trunk/scripts/src/main/java/org/dllearner/scripts/WikipediaCategoryCleaner.java
trunk/scripts/src/main/java/org/dllearner/scripts/tiger/TestIterativeLearning.java
Added Paths:
-----------
trunk/components-core/src/main/java/org/dllearner/core/configurators/OCELConfigurator.java
Removed Paths:
-------------
trunk/components-core/src/main/java/org/dllearner/core/configurators/ROLComponent2Configurator.java
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java 2010-11-22 15:04:09 UTC (rev 2461)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java 2010-11-23 13:02:18 UTC (rev 2462)
@@ -40,6 +40,7 @@
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.CommonConfigOptions;
import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.DoubleConfigOption;
import org.dllearner.core.options.StringConfigOption;
import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.core.owl.Description;
@@ -90,7 +91,7 @@
// all nodes in the search tree (used for selecting most promising node)
private TreeSet<OENode> nodes;
- private OEHeuristicRuntime heuristic = new OEHeuristicRuntime();
+ private OEHeuristicRuntime heuristic; // = new OEHeuristicRuntime();
// root of search tree
private OENode startNode;
// the class with which we start the refinement process
@@ -180,7 +181,8 @@
options.add(new BooleanConfigOption("reuseExistingDescription", "If true, the algorithm tries to find a good starting point close to an existing definition/super class of the given class in the knowledge base.", false));
options.add(new BooleanConfigOption("writeSearchTree", "specifies whether to write a search tree", false));
options.add(new StringConfigOption("searchTreeFile","file to use for the search tree", "log/searchTree.txt"));
- options.add(new BooleanConfigOption("replaceSearchTree","specifies whether to replace the search tree in the log file after each run or append the new search tree", false));
+ options.add(new BooleanConfigOption("replaceSearchTree","specifies whether to replace the search tree in the log file after each run or append the new search tree", false));
+ options.add(new DoubleConfigOption("expansionPenaltyFactor","heuristic penalty per syntactic construct used (lower = finds more complex expression, but might miss simple ones)", 0.1));
return options;
}
@@ -195,6 +197,8 @@
ClassHierarchy classHierarchy = reasoner.getClassHierarchy().clone();
classHierarchy.thinOutSubsumptionHierarchy();
+ heuristic = new OEHeuristicRuntime(configurator);
+
minimizer = new DescriptionMinimizer(reasoner);
startClass = Thing.instance;
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/OEHeuristicRuntime.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/OEHeuristicRuntime.java 2010-11-22 15:04:09 UTC (rev 2461)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/OEHeuristicRuntime.java 2010-11-23 13:02:18 UTC (rev 2462)
@@ -21,6 +21,7 @@
import java.util.Comparator;
+import org.dllearner.core.configurators.CELOEConfigurator;
import org.dllearner.utilities.owl.ConceptComparator;
/**
@@ -43,6 +44,10 @@
// syntactic comparison as final comparison criterion
private ConceptComparator conceptComparator = new ConceptComparator();
+ public OEHeuristicRuntime(CELOEConfigurator configurator) {
+ expansionPenaltyFactor = configurator.getExpansionPenaltyFactor();
+ }
+
@Override
public int compare(OENode node1, OENode node2) {
// System.out.println("node1 " + node1);
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ExampleBasedNode.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ExampleBasedNode.java 2010-11-22 15:04:09 UTC (rev 2461)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ExampleBasedNode.java 2010-11-23 13:02:18 UTC (rev 2462)
@@ -27,7 +27,7 @@
import java.util.TreeSet;
import org.dllearner.algorithms.SearchTreeNode;
-import org.dllearner.core.configurators.ROLComponent2Configurator;
+import org.dllearner.core.configurators.OCELConfigurator;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
import org.dllearner.utilities.owl.ConceptComparator;
@@ -46,7 +46,7 @@
// public static long exampleMemoryCounter = 0;
- private ROLComponent2Configurator configurator;
+ private OCELConfigurator configurator;
private static DecimalFormat df = new DecimalFormat();
@@ -81,7 +81,7 @@
// a flag whether this could be a solution for a posonly learning problem
private boolean isPosOnlyCandidate = true;
- public ExampleBasedNode(ROLComponent2Configurator configurator, Description concept) {
+ public ExampleBasedNode(OCELConfigurator configurator, Description concept) {
this.configurator = configurator;
this.concept = concept;
horizontalExpansion = 0;
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/MultiHeuristic.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/MultiHeuristic.java 2010-11-22 15:04:09 UTC (rev 2461)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/MultiHeuristic.java 2010-11-23 13:02:18 UTC (rev 2462)
@@ -21,7 +21,7 @@
import java.util.List;
-import org.dllearner.core.configurators.ROLComponent2Configurator;
+import org.dllearner.core.configurators.OCELConfigurator;
import org.dllearner.core.owl.DatatypeSomeRestriction;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Negation;
@@ -70,7 +70,7 @@
public class MultiHeuristic implements ExampleBasedHeuristic {
private ConceptComparator conceptComparator = new ConceptComparator();
- private ROLComponent2Configurator configurator;
+ private OCELConfigurator configurator;
// heuristic parameters
private double expansionPenaltyFactor = 0.02;
@@ -92,7 +92,7 @@
// this(nrOfPositiveExamples, nrOfNegativeExamples, 0.02, 0.5);
}
- public MultiHeuristic(int nrOfPositiveExamples, int nrOfNegativeExamples, ROLComponent2Configurator configurator) {
+ public MultiHeuristic(int nrOfPositiveExamples, int nrOfNegativeExamples, OCELConfigurator configurator) {
this.nrOfNegativeExamples = nrOfNegativeExamples;
nrOfExamples = nrOfPositiveExamples + nrOfNegativeExamples;
this.configurator = configurator;
@@ -144,7 +144,7 @@
return (coveredPositives + negativeWeight * (nrOfNegativeExamples - coveredNegatives))/(double)nrOfExamples;
}
- public static double getNodeScore(ExampleBasedNode node, int nrOfPositiveExamples, int nrOfNegativeExamples, ROLComponent2Configurator configurator) {
+ public static double getNodeScore(ExampleBasedNode node, int nrOfPositiveExamples, int nrOfNegativeExamples, OCELConfigurator configurator) {
MultiHeuristic multi = new MultiHeuristic(nrOfPositiveExamples, nrOfNegativeExamples, configurator);
return multi.getNodeScore(node);
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/OCEL.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/OCEL.java 2010-11-22 15:04:09 UTC (rev 2461)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/OCEL.java 2010-11-23 13:02:18 UTC (rev 2462)
@@ -33,7 +33,7 @@
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasonerComponent;
-import org.dllearner.core.configurators.ROLComponent2Configurator;
+import org.dllearner.core.configurators.OCELConfigurator;
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.CommonConfigMappings;
import org.dllearner.core.options.CommonConfigOptions;
@@ -83,9 +83,9 @@
*/
public class OCEL extends LearningAlgorithm {
- private ROLComponent2Configurator configurator;
+ private OCELConfigurator configurator;
@Override
- public ROLComponent2Configurator getConfigurator(){
+ public OCELConfigurator getConfigurator(){
return configurator;
}
@@ -154,12 +154,12 @@
// public ROLearner(LearningProblem learningProblem, LearningProblem learningProblem2) {
public OCEL(PosNegLP learningProblem, ReasonerComponent reasoningService) {
super(learningProblem, reasoningService);
- this.configurator = new ROLComponent2Configurator(this);
+ this.configurator = new OCELConfigurator(this);
}
public OCEL(PosOnlyLP learningProblem, ReasonerComponent reasoningService) {
super(learningProblem, reasoningService);
- this.configurator = new ROLComponent2Configurator(this);
+ this.configurator = new OCELConfigurator(this);
}
public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ROLearner2.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ROLearner2.java 2010-11-22 15:04:09 UTC (rev 2461)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ROLearner2.java 2010-11-23 13:02:18 UTC (rev 2462)
@@ -35,7 +35,7 @@
import org.apache.log4j.Logger;
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasonerComponent;
-import org.dllearner.core.configurators.ROLComponent2Configurator;
+import org.dllearner.core.configurators.OCELConfigurator;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.Intersection;
@@ -64,7 +64,7 @@
public class ROLearner2 {
private static Logger logger = Logger.getLogger(ROLearner2.class);
- private ROLComponent2Configurator configurator;
+ private OCELConfigurator configurator;
// basic setup: learning problem and reasoning service
private ReasonerComponent rs;
@@ -212,7 +212,7 @@
private Map<String, String> prefixes;
public ROLearner2(
- ROLComponent2Configurator configurator,
+ OCELConfigurator configurator,
LearningProblem learningProblem,
ReasonerComponent rs,
RefinementOperator operator,
Modified: trunk/components-core/src/main/java/org/dllearner/core/configurators/CELOEConfigurator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/configurators/CELOEConfigurator.java 2010-11-22 15:04:09 UTC (rev 2461)
+++ trunk/components-core/src/main/java/org/dllearner/core/configurators/CELOEConfigurator.java 2010-11-23 13:02:18 UTC (rev 2462)
@@ -253,6 +253,15 @@
public boolean getReplaceSearchTree() {
return (Boolean) ComponentManager.getInstance().getConfigOptionValue(cELOE, "replaceSearchTree") ;
}
+/**
+* expansionPenaltyFactor heuristic penalty per syntactic construct used (lower = finds more complex expression, but might miss simple ones).
+* mandatory: false| reinit necessary: true
+* default value: 0.1
+* @return double
+**/
+public double getExpansionPenaltyFactor() {
+return (Double) ComponentManager.getInstance().getConfigOptionValue(cELOE, "expansionPenaltyFactor") ;
+}
/**
* @param useAllConstructor specifies whether the universal concept constructor is used in the learning algorithm.
@@ -452,6 +461,15 @@
ComponentManager.getInstance().applyConfigEntry(cELOE, "replaceSearchTree", replaceSearchTree);
reinitNecessary = true;
}
+/**
+* @param expansionPenaltyFactor heuristic penalty per syntactic construct used (lower = finds more complex expression, but might miss simple ones).
+* mandatory: false| reinit necessary: true
+* default value: 0.1
+**/
+public void setExpansionPenaltyFactor(double expansionPenaltyFactor) {
+ComponentManager.getInstance().applyConfigEntry(cELOE, "expansionPenaltyFactor", expansionPenaltyFactor);
+reinitNecessary = true;
+}
/**
* true, if this component needs reinitializsation.
Modified: trunk/components-core/src/main/java/org/dllearner/core/configurators/ComponentFactory.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/configurators/ComponentFactory.java 2010-11-22 15:04:09 UTC (rev 2461)
+++ trunk/components-core/src/main/java/org/dllearner/core/configurators/ComponentFactory.java 2010-11-23 13:02:18 UTC (rev 2462)
@@ -249,20 +249,20 @@
* @param learningProblem see LearningProblem
* @param reasoningService see ReasoningService
* @throws LearningProblemUnsupportedException see
-* @return a component ready for initialization ROLearner
+* @return a component ready for initialization OCEL
**/
-public static ROLearner getROLearner(LearningProblem learningProblem, ReasonerComponent reasoningService) throws LearningProblemUnsupportedException {
-return ROLearnerConfigurator.getROLearner(learningProblem, reasoningService);
+public static OCEL getOCEL(LearningProblem learningProblem, ReasonerComponent reasoningService) throws LearningProblemUnsupportedException {
+return OCELConfigurator.getOCEL(learningProblem, reasoningService);
}
/**
* @param learningProblem see LearningProblem
* @param reasoningService see ReasoningService
* @throws LearningProblemUnsupportedException see
-* @return a component ready for initialization ROLComponent2
+* @return a component ready for initialization ROLearner
**/
-public static OCEL getROLComponent2(LearningProblem learningProblem, ReasonerComponent reasoningService) throws LearningProblemUnsupportedException {
-return ROLComponent2Configurator.getROLComponent2(learningProblem, reasoningService);
+public static ROLearner getROLearner(LearningProblem learningProblem, ReasonerComponent reasoningService) throws LearningProblemUnsupportedException {
+return ROLearnerConfigurator.getROLearner(learningProblem, reasoningService);
}
Added: trunk/components-core/src/main/java/org/dllearner/core/configurators/OCELConfigurator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/configurators/OCELConfigurator.java (rev 0)
+++ trunk/components-core/src/main/java/org/dllearner/core/configurators/OCELConfigurator.java 2010-11-23 13:02:18 UTC (rev 2462)
@@ -0,0 +1,812 @@
+/**
+ * Copyright (C) 2007-2008, 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.core.configurators;
+
+import java.util.Set;
+import org.dllearner.algorithms.ocel.OCEL;
+import org.dllearner.core.ComponentManager;
+import org.dllearner.core.LearningProblem;
+import org.dllearner.core.LearningProblemUnsupportedException;
+import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.configurators.RefinementOperatorConfigurator;
+
+/**
+* automatically generated, do not edit manually.
+* run org.dllearner.scripts.ConfigJavaGenerator to update
+**/
+@SuppressWarnings("all")
+public class OCELConfigurator extends RefinementOperatorConfigurator implements Configurator {
+
+private boolean reinitNecessary = false;
+private OCEL oCEL;
+
+/**
+* @param oCEL see OCEL
+**/
+public OCELConfigurator(OCEL oCEL){
+this.oCEL = oCEL;
+}
+
+/**
+* @param reasoningService see reasoningService
+* @param learningProblem see learningProblem
+* @throws LearningProblemUnsupportedException see
+* @return OCEL
+**/
+public static OCEL getOCEL(LearningProblem learningProblem, ReasonerComponent reasoningService) throws LearningProblemUnsupportedException{
+OCEL component = ComponentManager.getInstance().learningAlgorithm(OCEL.class, learningProblem, reasoningService);
+return component;
+}
+
+/**
+* writeSearchTree specifies whether to write a search tree.
+* mandatory: false| reinit necessary: true
+* default value: false
+* @return boolean
+**/
+public boolean getWriteSearchTree() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "writeSearchTree") ;
+}
+/**
+* searchTreeFile file to use for the search tree.
+* mandatory: false| reinit necessary: true
+* default value: log/searchTree.txt
+* @return String
+**/
+public String getSearchTreeFile() {
+return (String) ComponentManager.getInstance().getConfigOptionValue(oCEL, "searchTreeFile") ;
+}
+/**
+* replaceSearchTree specifies whether to replace the search tree in the log file after each run or append the new search tree.
+* mandatory: false| reinit necessary: true
+* default value: false
+* @return boolean
+**/
+public boolean getReplaceSearchTree() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "replaceSearchTree") ;
+}
+/**
+* heuristic specifiy the heuristic to use.
+* mandatory: false| reinit necessary: true
+* default value: lexicographic
+* @return String
+**/
+public String getHeuristic() {
+return (String) ComponentManager.getInstance().getConfigOptionValue(oCEL, "heuristic") ;
+}
+/**
+* applyAllFilter usage of equivalence ALL R.C AND ALL R.D = ALL R.(C AND D).
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getApplyAllFilter() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "applyAllFilter") ;
+}
+/**
+* applyExistsFilter usage of equivalence EXISTS R.C OR EXISTS R.D = EXISTS R.(C OR D).
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getApplyExistsFilter() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "applyExistsFilter") ;
+}
+/**
+* useTooWeakList try to filter out too weak concepts without sending them to the reasoner.
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getUseTooWeakList() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useTooWeakList") ;
+}
+/**
+* useOverlyGeneralList try to find overly general concept without sending them to the reasoner.
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getUseOverlyGeneralList() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useOverlyGeneralList") ;
+}
+/**
+* useShortConceptConstruction shorten concept to see whether they already exist.
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getUseShortConceptConstruction() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useShortConceptConstruction") ;
+}
+/**
+* horizontalExpansionFactor horizontal expansion factor (see publication for description).
+* mandatory: false| reinit necessary: true
+* default value: 0.6
+* @return double
+**/
+public double getHorizontalExpansionFactor() {
+return (Double) ComponentManager.getInstance().getConfigOptionValue(oCEL, "horizontalExpansionFactor") ;
+}
+/**
+* improveSubsumptionHierarchy simplify subsumption hierarchy to reduce search space (see publication for description).
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getImproveSubsumptionHierarchy() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "improveSubsumptionHierarchy") ;
+}
+/**
+* allowedConcepts concepts the algorithm is allowed to use.
+* mandatory: false| reinit necessary: true
+* default value: null
+* @return Set(String)
+**/
+@SuppressWarnings("unchecked")
+public Set<String> getAllowedConcepts() {
+return (Set<String>) ComponentManager.getInstance().getConfigOptionValue(oCEL, "allowedConcepts") ;
+}
+/**
+* ignoredConcepts concepts the algorithm must ignore.
+* mandatory: false| reinit necessary: true
+* default value: null
+* @return Set(String)
+**/
+@SuppressWarnings("unchecked")
+public Set<String> getIgnoredConcepts() {
+return (Set<String>) ComponentManager.getInstance().getConfigOptionValue(oCEL, "ignoredConcepts") ;
+}
+/**
+* allowedRoles roles the algorithm is allowed to use.
+* mandatory: false| reinit necessary: true
+* default value: null
+* @return Set(String)
+**/
+@SuppressWarnings("unchecked")
+public Set<String> getAllowedRoles() {
+return (Set<String>) ComponentManager.getInstance().getConfigOptionValue(oCEL, "allowedRoles") ;
+}
+/**
+* ignoredRoles roles the algorithm must ignore.
+* mandatory: false| reinit necessary: true
+* default value: null
+* @return Set(String)
+**/
+@SuppressWarnings("unchecked")
+public Set<String> getIgnoredRoles() {
+return (Set<String>) ComponentManager.getInstance().getConfigOptionValue(oCEL, "ignoredRoles") ;
+}
+/**
+* useAllConstructor specifies whether the universal concept constructor is used in the learning algorithm.
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getUseAllConstructor() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useAllConstructor") ;
+}
+/**
+* useExistsConstructor specifies whether the existential concept constructor is used in the learning algorithm.
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getUseExistsConstructor() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useExistsConstructor") ;
+}
+/**
+* useHasValueConstructor specifies whether the hasValue constructor is used in the learning algorithm.
+* mandatory: false| reinit necessary: true
+* default value: false
+* @return boolean
+**/
+public boolean getUseHasValueConstructor() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useHasValueConstructor") ;
+}
+/**
+* useDataHasValueConstructor specifies whether the hasValue constructor is used in the learning algorithm in combination with data properties.
+* mandatory: false| reinit necessary: true
+* default value: false
+* @return boolean
+**/
+public boolean getUseDataHasValueConstructor() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useDataHasValueConstructor") ;
+}
+/**
+* valueFrequencyThreshold specifies how often an object must occur as value in order to be considered for hasValue restrictions.
+* mandatory: false| reinit necessary: true
+* default value: 3
+* @return int
+**/
+public int getValueFrequencyThreshold() {
+return (Integer) ComponentManager.getInstance().getConfigOptionValue(oCEL, "valueFrequencyThreshold") ;
+}
+/**
+* useCardinalityRestrictions specifies whether CardinalityRestrictions is used in the learning algorithm.
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getUseCardinalityRestrictions() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useCardinalityRestrictions") ;
+}
+/**
+* cardinalityLimit Gives the maximum number used in cardinality restrictions..
+* mandatory: false| reinit necessary: true
+* default value: 5
+* @return int
+**/
+public int getCardinalityLimit() {
+return (Integer) ComponentManager.getInstance().getConfigOptionValue(oCEL, "cardinalityLimit") ;
+}
+/**
+* useNegation specifies whether negation is used in the learning algorothm.
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getUseNegation() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useNegation") ;
+}
+/**
+* useBooleanDatatypes specifies whether boolean datatypes are used in the learning algorothm.
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getUseBooleanDatatypes() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useBooleanDatatypes") ;
+}
+/**
+* useDoubleDatatypes specifies whether boolean datatypes are used in the learning algorothm.
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getUseDoubleDatatypes() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useDoubleDatatypes") ;
+}
+/**
+* useStringDatatypes specifies whether string datatypes are used in the learning algorothm.
+* mandatory: false| reinit necessary: true
+* default value: false
+* @return boolean
+**/
+public boolean getUseStringDatatypes() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "useStringDatatypes") ;
+}
+/**
+* maxExecutionTimeInSeconds algorithm will stop after specified seconds.
+* mandatory: false| reinit necessary: true
+* default value: 0
+* @return int
+**/
+public int getMaxExecutionTimeInSeconds() {
+return (Integer) ComponentManager.getInstance().getConfigOptionValue(oCEL, "maxExecutionTimeInSeconds") ;
+}
+/**
+* minExecutionTimeInSeconds algorithm will run at least specified seconds.
+* mandatory: false| reinit necessary: true
+* default value: 0
+* @return int
+**/
+public int getMinExecutionTimeInSeconds() {
+return (Integer) ComponentManager.getInstance().getConfigOptionValue(oCEL, "minExecutionTimeInSeconds") ;
+}
+/**
+* guaranteeXgoodDescriptions algorithm will run until X good (100%) concept descritpions are found.
+* mandatory: false| reinit necessary: true
+* default value: 1
+* @return int
+**/
+public int getGuaranteeXgoodDescriptions() {
+return (Integer) ComponentManager.getInstance().getConfigOptionValue(oCEL, "guaranteeXgoodDescriptions") ;
+}
+/**
+* maxClassDescriptionTests The maximum number of candidate hypothesis the algorithm is allowed to test (0 = no limit). The algorithm will stop afterwards. (The real number of tests can be slightly higher, because this criterion usually won't be checked after each single test.).
+* mandatory: false| reinit necessary: true
+* default value: 0
+* @return int
+**/
+public int getMaxClassDescriptionTests() {
+return (Integer) ComponentManager.getInstance().getConfigOptionValue(oCEL, "maxClassDescriptionTests") ;
+}
+/**
+* logLevel determines the logLevel for this component, can be {TRACE, DEBUG, INFO}.
+* mandatory: false| reinit necessary: true
+* default value: DEBUG
+* @return String
+**/
+public String getLogLevel() {
+return (String) ComponentManager.getInstance().getConfigOptionValue(oCEL, "logLevel") ;
+}
+/**
+* usePropernessChecks specifies whether to check for equivalence (i.e. discard equivalent refinements).
+* mandatory: false| reinit necessary: true
+* default value: false
+* @return boolean
+**/
+public boolean getUsePropernessChecks() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "usePropernessChecks") ;
+}
+/**
+* noisePercentage the (approximated) percentage of noise within the examples.
+* mandatory: false| reinit necessary: true
+* default value: 0.0
+* @return double
+**/
+public double getNoisePercentage() {
+return (Double) ComponentManager.getInstance().getConfigOptionValue(oCEL, "noisePercentage") ;
+}
+/**
+* terminateOnNoiseReached specifies whether to terminate when noise criterion is met.
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getTerminateOnNoiseReached() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "terminateOnNoiseReached") ;
+}
+/**
+* startClass the named class which should be used to start the algorithm (GUI: needs a widget for selecting a class).
+* mandatory: false| reinit necessary: true
+* default value: null
+* @return String
+**/
+public String getStartClass() {
+return (String) ComponentManager.getInstance().getConfigOptionValue(oCEL, "startClass") ;
+}
+/**
+* forceRefinementLengthIncrease specifies whether nodes should be expanded until only longer refinements are reached.
+* mandatory: false| reinit necessary: true
+* default value: null
+* @return boolean
+**/
+public boolean getForceRefinementLengthIncrease() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "forceRefinementLengthIncrease") ;
+}
+/**
+* negativeWeight Used to penalise errors on negative examples different from those of positive examples (lower = less importance for negatives)..
+* mandatory: false| reinit necessary: true
+* default value: 1.0
+* @return double
+**/
+public double getNegativeWeight() {
+return (Double) ComponentManager.getInstance().getConfigOptionValue(oCEL, "negativeWeight") ;
+}
+/**
+* startNodeBonus You can use this to give a heuristic bonus on the start node (= initially broader exploration of search space)..
+* mandatory: false| reinit necessary: true
+* default value: 0.0
+* @return double
+**/
+public double getStartNodeBonus() {
+return (Double) ComponentManager.getInstance().getConfigOptionValue(oCEL, "startNodeBonus") ;
+}
+/**
+* negationPenalty Penalty on negations (TODO: better explanation)..
+* mandatory: false| reinit necessary: true
+* default value: 0
+* @return int
+**/
+public int getNegationPenalty() {
+return (Integer) ComponentManager.getInstance().getConfigOptionValue(oCEL, "negationPenalty") ;
+}
+/**
+* expansionPenaltyFactor describes the reduction in heuristic score one is willing to accept for reducing the length of the concept by one.
+* mandatory: false| reinit necessary: true
+* default value: 0.02
+* @return double
+**/
+public double getExpansionPenaltyFactor() {
+return (Double) ComponentManager.getInstance().getConfigOptionValue(oCEL, "expansionPenaltyFactor") ;
+}
+/**
+* instanceBasedDisjoints Specifies whether to use real disjointness checks or instance based ones (no common instances) in the refinement operator..
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getInstanceBasedDisjoints() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(oCEL, "instanceBasedDisjoints") ;
+}
+
+/**
+* @param writeSearchTree specifies whether to write a search tree.
+* mandatory: false| reinit necessary: true
+* default value: false
+**/
+public void setWriteSearchTree(boolean writeSearchTree) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "writeSearchTree", writeSearchTree);
+reinitNecessary = true;
+}
+/**
+* @param searchTreeFile file to use for the search tree.
+* mandatory: false| reinit necessary: true
+* default value: log/searchTree.txt
+**/
+public void setSearchTreeFile(String searchTreeFile) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "searchTreeFile", searchTreeFile);
+reinitNecessary = true;
+}
+/**
+* @param replaceSearchTree specifies whether to replace the search tree in the log file after each run or append the new search tree.
+* mandatory: false| reinit necessary: true
+* default value: false
+**/
+public void setReplaceSearchTree(boolean replaceSearchTree) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "replaceSearchTree", replaceSearchTree);
+reinitNecessary = true;
+}
+/**
+* @param heuristic specifiy the heuristic to use.
+* mandatory: false| reinit necessary: true
+* default value: lexicographic
+**/
+public void setHeuristic(String heuristic) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "heuristic", heuristic);
+reinitNecessary = true;
+}
+/**
+* @param applyAllFilter usage of equivalence ALL R.C AND ALL R.D = ALL R.(C AND D).
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setApplyAllFilter(boolean applyAllFilter) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "applyAllFilter", applyAllFilter);
+reinitNecessary = true;
+}
+/**
+* @param applyExistsFilter usage of equivalence EXISTS R.C OR EXISTS R.D = EXISTS R.(C OR D).
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setApplyExistsFilter(boolean applyExistsFilter) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "applyExistsFilter", applyExistsFilter);
+reinitNecessary = true;
+}
+/**
+* @param useTooWeakList try to filter out too weak concepts without sending them to the reasoner.
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setUseTooWeakList(boolean useTooWeakList) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useTooWeakList", useTooWeakList);
+reinitNecessary = true;
+}
+/**
+* @param useOverlyGeneralList try to find overly general concept without sending them to the reasoner.
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setUseOverlyGeneralList(boolean useOverlyGeneralList) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useOverlyGeneralList", useOverlyGeneralList);
+reinitNecessary = true;
+}
+/**
+* @param useShortConceptConstruction shorten concept to see whether they already exist.
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setUseShortConceptConstruction(boolean useShortConceptConstruction) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useShortConceptConstruction", useShortConceptConstruction);
+reinitNecessary = true;
+}
+/**
+* @param horizontalExpansionFactor horizontal expansion factor (see publication for description).
+* mandatory: false| reinit necessary: true
+* default value: 0.6
+**/
+public void setHorizontalExpansionFactor(double horizontalExpansionFactor) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "horizontalExpansionFactor", horizontalExpansionFactor);
+reinitNecessary = true;
+}
+/**
+* @param improveSubsumptionHierarchy simplify subsumption hierarchy to reduce search space (see publication for description).
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setImproveSubsumptionHierarchy(boolean improveSubsumptionHierarchy) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "improveSubsumptionHierarchy", improveSubsumptionHierarchy);
+reinitNecessary = true;
+}
+/**
+* @param allowedConcepts concepts the algorithm is allowed to use.
+* mandatory: false| reinit necessary: true
+* default value: null
+**/
+public void setAllowedConcepts(Set<String> allowedConcepts) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "allowedConcepts", allowedConcepts);
+reinitNecessary = true;
+}
+/**
+* @param ignoredConcepts concepts the algorithm must ignore.
+* mandatory: false| reinit necessary: true
+* default value: null
+**/
+public void setIgnoredConcepts(Set<String> ignoredConcepts) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "ignoredConcepts", ignoredConcepts);
+reinitNecessary = true;
+}
+/**
+* @param allowedRoles roles the algorithm is allowed to use.
+* mandatory: false| reinit necessary: true
+* default value: null
+**/
+public void setAllowedRoles(Set<String> allowedRoles) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "allowedRoles", allowedRoles);
+reinitNecessary = true;
+}
+/**
+* @param ignoredRoles roles the algorithm must ignore.
+* mandatory: false| reinit necessary: true
+* default value: null
+**/
+public void setIgnoredRoles(Set<String> ignoredRoles) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "ignoredRoles", ignoredRoles);
+reinitNecessary = true;
+}
+/**
+* @param useAllConstructor specifies whether the universal concept constructor is used in the learning algorithm.
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setUseAllConstructor(boolean useAllConstructor) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useAllConstructor", useAllConstructor);
+reinitNecessary = true;
+}
+/**
+* @param useExistsConstructor specifies whether the existential concept constructor is used in the learning algorithm.
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setUseExistsConstructor(boolean useExistsConstructor) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useExistsConstructor", useExistsConstructor);
+reinitNecessary = true;
+}
+/**
+* @param useHasValueConstructor specifies whether the hasValue constructor is used in the learning algorithm.
+* mandatory: false| reinit necessary: true
+* default value: false
+**/
+public void setUseHasValueConstructor(boolean useHasValueConstructor) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useHasValueConstructor", useHasValueConstructor);
+reinitNecessary = true;
+}
+/**
+* @param useDataHasValueConstructor specifies whether the hasValue constructor is used in the learning algorithm in combination with data properties.
+* mandatory: false| reinit necessary: true
+* default value: false
+**/
+public void setUseDataHasValueConstructor(boolean useDataHasValueConstructor) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useDataHasValueConstructor", useDataHasValueConstructor);
+reinitNecessary = true;
+}
+/**
+* @param valueFrequencyThreshold specifies how often an object must occur as value in order to be considered for hasValue restrictions.
+* mandatory: false| reinit necessary: true
+* default value: 3
+**/
+public void setValueFrequencyThreshold(int valueFrequencyThreshold) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "valueFrequencyThreshold", valueFrequencyThreshold);
+reinitNecessary = true;
+}
+/**
+* @param useCardinalityRestrictions specifies whether CardinalityRestrictions is used in the learning algorithm.
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setUseCardinalityRestrictions(boolean useCardinalityRestrictions) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useCardinalityRestrictions", useCardinalityRestrictions);
+reinitNecessary = true;
+}
+/**
+* @param cardinalityLimit Gives the maximum number used in cardinality restrictions..
+* mandatory: false| reinit necessary: true
+* default value: 5
+**/
+public void setCardinalityLimit(int cardinalityLimit) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "cardinalityLimit", cardinalityLimit);
+reinitNecessary = true;
+}
+/**
+* @param useNegation specifies whether negation is used in the learning algorothm.
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setUseNegation(boolean useNegation) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useNegation", useNegation);
+reinitNecessary = true;
+}
+/**
+* @param useBooleanDatatypes specifies whether boolean datatypes are used in the learning algorothm.
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setUseBooleanDatatypes(boolean useBooleanDatatypes) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useBooleanDatatypes", useBooleanDatatypes);
+reinitNecessary = true;
+}
+/**
+* @param useDoubleDatatypes specifies whether boolean datatypes are used in the learning algorothm.
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setUseDoubleDatatypes(boolean useDoubleDatatypes) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useDoubleDatatypes", useDoubleDatatypes);
+reinitNecessary = true;
+}
+/**
+* @param useStringDatatypes specifies whether string datatypes are used in the learning algorothm.
+* mandatory: false| reinit necessary: true
+* default value: false
+**/
+public void setUseStringDatatypes(boolean useStringDatatypes) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "useStringDatatypes", useStringDatatypes);
+reinitNecessary = true;
+}
+/**
+* @param maxExecutionTimeInSeconds algorithm will stop after specified seconds.
+* mandatory: false| reinit necessary: true
+* default value: 0
+**/
+public void setMaxExecutionTimeInSeconds(int maxExecutionTimeInSeconds) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "maxExecutionTimeInSeconds", maxExecutionTimeInSeconds);
+reinitNecessary = true;
+}
+/**
+* @param minExecutionTimeInSeconds algorithm will run at least specified seconds.
+* mandatory: false| reinit necessary: true
+* default value: 0
+**/
+public void setMinExecutionTimeInSeconds(int minExecutionTimeInSeconds) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "minExecutionTimeInSeconds", minExecutionTimeInSeconds);
+reinitNecessary = true;
+}
+/**
+* @param guaranteeXgoodDescriptions algorithm will run until X good (100%) concept descritpions are found.
+* mandatory: false| reinit necessary: true
+* default value: 1
+**/
+public void setGuaranteeXgoodDescriptions(int guaranteeXgoodDescriptions) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "guaranteeXgoodDescriptions", guaranteeXgoodDescriptions);
+reinitNecessary = true;
+}
+/**
+* @param maxClassDescriptionTests The maximum number of candidate hypothesis the algorithm is allowed to test (0 = no limit). The algorithm will stop afterwards. (The real number of tests can be slightly higher, because this criterion usually won't be checked after each single test.).
+* mandatory: false| reinit necessary: true
+* default value: 0
+**/
+public void setMaxClassDescriptionTests(int maxClassDescriptionTests) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "maxClassDescriptionTests", maxClassDescriptionTests);
+reinitNecessary = true;
+}
+/**
+* @param logLevel determines the logLevel for this component, can be {TRACE, DEBUG, INFO}.
+* mandatory: false| reinit necessary: true
+* default value: DEBUG
+**/
+public void setLogLevel(String logLevel) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "logLevel", logLevel);
+reinitNecessary = true;
+}
+/**
+* @param usePropernessChecks specifies whether to check for equivalence (i.e. discard equivalent refinements).
+* mandatory: false| reinit necessary: true
+* default value: false
+**/
+public void setUsePropernessChecks(boolean usePropernessChecks) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "usePropernessChecks", usePropernessChecks);
+reinitNecessary = true;
+}
+/**
+* @param noisePercentage the (approximated) percentage of noise within the examples.
+* mandatory: false| reinit necessary: true
+* default value: 0.0
+**/
+public void setNoisePercentage(double noisePercentage) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "noisePercentage", noisePercentage);
+reinitNecessary = true;
+}
+/**
+* @param terminateOnNoiseReached specifies whether to terminate when noise criterion is met.
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setTerminateOnNoiseReached(boolean terminateOnNoiseReached) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "terminateOnNoiseReached", terminateOnNoiseReached);
+reinitNecessary = true;
+}
+/**
+* @param startClass the named class which should be used to start the algorithm (GUI: needs a widget for selecting a class).
+* mandatory: false| reinit necessary: true
+* default value: null
+**/
+public void setStartClass(String startClass) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "startClass", startClass);
+reinitNecessary = true;
+}
+/**
+* @param forceRefinementLengthIncrease specifies whether nodes should be expanded until only longer refinements are reached.
+* mandatory: false| reinit necessary: true
+* default value: null
+**/
+public void setForceRefinementLengthIncrease(boolean forceRefinementLengthIncrease) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "forceRefinementLengthIncrease", forceRefinementLengthIncrease);
+reinitNecessary = true;
+}
+/**
+* @param negativeWeight Used to penalise errors on negative examples different from those of positive examples (lower = less importance for negatives)..
+* mandatory: false| reinit necessary: true
+* default value: 1.0
+**/
+public void setNegativeWeight(double negativeWeight) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "negativeWeight", negativeWeight);
+reinitNecessary = true;
+}
+/**
+* @param startNodeBonus You can use this to give a heuristic bonus on the start node (= initially broader exploration of search space)..
+* mandatory: false| reinit necessary: true
+* default value: 0.0
+**/
+public void setStartNodeBonus(double startNodeBonus) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "startNodeBonus", startNodeBonus);
+reinitNecessary = true;
+}
+/**
+* @param negationPenalty Penalty on negations (TODO: better explanation)..
+* mandatory: false| reinit necessary: true
+* default value: 0
+**/
+public void setNegationPenalty(int negationPenalty) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "negationPenalty", negationPenalty);
+reinitNecessary = true;
+}
+/**
+* @param expansionPenaltyFactor describes the reduction in heuristic score one is willing to accept for reducing the length of the concept by one.
+* mandatory: false| reinit necessary: true
+* default value: 0.02
+**/
+public void setExpansionPenaltyFactor(double expansionPenaltyFactor) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "expansionPenaltyFactor", expansionPenaltyFactor);
+reinitNecessary = true;
+}
+/**
+* @param instanceBasedDisjoints Specifies whether to use real disjointness checks or instance based ones (no common instances) in the refinement operator..
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setInstanceBasedDisjoints(boolean instanceBasedDisjoints) {
+ComponentManager.getInstance().applyConfigEntry(oCEL, "instanceBasedDisjoints", instanceBasedDisjoints);
+reinitNecessary = true;
+}
+
+/**
+* true, if this component needs reinitializsation.
+* @return boolean
+**/
+public boolean isReinitNecessary(){
+return reinitNecessary;
+}
+
+
+}
Deleted: trunk/components-core/src/main/java/org/dllearner/core/configurators/ROLComponent2Configurator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/configurators/ROLComponent2Configurator.java 2010-11-22 15:04:09 UTC (rev 2461)
+++ trunk/components-core/src/main/java/org/dllearner/core/configurators/ROLComponent2Configurator.java 2010-11-23 13:02:18 UTC (rev 2462)
@@ -1,813 +0,0 @@
-/**
- * Copyright (C) 2007-2008, 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.core.configurators;
-
-import java.util.Set;
-
-import org.dllearner.algorithms.ocel.OCEL;
-import org.dllearner.core.ComponentManager;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.LearningProblemUnsupportedException;
-import org.dllearner.core.ReasonerComponent;
-import org.dllearner.core.configurators.RefinementOperatorConfigurator;
-
-/**
-* automatically generated, do not edit manually.
-* run org.dllearner.scripts.ConfigJavaGenerator to update
-**/
-@SuppressWarnings("all")
-public class ROLComponent2Configurator extends RefinementOperatorConfigurator implements Configurator {
-
-private boolean reinitNecessary = false;
-private OCEL rOLComponent2;
-
-/**
-* @param rOLComponent2 see ROLComponent2
-**/
-public ROLComponent2Configurator(OCEL rOLComponent2){
-this.rOLComponent2 = rOLComponent2;
-}
-
-/**
-* @param reasoningService see reasoningService
-* @param learningProblem see learningProblem
-* @throws LearningProblemUnsupportedException see
-* @return ROLComponent2
-**/
-public static OCEL getROLComponent2(LearningProblem learningProblem, ReasonerComponent reasoningService) throws LearningProblemUnsupportedException{
-OCEL component = ComponentManager.getInstance().learningAlgorithm(OCEL.class, learningProblem, reasoningService);
-return component;
-}
-
-/**
-* writeSearchTree specifies whether to write a search tree.
-* mandatory: false| reinit necessary: true
-* default value: false
-* @return boolean
-**/
-public boolean getWriteSearchTree() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "writeSearchTree") ;
-}
-/**
-* searchTreeFile file to use for the search tree.
-* mandatory: false| reinit necessary: true
-* default value: log/searchTree.txt
-* @return String
-**/
-public String getSearchTreeFile() {
-return (String) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "searchTreeFile") ;
-}
-/**
-* replaceSearchTree specifies whether to replace the search tree in the log file after each run or append the new search tree.
-* mandatory: false| reinit necessary: true
-* default value: false
-* @return boolean
-**/
-public boolean getReplaceSearchTree() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "replaceSearchTree") ;
-}
-/**
-* heuristic specifiy the heuristic to use.
-* mandatory: false| reinit necessary: true
-* default value: lexicographic
-* @return String
-**/
-public String getHeuristic() {
-return (String) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "heuristic") ;
-}
-/**
-* applyAllFilter usage of equivalence ALL R.C AND ALL R.D = ALL R.(C AND D).
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getApplyAllFilter() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "applyAllFilter") ;
-}
-/**
-* applyExistsFilter usage of equivalence EXISTS R.C OR EXISTS R.D = EXISTS R.(C OR D).
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getApplyExistsFilter() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "applyExistsFilter") ;
-}
-/**
-* useTooWeakList try to filter out too weak concepts without sending them to the reasoner.
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getUseTooWeakList() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useTooWeakList") ;
-}
-/**
-* useOverlyGeneralList try to find overly general concept without sending them to the reasoner.
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getUseOverlyGeneralList() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useOverlyGeneralList") ;
-}
-/**
-* useShortConceptConstruction shorten concept to see whether they already exist.
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getUseShortConceptConstruction() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useShortConceptConstruction") ;
-}
-/**
-* horizontalExpansionFactor horizontal expansion factor (see publication for description).
-* mandatory: false| reinit necessary: true
-* default value: 0.6
-* @return double
-**/
-public double getHorizontalExpansionFactor() {
-return (Double) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "horizontalExpansionFactor") ;
-}
-/**
-* improveSubsumptionHierarchy simplify subsumption hierarchy to reduce search space (see publication for description).
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getImproveSubsumptionHierarchy() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "improveSubsumptionHierarchy") ;
-}
-/**
-* allowedConcepts concepts the algorithm is allowed to use.
-* mandatory: false| reinit necessary: true
-* default value: null
-* @return Set(String)
-**/
-@SuppressWarnings("unchecked")
-public Set<String> getAllowedConcepts() {
-return (Set<String>) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "allowedConcepts") ;
-}
-/**
-* ignoredConcepts concepts the algorithm must ignore.
-* mandatory: false| reinit necessary: true
-* default value: null
-* @return Set(String)
-**/
-@SuppressWarnings("unchecked")
-public Set<String> getIgnoredConcepts() {
-return (Set<String>) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "ignoredConcepts") ;
-}
-/**
-* allowedRoles roles the algorithm is allowed to use.
-* mandatory: false| reinit necessary: true
-* default value: null
-* @return Set(String)
-**/
-@SuppressWarnings("unchecked")
-public Set<String> getAllowedRoles() {
-return (Set<String>) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "allowedRoles") ;
-}
-/**
-* ignoredRoles roles the algorithm must ignore.
-* mandatory: false| reinit necessary: true
-* default value: null
-* @return Set(String)
-**/
-@SuppressWarnings("unchecked")
-public Set<String> getIgnoredRoles() {
-return (Set<String>) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "ignoredRoles") ;
-}
-/**
-* useAllConstructor specifies whether the universal concept constructor is used in the learning algorithm.
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getUseAllConstructor() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useAllConstructor") ;
-}
-/**
-* useExistsConstructor specifies whether the existential concept constructor is used in the learning algorithm.
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getUseExistsConstructor() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useExistsConstructor") ;
-}
-/**
-* useHasValueConstructor specifies whether the hasValue constructor is used in the learning algorithm.
-* mandatory: false| reinit necessary: true
-* default value: false
-* @return boolean
-**/
-public boolean getUseHasValueConstructor() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useHasValueConstructor") ;
-}
-/**
-* useDataHasValueConstructor specifies whether the hasValue constructor is used in the learning algorithm in combination with data properties.
-* mandatory: false| reinit necessary: true
-* default value: false
-* @return boolean
-**/
-public boolean getUseDataHasValueConstructor() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useDataHasValueConstructor") ;
-}
-/**
-* valueFrequencyThreshold specifies how often an object must occur as value in order to be considered for hasValue restrictions.
-* mandatory: false| reinit necessary: true
-* default value: 3
-* @return int
-**/
-public int getValueFrequencyThreshold() {
-return (Integer) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "valueFrequencyThreshold") ;
-}
-/**
-* useCardinalityRestrictions specifies whether CardinalityRestrictions is used in the learning algorithm.
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getUseCardinalityRestrictions() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useCardinalityRestrictions") ;
-}
-/**
-* cardinalityLimit Gives the maximum number used in cardinality restrictions..
-* mandatory: false| reinit necessary: true
-* default value: 5
-* @return int
-**/
-public int getCardinalityLimit() {
-return (Integer) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "cardinalityLimit") ;
-}
-/**
-* useNegation specifies whether negation is used in the learning algorothm.
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getUseNegation() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useNegation") ;
-}
-/**
-* useBooleanDatatypes specifies whether boolean datatypes are used in the learning algorothm.
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getUseBooleanDatatypes() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useBooleanDatatypes") ;
-}
-/**
-* useDoubleDatatypes specifies whether boolean datatypes are used in the learning algorothm.
-* mandatory: false| reinit necessary: true
-* default value: true
-* @return boolean
-**/
-public boolean getUseDoubleDatatypes() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useDoubleDatatypes") ;
-}
-/**
-* useStringDatatypes specifies whether string datatypes are used in the learning algorothm.
-* mandatory: false| reinit necessary: true
-* default value: false
-* @return boolean
-**/
-public boolean getUseStringDatatypes() {
-return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "useStringDatatypes") ;
-}
-/**
-* maxExecutionTimeInSeconds algorithm will stop after specified seconds.
-* mandatory: false| reinit necessary: true
-* default value: 0
-* @return int
-**/
-public int getMaxExecutionTimeInSeconds() {
-return (Integer) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "maxExecutionTimeInSeconds") ;
-}
-/**
-* minExecutionTimeInSeconds algorithm will run at least specified seconds.
-* mandatory: false| reinit necessary: true
-* default value: 0
-* @return int
-**/
-public int getMinExecutionTimeInSeconds() {
-return (Integer) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "minExecutionTimeInSeconds") ;
-}
-/**
-* guaranteeXgoodDescriptions algorithm will run until X good (100%) concept descr...
[truncated message content] |
|
From: <lor...@us...> - 2010-11-27 12:51:54
|
Revision: 2484
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2484&view=rev
Author: lorenz_b
Date: 2010-11-27 12:51:47 +0000 (Sat, 27 Nov 2010)
Log Message:
-----------
Updated pom files.
Made some changes in AutoSPARLQ to navigate between home-view and query-creation-view.
Modified Paths:
--------------
trunk/autosparql/pom.xml
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/Application.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/ApplicationController.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ExamplesPanel.java
trunk/pom.xml
Added Paths:
-----------
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/HomeController.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/QueryController.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/HomeView.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/QueryView.java
Modified: trunk/autosparql/pom.xml
===================================================================
--- trunk/autosparql/pom.xml 2010-11-25 17:22:53 UTC (rev 2483)
+++ trunk/autosparql/pom.xml 2010-11-27 12:51:47 UTC (rev 2484)
@@ -78,9 +78,6 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.13</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/Application.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/Application.java 2010-11-25 17:22:53 UTC (rev 2483)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/Application.java 2010-11-27 12:51:47 UTC (rev 2484)
@@ -1,6 +1,8 @@
package org.dllearner.autosparql.client;
import org.dllearner.autosparql.client.controller.ApplicationController;
+import org.dllearner.autosparql.client.controller.HomeController;
+import org.dllearner.autosparql.client.controller.QueryController;
import org.dllearner.autosparql.client.controller.SearchController;
import com.extjs.gxt.ui.client.GXT;
@@ -20,6 +22,8 @@
public class Application
implements EntryPoint, ValueChangeHandler<String>
{
+
+ public static final String SERVICE = "sparqlservice";
/**
* This is the entry point method.
@@ -30,18 +34,20 @@
Dispatcher dispatcher = Dispatcher.get();
dispatcher.addController(new ApplicationController());
-// dispatcher.addController(new SearchController());
+ dispatcher.addController(new HomeController());
+ dispatcher.addController(new QueryController());
- String initToken = History.getToken();
- if(initToken.isEmpty()){
- History.newItem(HistoryTokens.HOME);
- }
+// String initToken = History.getToken();
+// if(initToken.isEmpty()){
+// History.newItem(HistoryTokens.HOME);
+// }
+
History.addValueChangeHandler(this);
- History.fireCurrentHistoryState();
+// History.fireCurrentHistoryState();
-// Dispatcher.forwardEvent(AppEvents.Init);
+ Dispatcher.forwardEvent(AppEvents.Init);
GXT.hideLoadingPanel("loading");
@@ -55,7 +61,7 @@
if(historyToken.equals(HistoryTokens.HOME)){
Dispatcher.forwardEvent(AppEvents.NavHome);
} else if(historyToken.equals(HistoryTokens.QUERY)){
- Dispatcher.forwardEvent(AppEvents.Init);
+ Dispatcher.forwardEvent(AppEvents.NavQuery);
}
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/ApplicationController.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/ApplicationController.java 2010-11-25 17:22:53 UTC (rev 2483)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/ApplicationController.java 2010-11-27 12:51:47 UTC (rev 2484)
@@ -1,60 +1,43 @@
package org.dllearner.autosparql.client.controller;
import org.dllearner.autosparql.client.AppEvents;
+import org.dllearner.autosparql.client.HistoryTokens;
import org.dllearner.autosparql.client.view.ApplicationView;
import com.extjs.gxt.ui.client.event.EventType;
import com.extjs.gxt.ui.client.mvc.AppEvent;
import com.extjs.gxt.ui.client.mvc.Controller;
+import com.extjs.gxt.ui.client.mvc.Dispatcher;
public class ApplicationController extends Controller {
-
+
private ApplicationView appView;
-
- public ApplicationController(){
+
+ public ApplicationController() {
registerEventTypes(AppEvents.Init);
registerEventTypes(AppEvents.Error);
- registerEventTypes(AppEvents.AddPosExample);
- registerEventTypes(AppEvents.AddNegExample);
- registerEventTypes(AppEvents.AddExample);
- registerEventTypes(AppEvents.ShowInteractiveMode);
- registerEventTypes(AppEvents.UpdateResultTable);
}
- @Override
public void handleEvent(AppEvent event) {
EventType type = event.getType();
-
if (type == AppEvents.Init) {
onInit(event);
} else if (type == AppEvents.Error) {
onError(event);
- } else if(type == AppEvents.AddPosExample){
- forwardToView(appView, event);
- } else if(type == AppEvents.AddPosExample){
- forwardToView(appView, event);
- }else if(type == AppEvents.AddExample){
- forwardToView(appView, event);
- } else if(type == AppEvents.RemoveExample){
- forwardToView(appView, event);
- } else if(type == AppEvents.ShowInteractiveMode){
- forwardToView(appView, event);
- } else if(type == AppEvents.UpdateResultTable){
- forwardToView(appView, event);
}
}
-
- @Override
- protected void initialize() {
+
+ public void initialize() {
appView = new ApplicationView(this);
}
-
+
protected void onError(AppEvent ae) {
System.out.println("error: " + ae.<Object> getData());
}
private void onInit(AppEvent event) {
forwardToView(appView, event);
+ Dispatcher.forwardEvent(new AppEvent(AppEvents.NavHome, null, HistoryTokens.HOME));
}
}
Added: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/HomeController.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/HomeController.java (rev 0)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/HomeController.java 2010-11-27 12:51:47 UTC (rev 2484)
@@ -0,0 +1,36 @@
+package org.dllearner.autosparql.client.controller;
+
+import org.dllearner.autosparql.client.AppEvents;
+import org.dllearner.autosparql.client.view.HomeView;
+
+import com.extjs.gxt.ui.client.event.EventType;
+import com.extjs.gxt.ui.client.mvc.AppEvent;
+import com.extjs.gxt.ui.client.mvc.Controller;
+
+public class HomeController extends Controller {
+
+ private HomeView homeView;
+
+ public HomeController(){
+ registerEventTypes(AppEvents.NavHome);
+ }
+
+ @Override
+ public void handleEvent(AppEvent event) {
+ EventType type = event.getType();
+
+ if (type == AppEvents.NavHome) {
+ forwardToView(homeView, event);
+ }
+ }
+
+ @Override
+ protected void initialize() {
+ homeView = new HomeView(this);
+ }
+
+ protected void onError(AppEvent ae) {
+ System.out.println("error: " + ae.<Object> getData());
+ }
+
+}
Added: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/QueryController.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/QueryController.java (rev 0)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/controller/QueryController.java 2010-11-27 12:51:47 UTC (rev 2484)
@@ -0,0 +1,50 @@
+package org.dllearner.autosparql.client.controller;
+
+import org.dllearner.autosparql.client.AppEvents;
+import org.dllearner.autosparql.client.view.ApplicationView;
+import org.dllearner.autosparql.client.view.QueryView;
+
+import com.extjs.gxt.ui.client.event.EventType;
+import com.extjs.gxt.ui.client.mvc.AppEvent;
+import com.extjs.gxt.ui.client.mvc.Controller;
+
+public class QueryController extends Controller {
+
+ private QueryView queryView;
+
+ public QueryController(){
+ registerEventTypes(AppEvents.NavQuery);
+ registerEventTypes(AppEvents.AddPosExample);
+ registerEventTypes(AppEvents.AddNegExample);
+ registerEventTypes(AppEvents.AddExample);
+ registerEventTypes(AppEvents.ShowInteractiveMode);
+ registerEventTypes(AppEvents.UpdateResultTable);
+ }
+
+ @Override
+ public void handleEvent(AppEvent event) {
+ EventType type = event.getType();
+
+ if (type == AppEvents.NavQuery) {
+ forwardToView(queryView, event);
+ } else if(type == AppEvents.AddPosExample){
+ forwardToView(queryView, event);
+ } else if(type == AppEvents.AddPosExample){
+ forwardToView(queryView, event);
+ }else if(type == AppEvents.AddExample){
+ forwardToView(queryView, event);
+ } else if(type == AppEvents.RemoveExample){
+ forwardToView(queryView, event);
+ } else if(type == AppEvents.ShowInteractiveMode){
+ forwardToView(queryView, event);
+ } else if(type == AppEvents.UpdateResultTable){
+ forwardToView(queryView, event);
+ }
+ }
+
+ @Override
+ protected void initialize() {
+ queryView = new QueryView(this);
+ }
+
+}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-11-25 17:22:53 UTC (rev 2483)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/ApplicationView.java 2010-11-27 12:51:47 UTC (rev 2484)
@@ -1,329 +1,101 @@
package org.dllearner.autosparql.client.view;
-import java.util.List;
-
import org.dllearner.autosparql.client.AppEvents;
-import org.dllearner.autosparql.client.SPARQLService;
-import org.dllearner.autosparql.client.exception.SPARQLQueryException;
-import org.dllearner.autosparql.client.model.Endpoint;
-import org.dllearner.autosparql.client.model.Example;
-import org.dllearner.autosparql.client.widget.ExamplesPanel;
-import org.dllearner.autosparql.client.widget.InfoPanel;
-import org.dllearner.autosparql.client.widget.InteractivePanel;
-import org.dllearner.autosparql.client.widget.ResultPanel;
-import org.dllearner.autosparql.client.widget.SearchPanel;
import com.extjs.gxt.ui.client.Registry;
import com.extjs.gxt.ui.client.Style.LayoutRegion;
import com.extjs.gxt.ui.client.Style.Orientation;
-import com.extjs.gxt.ui.client.event.Listener;
-import com.extjs.gxt.ui.client.event.MessageBoxEvent;
-import com.extjs.gxt.ui.client.event.SelectionChangedEvent;
-import com.extjs.gxt.ui.client.event.SelectionChangedListener;
import com.extjs.gxt.ui.client.mvc.AppEvent;
import com.extjs.gxt.ui.client.mvc.Controller;
import com.extjs.gxt.ui.client.mvc.View;
-import com.extjs.gxt.ui.client.store.ListStore;
import com.extjs.gxt.ui.client.util.Margins;
import com.extjs.gxt.ui.client.widget.HtmlContainer;
import com.extjs.gxt.ui.client.widget.LayoutContainer;
-import com.extjs.gxt.ui.client.widget.MessageBox;
import com.extjs.gxt.ui.client.widget.Viewport;
-import com.extjs.gxt.ui.client.widget.button.Button;
-import com.extjs.gxt.ui.client.widget.form.ComboBox;
import com.extjs.gxt.ui.client.widget.layout.BorderLayout;
import com.extjs.gxt.ui.client.widget.layout.BorderLayoutData;
import com.extjs.gxt.ui.client.widget.layout.FitLayout;
-import com.extjs.gxt.ui.client.widget.layout.RowData;
import com.extjs.gxt.ui.client.widget.layout.RowLayout;
-import com.extjs.gxt.ui.client.widget.tips.QuickTip;
-import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.RootPanel;
public class ApplicationView extends View {
- public static final String SEARCH_PANEL = "searchpanel";
- public static final String HEADER_PANEL = "headerpanel";
- public static final String VIEWPORT = "viewport";
- private Viewport viewport;
-
- private SearchPanel searchPanel;
- private ExamplesPanel examplesPanel;
- private InteractivePanel interactivePanel;
- private ResultPanel resultPanel;
- private InfoPanel infoPanel;
-
- private LayoutContainer dummyPanel;
-
- public ApplicationView(Controller controller) {
- super(controller);
- }
-
- @Override
- protected void initialize() {
- // TODO Auto-generated method stub
- super.initialize();
- }
-
- private void initUI() {
+ public static final String WEST_PANEL = "west";
+ public static final String VIEWPORT = "viewport";
+ public static final String CENTER_PANEL = "center";
+
+ private Viewport viewport;
+ private LayoutContainer center;
+
+ public ApplicationView(Controller controller) {
+ super(controller);
+ }
+
+ protected void initialize() {
+// LoginDialog dialog = new LoginDialog();
+// dialog.setClosable(false);
+// dialog.addListener(Events.Hide, new Listener<WindowEvent>() {
+// public void handleEvent(WindowEvent be) {
+// Dispatcher.forwardEvent(AppEvents.Init);
+// }
+// });
+// dialog.show();
+ super.initialize();
+ }
+
+ private void initUI() {System.out.println("init ApplicationView");
viewport = new Viewport();
viewport.setLayout(new BorderLayout());
-
- createHeaderPanel();
-
-// Portal mainPanel = new Portal(2);
-// mainPanel.setColumnWidth(0, 0.33);
-// mainPanel.setColumnWidth(1, 0.67);
-// BorderLayoutData data = new BorderLayoutData(LayoutRegion.CENTER);
-// data.setMargins(new Margins(5, 5, 5, 0));
-// viewport.add(mainPanel, data);
-//
-// dummyPanel = new Portlet(new FitLayout());
-// dummyPanel.setHeaderVisible(false);
-// dummyPanel.setBorders(false);
-// dummyPanel.setHeight(150);
-// mainPanel.add(dummyPanel, 0);
-//
-// infoPanel = new InfoPanel();
-// dummyPanel.add(infoPanel);
-//
-// interactivePanel = new InteractivePanel();
-//
-// searchPanel = new SearchPanel();
-// searchPanel.setHeight(550);
-// mainPanel.add(searchPanel, 0);
-//
-// examplesPanel = new ExamplesPanel();
-// examplesPanel.setHeight(350);
-// mainPanel.add(examplesPanel, 1);
-//
-// resultPanel = new ResultPanel();
-// resultPanel.setHeight(350);
-// mainPanel.add(resultPanel, 1);
-
- LayoutContainer mainPanel = new LayoutContainer(new RowLayout(Orientation.HORIZONTAL));
- BorderLayoutData data = new BorderLayoutData(LayoutRegion.CENTER);
- data.setMargins(new Margins(5, 5, 5, 0));
- viewport.add(mainPanel, data);
-
- LayoutContainer vPanel = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
- mainPanel.add(vPanel, new RowData(0.3, 1, new Margins(0, 5, 0, 0)));
-
- vPanel.add(createEndpointSelector(), new RowData(-1, -1, new Margins(0, 0, 10, 0)));
-
- dummyPanel = new LayoutContainer(new FitLayout());
- vPanel.add(dummyPanel, new RowData(1, 0.2, new Margins(0, 0, 10, 0)));
-
- infoPanel = new InfoPanel();
- dummyPanel.add(infoPanel);
-
- interactivePanel = new InteractivePanel();
-
- searchPanel = new SearchPanel();
- vPanel.add(searchPanel, new RowData(1, 0.8, new Margins(5, 0, 0, 0)));
-
- vPanel = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
- mainPanel.add(vPanel, new RowData(0.7, 1, new Margins(0, 0, 0, 5)));
-
- resultPanel = new ResultPanel();
- vPanel.add(resultPanel, new RowData(1, 0.5, new Margins(10, 0, 0, 0)));
-
- examplesPanel = new ExamplesPanel();
- vPanel.add(examplesPanel, new RowData(1, 0.5, new Margins(0, 0, 5, 0)));
-//
+
+ createNorth();
+ createCenter();
+
// registry serves as a global context
Registry.register(VIEWPORT, viewport);
- Registry.register(SEARCH_PANEL, searchPanel);
+ Registry.register(CENTER_PANEL, center);
RootPanel.get().add(viewport);
}
-
- private void createSearchPanel(){
- searchPanel = new SearchPanel();
- viewport.add(searchPanel);
- }
-
- private void createExamplesPanel(){
- examplesPanel = new ExamplesPanel();
- viewport.add(examplesPanel);
- }
-
- private void createInteractiveAndResultPanel(){
- LayoutContainer c = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
- interactivePanel = new InteractivePanel();
- c.add(interactivePanel);
-
- resultPanel = new ResultPanel();
- c.add(resultPanel);
-
- viewport.add(c);
- }
-
- private void createHeaderPanel(){
- LayoutContainer c = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
+
+ private void createNorth() {
+ LayoutContainer c = new LayoutContainer(new RowLayout(
+ Orientation.VERTICAL));
StringBuffer sb = new StringBuffer();
- sb.append("<div id='demo-theme'></div><div id=demo-title>AutoSPARQL</div>");
+ sb.append("<div id='demo-theme'></div><div id=demo-title>AutoSPARQL</div>");
- HtmlContainer headerPanel = new HtmlContainer(sb.toString());
- headerPanel.setStateful(false);
- headerPanel.setId("demo-header");
- headerPanel.addStyleName("x-small-editor");
-
- final Image logo = new Image("dl-learner_logo.gif");
- logo.setHeight("30px");
- headerPanel.add(logo, "#demo-theme");
-
- c.add(headerPanel);
- c.add(createEndpointSelector());
+ HtmlContainer headerPanel = new HtmlContainer(sb.toString());
+ headerPanel.setStateful(false);
+ headerPanel.setId("demo-header");
+ headerPanel.addStyleName("x-small-editor");
- BorderLayoutData data = new BorderLayoutData(LayoutRegion.NORTH, 33);
- data.setMargins(new Margins());
- viewport.add(c, data);
-
- Registry.register(HEADER_PANEL, headerPanel);
- }
-
- private ComboBox<Endpoint> createEndpointSelector(){
- final ListStore<Endpoint> endpoints = new ListStore<Endpoint>();
- SPARQLService.Util.getInstance().getEndpoints(new AsyncCallback<List<Endpoint>>() {
+ final Image logo = new Image("dl-learner_logo.gif");
+ logo.setHeight("30px");
+ headerPanel.add(logo, "#demo-theme");
- @Override
- public void onFailure(Throwable caught) {
-
- }
+ c.add(headerPanel);
- @Override
- public void onSuccess(List<Endpoint> result) {
- endpoints.add(result);
-
- }
-
- });
-
- ComboBox<Endpoint> combo = new ComboBox<Endpoint>();
- combo.setEditable(false);
- combo.setEmptyText("Select an endpoint...");
- combo.setDisplayField("label");
- combo.setWidth(150);
- combo.setStore(endpoints);
- combo.setTypeAhead(true);
- combo.addSelectionChangedListener(new SelectionChangedListener<Endpoint>() {
- @Override
- public void selectionChanged(SelectionChangedEvent<Endpoint> se) {
- SPARQLService.Util.getInstance().setEndpoint(se.getSelectedItem(), new AsyncCallback<Void>() {
- @Override
- public void onFailure(Throwable caught) {
- }
- @Override
- public void onSuccess(Void result) {
- }
- });
- }
- });
-
- return combo;
+ BorderLayoutData data = new BorderLayoutData(LayoutRegion.NORTH, 33);
+ data.setMargins(new Margins());
+ viewport.add(c, data);
+
}
-
- private void createResultPanel(){
- resultPanel = new ResultPanel();
- viewport.add(resultPanel);
- }
-
- @Override
- protected void handleEvent(AppEvent event) {
- if (event.getType() == AppEvents.Init) {
- initUI();
- } else if(event.getType() == AppEvents.AddPosExample){
- examplesPanel.addPositiveExample((Example) event.getData());
- if(examplesPanel.getPositiveExamples().size() == 1 && examplesPanel.getNegativeExamples().isEmpty()){
- askForSwitchingToInteractiveMode();
- SPARQLService.Util.getInstance().getSimilarExample(
- examplesPanel.getPositiveExamplesURIs(),
- examplesPanel.getNegativeExamplesUris(), new AsyncCallback<Example>() {
-
- @Override
- public void onSuccess(Example result) {
- interactivePanel.setExample(result);
- }
-
- @Override
- public void onFailure(Throwable caught) {
- // TODO Auto-generated method stub
-
- }
- });
- }
- } else if(event.getType() == AppEvents.AddExample){
- Example example = event.getData("example");
- if(event.getData("type") == Example.Type.POSITIVE){
- examplesPanel.addPositiveExample(example);
- } else {
- examplesPanel.addNegativeExample(example);
- }
- if (!examplesPanel.getPositiveExamplesURIs().isEmpty()) {
- interactivePanel.mask("Searching...");
- SPARQLService.Util.getInstance().getSimilarExample(
- examplesPanel.getPositiveExamplesURIs(),
- examplesPanel.getNegativeExamplesUris(),
- new AsyncCallback<Example>() {
- @Override
- public void onSuccess(Example result) {
- interactivePanel.unmask();
- interactivePanel.setExample(result);
- resultPanel.refresh(examplesPanel.getPositiveExamplesURIs(),
- examplesPanel.getNegativeExamplesUris());
- }
+ private void createCenter() {
+ center = new LayoutContainer();
+ center.setLayout(new FitLayout());
- @Override
- public void onFailure(Throwable caught) {
- String details = caught.getMessage();
- if (caught instanceof SPARQLQueryException) {
- details = "An error occured while sending the following query:\n"
- + ((SPARQLQueryException) caught)
- .getQuery();
- }
- MessageBox.alert("Error", details, null);
+ BorderLayoutData data = new BorderLayoutData(LayoutRegion.CENTER);
+ data.setMargins(new Margins(5, 5, 5, 5));
- }
- });
- }
-
- } else if(event.getType() == AppEvents.AddNegExample){
- examplesPanel.addNegativeExample((Example) event.getData());
- } else if(event.getType() == AppEvents.RemoveExample){
-
- } else if(event.getType() == AppEvents.ShowInteractiveMode){
- showInteractivePanel();
- } else if(event.getType() == AppEvents.UpdateResultTable){
- resultPanel.refresh(examplesPanel.getPositiveExamplesURIs(), examplesPanel.getNegativeExamplesUris());
- }
- }
-
- private void askForSwitchingToInteractiveMode(){
- MessageBox.confirm("Switch to interactive mode?",
- "You have added one example which should belong to the query result. Do you want to switch to the interactive" +
- "learning mode now?", new Listener<MessageBoxEvent>() {
-
- @Override
- public void handleEvent(MessageBoxEvent be) {
- Button b = be.getButtonClicked();
- if(b.getText().equals("Yes")){
- interactivePanel.expand();
- interactivePanel.focus();
- } else {
- searchPanel.setFocus();
- }
- }
- });
- }
-
- private void showInteractivePanel(){
- dummyPanel.remove(infoPanel);
- dummyPanel.add(interactivePanel);
- dummyPanel.layout();
- }
+ viewport.add(center, data);
+ }
+ protected void handleEvent(AppEvent event) {
+ if (event.getType() == AppEvents.Init) {
+ initUI();
+ }
+ }
+
}
Added: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/HomeView.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/HomeView.java (rev 0)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/HomeView.java 2010-11-27 12:51:47 UTC (rev 2484)
@@ -0,0 +1,110 @@
+package org.dllearner.autosparql.client.view;
+
+import java.util.List;
+
+import org.dllearner.autosparql.client.AppEvents;
+import org.dllearner.autosparql.client.HistoryTokens;
+import org.dllearner.autosparql.client.SPARQLService;
+import org.dllearner.autosparql.client.model.Endpoint;
+
+import com.extjs.gxt.ui.client.Registry;
+import com.extjs.gxt.ui.client.Style.LayoutRegion;
+import com.extjs.gxt.ui.client.Style.Orientation;
+import com.extjs.gxt.ui.client.event.SelectionChangedEvent;
+import com.extjs.gxt.ui.client.event.SelectionChangedListener;
+import com.extjs.gxt.ui.client.mvc.AppEvent;
+import com.extjs.gxt.ui.client.mvc.Controller;
+import com.extjs.gxt.ui.client.mvc.View;
+import com.extjs.gxt.ui.client.store.ListStore;
+import com.extjs.gxt.ui.client.widget.LayoutContainer;
+import com.extjs.gxt.ui.client.widget.form.ComboBox;
+import com.extjs.gxt.ui.client.widget.form.ComboBox.TriggerAction;
+import com.extjs.gxt.ui.client.widget.layout.BorderLayout;
+import com.extjs.gxt.ui.client.widget.layout.BorderLayoutData;
+import com.extjs.gxt.ui.client.widget.layout.RowLayout;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.Hyperlink;
+
+public class HomeView extends View {
+
+ public static final String SEARCH_PANEL = "searchpanel";
+ public static final String HEADER_PANEL = "headerpanel";
+ public static final String VIEWPORT = "viewport";
+
+ private LayoutContainer container;
+
+ public HomeView(Controller controller) {
+ super(controller);
+ }
+
+ @Override
+ protected void initialize() {
+ container = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
+
+// BorderLayout layout = new BorderLayout();
+// layout.setEnableState(false);
+// container.setLayout(layout);
+// container.add(createEndpointSelector(), new BorderLayoutData(LayoutRegion.NORTH));
+ container.add(createEndpointSelector());
+ Hyperlink learnQueryLink = new Hyperlink("Learn Query", HistoryTokens.QUERY);
+ container.add(learnQueryLink);
+
+ }
+
+ private ComboBox<Endpoint> createEndpointSelector(){
+ final ListStore<Endpoint> endpoints = new ListStore<Endpoint>();
+ SPARQLService.Util.getInstance().getEndpoints(new AsyncCallback<List<Endpoint>>() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+
+ }
+
+ @Override
+ public void onSuccess(List<Endpoint> result) {
+ endpoints.add(result);
+
+ }
+
+ });
+
+ final ComboBox<Endpoint> combo = new ComboBox<Endpoint>();
+ combo.setEditable(false);
+ combo.setEmptyText("Select an endpoint...");
+ combo.setDisplayField("label");
+ combo.setWidth(150);
+ combo.setStore(endpoints);
+ combo.setTypeAhead(true);
+ combo.setTriggerAction(TriggerAction.ALL);
+ combo.addSelectionChangedListener(new SelectionChangedListener<Endpoint>() {
+
+ @Override
+ public void selectionChanged(SelectionChangedEvent<Endpoint> se) {
+ SPARQLService.Util.getInstance().setEndpoint(se.getSelectedItem(), new AsyncCallback<Void>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ }
+ @Override
+ public void onSuccess(Void result) {
+ }
+ });
+ }
+ });
+
+ return combo;
+ }
+
+ @Override
+ protected void handleEvent(AppEvent event) {
+ if (event.getType() == AppEvents.NavHome) {System.out.println("Go to HomeView");
+ LayoutContainer wrapper = (LayoutContainer) Registry.get(ApplicationView.CENTER_PANEL);
+ wrapper.removeAll();
+ wrapper.add(container);
+ wrapper.layout();
+ return;
+ }
+
+ }
+
+
+}
Added: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/QueryView.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/QueryView.java (rev 0)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/view/QueryView.java 2010-11-27 12:51:47 UTC (rev 2484)
@@ -0,0 +1,216 @@
+package org.dllearner.autosparql.client.view;
+
+import org.dllearner.autosparql.client.AppEvents;
+import org.dllearner.autosparql.client.SPARQLService;
+import org.dllearner.autosparql.client.exception.SPARQLQueryException;
+import org.dllearner.autosparql.client.model.Example;
+import org.dllearner.autosparql.client.widget.ExamplesPanel;
+import org.dllearner.autosparql.client.widget.InfoPanel;
+import org.dllearner.autosparql.client.widget.InteractivePanel;
+import org.dllearner.autosparql.client.widget.ResultPanel;
+import org.dllearner.autosparql.client.widget.SearchPanel;
+
+import com.extjs.gxt.ui.client.Registry;
+import com.extjs.gxt.ui.client.Style.LayoutRegion;
+import com.extjs.gxt.ui.client.Style.Orientation;
+import com.extjs.gxt.ui.client.event.Listener;
+import com.extjs.gxt.ui.client.event.MessageBoxEvent;
+import com.extjs.gxt.ui.client.mvc.AppEvent;
+import com.extjs.gxt.ui.client.mvc.Controller;
+import com.extjs.gxt.ui.client.mvc.View;
+import com.extjs.gxt.ui.client.util.Margins;
+import com.extjs.gxt.ui.client.widget.LayoutContainer;
+import com.extjs.gxt.ui.client.widget.MessageBox;
+import com.extjs.gxt.ui.client.widget.button.Button;
+import com.extjs.gxt.ui.client.widget.layout.BorderLayoutData;
+import com.extjs.gxt.ui.client.widget.layout.FitLayout;
+import com.extjs.gxt.ui.client.widget.layout.RowData;
+import com.extjs.gxt.ui.client.widget.layout.RowLayout;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public class QueryView extends View {
+
+ private SearchPanel searchPanel;
+ private ExamplesPanel examplesPanel;
+ private InteractivePanel interactivePanel;
+ private ResultPanel resultPanel;
+ private InfoPanel infoPanel;
+
+ private LayoutContainer dummyPanel;
+
+ private LayoutContainer mainPanel;
+
+ public QueryView(Controller controller) {
+ super(controller);
+ }
+
+ @Override
+ protected void initialize() {
+ mainPanel = new LayoutContainer(new RowLayout(Orientation.HORIZONTAL));
+ BorderLayoutData data = new BorderLayoutData(LayoutRegion.CENTER);
+ data.setMargins(new Margins(5, 5, 5, 0));
+
+ LayoutContainer vPanel = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
+ mainPanel.add(vPanel, new RowData(0.3, 1, new Margins(0, 5, 0, 0)));
+
+ dummyPanel = new LayoutContainer(new FitLayout());
+ vPanel.add(dummyPanel, new RowData(1, 0.2, new Margins(0, 0, 10, 0)));
+
+ infoPanel = new InfoPanel();
+ dummyPanel.add(infoPanel);
+
+ interactivePanel = new InteractivePanel();
+
+ searchPanel = new SearchPanel();
+ vPanel.add(searchPanel, new RowData(1, 0.8, new Margins(5, 0, 0, 0)));
+
+ vPanel = new LayoutContainer(new RowLayout(Orientation.VERTICAL));
+ mainPanel.add(vPanel, new RowData(0.7, 1, new Margins(0, 0, 0, 5)));
+
+ resultPanel = new ResultPanel();
+ vPanel.add(resultPanel, new RowData(1, 0.5, new Margins(10, 0, 0, 0)));
+
+ examplesPanel = new ExamplesPanel();
+ vPanel.add(examplesPanel, new RowData(1, 0.5, new Margins(0, 0, 5, 0)));
+ }
+
+ @Override
+ protected void handleEvent(AppEvent event) {
+ if (event.getType() == AppEvents.NavQuery) {System.out.println("Go to QueryView");
+ LayoutContainer wrapper = (LayoutContainer) Registry.get(ApplicationView.CENTER_PANEL);
+ wrapper.removeAll();
+ wrapper.add(mainPanel);
+ wrapper.layout();
+ return;
+ } else if(event.getType() == AppEvents.AddPosExample){
+ examplesPanel.addPositiveExample((Example) event.getData());
+ if(examplesPanel.getPositiveExamples().size() == 1 && examplesPanel.getNegativeExamples().isEmpty()){
+ askForSwitchingToInteractiveMode();
+ SPARQLService.Util.getInstance().getSimilarExample(
+ examplesPanel.getPositiveExamplesURIs(),
+ examplesPanel.getNegativeExamplesUris(), new AsyncCallback<Example>() {
+
+ @Override
+ public void onSuccess(Example result) {
+ interactivePanel.setExample(result);
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ // TODO Auto-generated method stub
+
+ }
+ });
+ }
+ } else if(event.getType() == AppEvents.AddExample){
+ Example example = event.getData("example");
+ Example.Type type = event.getData("type");
+ onAddExample(example, type);
+ } else if(event.getType() == AppEvents.AddNegExample){
+ examplesPanel.addNegativeExample((Example) event.getData());
+ } else if(event.getType() == AppEvents.RemoveExample){
+
+ } else if(event.getType() == AppEvents.ShowInteractiveMode){
+ showInteractivePanel();
+ } else if(event.getType() == AppEvents.UpdateResultTable){
+ resultPanel.refresh(examplesPanel.getPositiveExamplesURIs(), examplesPanel.getNegativeExamplesUris());
+ }
+ }
+
+ private void askForSwitchingToInteractiveMode(){
+ MessageBox.confirm("Switch to interactive mode?",
+ "You have added one example which should belong to the query result. Do you want to switch to the interactive" +
+ "learning mode now?", new Listener<MessageBoxEvent>() {
+
+ @Override
+ public void handleEvent(MessageBoxEvent be) {
+ Button b = be.getButtonClicked();
+ if(b.getText().equals("Yes")){
+ interactivePanel.expand();
+ interactivePanel.focus();
+ } else {
+ searchPanel.setFocus();
+ }
+ }
+ });
+ }
+
+ private void showInteractivePanel(){
+ dummyPanel.remove(infoPanel);
+ dummyPanel.add(interactivePanel);
+ dummyPanel.layout();
+ }
+
+ private void onAddExample(Example example, Example.Type type){
+ if(type == Example.Type.POSITIVE){
+ examplesPanel.addPositiveExample(example);
+ } else {
+ examplesPanel.addNegativeExample(example);
+ }
+ if (!examplesPanel.getPositiveExamplesURIs().isEmpty()) {
+ interactivePanel.mask("Searching...");
+ SPARQLService.Util.getInstance().getSimilarExample(
+ examplesPanel.getPositiveExamplesURIs(),
+ examplesPanel.getNegativeExamplesUris(),
+ new AsyncCallback<Example>() {
+
+ @Override
+ public void onSuccess(Example result) {
+ interactivePanel.unmask();
+ interactivePanel.setExample(result);
+ resultPanel.refresh(examplesPanel.getPositiveExamplesURIs(),
+ examplesPanel.getNegativeExamplesUris());
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ String details = caught.getMessage();
+ if (caught instanceof SPARQLQueryException) {
+ details = "An error occured while sending the following query:\n"
+ + ((SPARQLQueryException) caught)
+ .getQuery();
+ }
+ MessageBox.alert("Error", details, null);
+
+ }
+ });
+ }
+ }
+
+ private void onRemoveExample(Example example, Example.Type type){
+ if(type == Example.Type.POSITIVE){
+ examplesPanel.removePositiveExample(example);
+ } else {
+ examplesPanel.addNegativeExample(example);
+ }
+ if (!examplesPanel.getPositiveExamplesURIs().isEmpty()) {
+ interactivePanel.mask("Searching...");
+ SPARQLService.Util.getInstance().getSimilarExample(
+ examplesPanel.getPositiveExamplesURIs(),
+ examplesPanel.getNegativeExamplesUris(),
+ new AsyncCallback<Example>() {
+
+ @Override
+ public void onSuccess(Example result) {
+ interactivePanel.unmask();
+ interactivePanel.setExample(result);
+ resultPanel.refresh(examplesPanel.getPositiveExamplesURIs(),
+ examplesPanel.getNegativeExamplesUris());
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ String details = caught.getMessage();
+ if (caught instanceof SPARQLQueryException) {
+ details = "An error occured while sending the following query:\n"
+ + ((SPARQLQueryException) caught)
+ .getQuery();
+ }
+ MessageBox.alert("Error", details, null);
+
+ }
+ });
+ }
+ }
+
+}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ExamplesPanel.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ExamplesPanel.java 2010-11-25 17:22:53 UTC (rev 2483)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/client/widget/ExamplesPanel.java 2010-11-27 12:51:47 UTC (rev 2484)
@@ -100,25 +100,25 @@
ListStore<Example> store, Grid<Example> grid) {
VerticalPanel p = new VerticalPanel();
p.setSize(25, 50);
- Button addPosButton = new Button("-");
- addPosButton.setSize(20, 20);
- addPosButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
+ Button move2NegButton = new Button("-");
+ move2NegButton.setSize(20, 20);
+ move2NegButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
@Override
public void componentSelected(ButtonEvent ce) {
posExamplesStore.remove(model);
negExamplesStore.add(model);
}
});
- Button addNegButton = new Button("x");
- addNegButton.setSize(20, 20);
- addNegButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
+ Button removeButton = new Button("x");
+ removeButton.setSize(20, 20);
+ removeButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
@Override
public void componentSelected(ButtonEvent ce) {
posExamplesStore.remove(model);
}
});
- p.add(addPosButton);
- p.add(addNegButton);
+ p.add(move2NegButton);
+ p.add(removeButton);
return p;
}
@@ -207,25 +207,25 @@
ListStore<Example> store, Grid<Example> grid) {
VerticalPanel p = new VerticalPanel();
p.setSize(25, 50);
- Button addPosButton = new Button("+");
- addPosButton.setSize(20, 20);
- addPosButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
+ Button move2PosButton = new Button("+");
+ move2PosButton.setSize(20, 20);
+ move2PosButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
@Override
public void componentSelected(ButtonEvent ce) {
negExamplesStore.remove(model);
posExamplesStore.add(model);
}
});
- Button addNegButton = new Button("x");
- addNegButton.setSize(20, 20);
- addNegButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
+ Button removeButton = new Button("x");
+ removeButton.setSize(20, 20);
+ removeButton.addSelectionListener(new SelectionListener<ButtonEvent>() {
@Override
public void componentSelected(ButtonEvent ce) {
negExamplesStore.remove(model);
}
});
- p.add(addPosButton);
- p.add(addNegButton);
+ p.add(move2PosButton);
+ p.add(removeButton);
return p;
}
@@ -266,10 +266,18 @@
posExamplesStore.add(example);
}
+ public void removePositiveExample(Example example){
+ posExamplesStore.remove(example);
+ }
+
public void addNegativeExample(Example example){
negExamplesStore.add(example);
}
+ public void removeNegativeExample(Example example){
+ negExamplesStore.remove(example);
+ }
+
public List<Example> getPositiveExamples(){
return posExamplesStore.getModels();
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-25 17:22:53 UTC (rev 2483)
+++ trunk/pom.xml 2010-11-27 12:51:47 UTC (rev 2484)
@@ -134,7 +134,7 @@
<dependency>
<groupId>com.extjs</groupId>
<artifactId>gxt</artifactId>
- <version>2.2.0</version>
+ <version>2.2.1</version>
</dependency>
<!--Available via central, we use the latest with minor mods to DL Learner source (IE Dig related code)-->
@@ -306,6 +306,12 @@
<version>1.2.143</version>
</dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.13</version>
+ </dependency>
+
<!--GWT Dependencies-->
<dependency>
<groupId>com.google.gwt</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-11-29 12:02:05
|
Revision: 2487
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2487&view=rev
Author: lorenz_b
Date: 2010-11-29 12:01:56 +0000 (Mon, 29 Nov 2010)
Log Message:
-----------
Updated pom files.
Modified Paths:
--------------
trunk/autosparql/pom.xml
trunk/pom.xml
trunk/sparql-query-generator/pom.xml
Modified: trunk/autosparql/pom.xml
===================================================================
--- trunk/autosparql/pom.xml 2010-11-29 10:37:32 UTC (rev 2486)
+++ trunk/autosparql/pom.xml 2010-11-29 12:01:56 UTC (rev 2487)
@@ -20,6 +20,7 @@
<artifactId>gwt-servlet</artifactId>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
@@ -42,26 +43,27 @@
<groupId>com.hp.hpl.jena</groupId>
<artifactId>arq</artifactId>
</dependency>
+
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
</dependency>
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
<dependency>
<groupId>org.aksw.commons</groupId>
<artifactId>commons</artifactId>
</dependency>
-
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>sparql-query-generator</artifactId>
@@ -71,14 +73,21 @@
<groupId>org.dllearner</groupId>
<artifactId>components-core</artifactId>
</dependency>
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-29 10:37:32 UTC (rev 2486)
+++ trunk/pom.xml 2010-11-29 12:01:56 UTC (rev 2487)
@@ -311,6 +311,12 @@
<artifactId>mysql-connector-java</artifactId>
<version>5.1.13</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ </dependency>
<!--GWT Dependencies-->
<dependency>
Modified: trunk/sparql-query-generator/pom.xml
===================================================================
--- trunk/sparql-query-generator/pom.xml 2010-11-29 10:37:32 UTC (rev 2486)
+++ trunk/sparql-query-generator/pom.xml 2010-11-29 12:01:56 UTC (rev 2487)
@@ -54,8 +54,9 @@
</dependency>
<dependency>
- <groupId>org.dllearner</groupId>
- <artifactId>components-core</artifactId>
+ <groupId>org.dllearner</groupId>
+ <artifactId>components-core</artifactId>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-12-13 13:39:59
|
Revision: 2537
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2537&view=rev
Author: lorenz_b
Date: 2010-12-13 13:39:52 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
Some changes for evaluation.
Modified Paths:
--------------
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/QueryFilterScript.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/QuerySyntaxFilterScript.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/SingleQueryEvaluationScript.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/datastructures/impl/QueryTreeImpl.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-12-13 13:03:48 UTC (rev 2536)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-12-13 13:39:52 UTC (rev 2537)
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.log4j.Logger;
import org.dllearner.autosparql.client.exception.SPARQLQueryException;
@@ -10,16 +11,18 @@
import org.dllearner.autosparql.server.util.SPARQLEndpointEx;
import org.dllearner.kb.sparql.ExtractionDBCache;
import org.dllearner.kb.sparql.SparqlQuery;
-import org.dllearner.sparqlquerygenerator.SPARQLQueryGenerator;
+import org.dllearner.sparqlquerygenerator.SPARQLQueryGeneratorCached;
import org.dllearner.sparqlquerygenerator.cache.ModelCache;
+import org.dllearner.sparqlquerygenerator.cache.QueryTreeCache;
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
-import org.dllearner.sparqlquerygenerator.impl.SPARQLQueryGeneratorImpl;
+import org.dllearner.sparqlquerygenerator.impl.SPARQLQueryGeneratorCachedImpl;
+import org.dllearner.sparqlquerygenerator.operations.nbr.strategy.BruteForceNBRStrategy;
+import org.dllearner.sparqlquerygenerator.operations.nbr.strategy.GreedyNBRStrategy;
import org.dllearner.sparqlquerygenerator.util.ModelGenerator;
import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSetRewindable;
import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
import com.hp.hpl.jena.sparql.vocabulary.FOAF;
import com.hp.hpl.jena.vocabulary.RDFS;
@@ -30,6 +33,7 @@
private ExtractionDBCache constructCache;
private ModelGenerator modelGen;
private ModelCache modelCache;
+ private QueryTreeCache queryTreeCache;
private List<String> posExamples;
private List<String> negExamples;
@@ -40,6 +44,10 @@
private QueryTree<String> currentQueryTree;
+ private Set<String> testedQueries;
+
+ private SPARQLQueryGeneratorCached queryGen;
+
public ExampleFinder(SPARQLEndpointEx endpoint, ExtractionDBCache selectCache, ExtractionDBCache constructCache){
this.endpoint = endpoint;
this.selectCache = selectCache;
@@ -47,6 +55,11 @@
modelGen = new ModelGenerator(endpoint, new HashSet<String>(endpoint.getPredicateFilters()), constructCache);
modelCache = new ModelCache(modelGen);
+ queryTreeCache = new QueryTreeCache();
+ testedQueries = new HashSet<String>();
+
+ queryGen = new SPARQLQueryGeneratorCachedImpl(new GreedyNBRStrategy());
+// queryGen = new SPARQLQueryGeneratorCachedImpl(new BruteForceNBRStrategy());
}
public Example findSimilarExample(List<String> posExamples,
@@ -54,23 +67,22 @@
this.posExamples = posExamples;
this.negExamples = negExamples;
-
- QueryTreeGenerator treeGen = new QueryTreeGenerator(constructCache, endpoint, 5000);
-
List<QueryTree<String>> posExampleTrees = new ArrayList<QueryTree<String>>();
List<QueryTree<String>> negExampleTrees = new ArrayList<QueryTree<String>>();
Model model;
+ QueryTree<String> queryTree;
for(String resource : posExamples){
logger.info("Fetching model for resource: " + resource);
model = modelCache.getModel(resource);
- logger.info("Statements:\n" + model.listStatements().toList());
- posExampleTrees.add(treeGen.getQueryTree(resource, model));
+ queryTree = queryTreeCache.getQueryTree(resource, model);
+ posExampleTrees.add(queryTree);
}
for(String resource : negExamples){
logger.info("Fetching model for resource: " + resource);
model = modelCache.getModel(resource);
- negExampleTrees.add(treeGen.getQueryTree(resource, model));
+ queryTree = queryTreeCache.getQueryTree(resource, model);
+ negExampleTrees.add(queryTree);
}
if(posExamples.size() == 1 && negExamples.isEmpty()){
@@ -126,11 +138,16 @@
currentQueryTree = genTree;
logger.info("Query after generalisation: \n\n" + currentQuery);
-// currentQuery = currentQuery + " ORDER BY ?x0 LIMIT 10";
- currentQuery = currentQuery;// + " LIMIT 10";
String result = "";
try {
- result = selectCache.executeSelectQuery(endpoint, currentQuery + " LIMIT 10");
+ logger.info(tree.getChildren().isEmpty());
+ if(testedQueries.contains(currentQuery) && !currentQueryTree.getChildren().isEmpty()){
+ return findExampleByGeneralisation(currentQueryTree);
+ } else {
+ result = selectCache.executeSelectQuery(endpoint, getLimitedQuery(currentQuery, (posExamples.size()+negExamples.size()+1)));
+ testedQueries.add(currentQuery);
+ }
+
} catch (Exception e) {
e.printStackTrace();
throw new SPARQLQueryException(e, encodeHTML(currentQuery));
@@ -142,6 +159,7 @@
while(rs.hasNext()){
qs = rs.next();
uri = qs.getResource("x0").getURI();
+ logger.info(uri);
if(!posExamples.contains(uri) && !negExamples.contains(uri)){
logger.info("Found new example: " + uri);
return getExample(uri);
@@ -194,21 +212,26 @@
private Example findExampleByLGG(List<QueryTree<String>> posExamplesTrees,
List<QueryTree<String>> negExamplesTrees) throws SPARQLQueryException{
logger.info("USING LGG");
- SPARQLQueryGenerator gen = new SPARQLQueryGeneratorImpl(endpoint.getURL().toString());
if(negExamplesTrees.isEmpty()){
logger.info("No negative examples given. Avoiding big queries by GENERALISATION");
- List<QueryTree<String>> trees = gen.getSPARQLQueryTrees(posExamplesTrees, negExamplesTrees);
- return findExampleByGeneralisation(trees.get(0));
+ queryGen.getSPARQLQueries(posExamplesTrees);
+ QueryTree<String> lgg = queryGen.getLastLGG();
+ return findExampleByGeneralisation(lgg);
}
- List<String> queries = gen.getSPARQLQueries(posExamplesTrees, negExamplesTrees);
+ List<String> queries = queryGen.getSPARQLQueries(posExamplesTrees, negExamplesTrees);
for(String query : queries){
+ if(testedQueries.contains(query)){
+ logger.info("Skipping query because it was already tested before:\n" + query);
+ continue;
+ }
logger.info("Trying query");
- currentQuery = query;// + " LIMIT 10";
+ currentQuery = query;
logger.info(query);
String result = "";
try {
- result = selectCache.executeSelectQuery(endpoint, currentQuery + " LIMIT 10");
+ result = selectCache.executeSelectQuery(endpoint, getLimitedQuery(currentQuery, 10));
+ testedQueries.add(currentQuery);
} catch (Exception e) {
e.printStackTrace();
throw new SPARQLQueryException(e, encodeHTML(query));
@@ -228,14 +251,16 @@
}
logger.info("None of the queries contained a new example.");
logger.info("Changing to Generalisation...");
- return findExampleByGeneralisation(gen.getLastLGG());
+ return findExampleByGeneralisation(queryGen.getLastLGG());
}
private Example getExample(String uri){
logger.info("Retrieving data for resource " + uri);
StringBuilder sb = new StringBuilder();
sb.append("SELECT ?label ?imageURL ?comment WHERE{\n");
+ sb.append("OPTIONAL{\n");
sb.append("<").append(uri).append("> <").append(RDFS.label.getURI()).append("> ").append("?label.\n");
+ sb.append("}\n");
sb.append("OPTIONAL{\n");
sb.append("<").append(uri).append("> <").append(FOAF.depiction.getURI()).append("> ").append("?imageURL.\n");
sb.append("}\n");
@@ -247,18 +272,23 @@
sb.append("}");
ResultSetRewindable rs = SparqlQuery.convertJSONtoResultSet(selectCache.executeSelectQuery(endpoint, sb.toString()));
- QuerySolution qs = rs.next();
-
- String label = qs.getLiteral("label").getLexicalForm();
-
+ String label = uri;
String imageURL = "";
- if(qs.getResource("imageURL") != null){
- imageURL = qs.getResource("imageURL").getURI();
- }
-
String comment = "";
- if(qs.getLiteral("comment") != null){
- comment = qs.getLiteral("comment").getLexicalForm();
+ if(rs.hasNext()){
+ QuerySolution qs = rs.next();
+
+ if(qs.getLiteral("label") != null){
+ label = qs.getLiteral("label").getLexicalForm();
+ }
+
+ if(qs.getResource("imageURL") != null){
+ imageURL = qs.getResource("imageURL").getURI();
+ }
+
+ if(qs.getLiteral("comment") != null){
+ comment = qs.getLiteral("comment").getLexicalForm();
+ }
}
return new Example(uri, label, imageURL, comment);
@@ -288,4 +318,8 @@
public String getCurrentQueryHTML(){
return encodeHTML(currentQuery);
}
+
+ public String getLimitedQuery(String query, int limit){
+ return query + " LIMIT " + limit;
+ }
}
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java 2010-12-13 13:03:48 UTC (rev 2536)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java 2010-12-13 13:39:52 UTC (rev 2537)
@@ -1,5 +1,10 @@
package org.dllearner.autosparql.server;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.log4j.Logger;
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
import org.dllearner.sparqlquerygenerator.datastructures.impl.QueryTreeImpl;
@@ -14,6 +19,10 @@
private int maxEdgeCount = 10;
public double pruningFactor = 0.5;
+ boolean invert = false;
+
+ private List<QueryTree<N>> rest;
+
public QueryTree<N> generalise(QueryTree<N> queryTree){
QueryTree<N> copy = new QueryTreeImpl<N>(queryTree);
@@ -54,17 +63,25 @@
private void pruneTree(QueryTree<N> tree, double limit){
logger.info("Pruning tree:");
- logger.info(tree.getStringRepresentation());
+// logger.info(tree.getStringRepresentation());
+ logger.info("Number of triple pattern: " + ((QueryTreeImpl<N>)tree).getTriplePatternCount());
+// logger.info(((QueryTreeImpl<N>)tree).getSPARQLQueryTree().getStringRepresentation());
int childCountBefore = tree.getChildCount();
- for(QueryTree<N> child : tree.getChildren()){
+ List<QueryTree<N>> children = new ArrayList<QueryTree<N>>(tree.getChildren());
+// Collections.shuffle(children);
+ QueryTree<N> child;
+ for(Iterator<QueryTree<N>> iter = children.iterator(); iter.hasNext(); ){
+ child = iter.next();
logger.info("Removing child: " + child);
tree.removeChild((QueryTreeImpl<N>) child);
- if( (tree.getUserObjectClosure().size() - 1) <= maxEdgeCount
+ if( (tree.getChildCount()) <= maxEdgeCount
&& (double)tree.getChildCount()/childCountBefore <= limit){
break;
}
}
+
+
}
private void retainTypeEdges(QueryTree<N> tree){
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java 2010-12-13 13:03:48 UTC (rev 2536)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java 2010-12-13 13:39:52 UTC (rev 2537)
@@ -4,6 +4,7 @@
import java.net.URL;
import java.sql.Connection;
import java.sql.DriverManager;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
@@ -24,6 +25,7 @@
import org.dllearner.autosparql.server.util.SPARQLEndpointEx;
import org.dllearner.kb.sparql.ExtractionDBCache;
import org.dllearner.kb.sparql.SparqlEndpoint;
+import org.dllearner.kb.sparql.SparqlQuery;
import org.dllearner.sparqlquerygenerator.impl.SPARQLQueryGeneratorImpl;
import org.dllearner.sparqlquerygenerator.operations.lgg.LGGGeneratorImpl;
import org.dllearner.sparqlquerygenerator.operations.nbr.NBRGeneratorImpl;
@@ -31,6 +33,7 @@
import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
+import com.jamonapi.MonitorFactory;
public class EvaluationScript {
@@ -57,10 +60,11 @@
Logger.getLogger(SPARQLQueryGeneratorImpl.class).setLevel(Level.OFF);
Logger.getLogger(LGGGeneratorImpl.class).setLevel(Level.OFF);
Logger.getLogger(NBRGeneratorImpl.class).setLevel(Level.OFF);
- Logger.getLogger(Generalisation.class).setLevel(Level.OFF);
+ Logger.getLogger(Generalisation.class).setLevel(Level.INFO);
SPARQLEndpointEx endpoint = new SPARQLEndpointEx(
+// new URL("http://dbpedia.org/sparql"),
new URL("http://db0.aksw.org:8999/sparql"),
Collections.singletonList("http://dbpedia.org"),
Collections.<String>emptyList(),
@@ -71,11 +75,11 @@
Class.forName("com.mysql.jdbc.Driver");
Connection conn = DriverManager.getConnection("jdbc:mysql://139.18.2.173/dbpedia_queries", "root", "WQPRisDa2");
+ PreparedStatement ps = conn.prepareStatement("INSERT INTO evaluation {?,?,?,?,?,?,?,?,?,?}");
-
//fetch all queries from table 'tmp', where the number of results is lower than 2000
Statement st = conn.createStatement();
- ResultSet queries = st.executeQuery("SELECT * FROM queries_final WHERE resultCount<2000 ORDER BY resultCount DESC");
+ ResultSet queries = st.executeQuery("SELECT * FROM queries_final WHERE resultCount<2000 AND query not like '%filter%' ORDER BY resultCount DESC");
queries.last();
logger.info("Evaluating " + queries.getRow() + " queries.");
queries.beforeFirst();
@@ -83,7 +87,6 @@
int id;
String query;
- QueryEngineHTTP qexec;
com.hp.hpl.jena.query.ResultSet rs;
SortedSet<String> resources;
QuerySolution qs;
@@ -91,84 +94,120 @@
List<String> posExamples;
List<String> negExamples;
//iterate over the queries
+ int testedCnt = 0;
+ int learnedCnt = 0;
while(queries.next()){
id = queries.getInt("id");
query = queries.getString("query");
logger.info("Evaluating query:\n" + query);
+ testedCnt++;
+ MonitorFactory.getTimeMonitor("Query").reset();
+ MonitorFactory.getTimeMonitor("LGG").reset();
+ MonitorFactory.getTimeMonitor("NBR").reset();
-
- //send query to SPARQLEndpoint
- qexec = new QueryEngineHTTP(endpoint.getURL().toString(), query);
- for (String dgu : endpoint.getDefaultGraphURIs()) {
- qexec.addDefaultGraph(dgu);
- }
- for (String ngu : endpoint.getNamedGraphURIs()) {
- qexec.addNamedGraph(ngu);
- }
- rs = qexec.execSelect();
-
-
- //put the URIs for the resources in variable var0 into a separate list
- resources = new TreeSet<String>();
- while(rs.hasNext()){
- qs = rs.next();
- if(qs.get("var0").isURIResource()){
- resources.add(qs.get("var0").asResource().getURI());
+ try {
+ //send query to SPARQLEndpoint
+ rs = SparqlQuery.convertJSONtoResultSet(selectQueriesCache.executeSelectQuery(endpoint, query));
+
+
+ //put the URIs for the resources in variable var0 into a separate list
+ resources = new TreeSet<String>();
+ while(rs.hasNext()){
+ qs = rs.next();
+ if(qs.get("var0").isURIResource()){
+ resources.add(qs.get("var0").asResource().getURI());
+ }
}
+ logger.info("Query returned " + resources.size() + " results:\n" + resources);
+
+
+ //start learning
+ exampleFinder = new ExampleFinder(endpoint, selectQueriesCache, constructQueriesCache);
+ posExamples = new ArrayList<String>();
+ negExamples = new ArrayList<String>();
+ //we choose the first resource in the set as positive example
+ String posExample = resources.first();
+ logger.info("Selected " + posExample + " as first positive example.");
+ posExamples.add(posExample);
+ //we ask for the next similar example
+ String nextExample;
+ String learnedQuery = "";
+ boolean equivalentQueries = false;
+ do{
+ nextExample = exampleFinder.findSimilarExample(posExamples, negExamples).getURI();
+ logger.info("Next suggested example is " + nextExample);
+ //if the example is contained in the resultset of the query, we add it to the positive examples,
+ //otherwise to the negatives
+ if(resources.contains(nextExample)){
+ posExamples.add(nextExample);
+ logger.info("Suggested example is considered as positive example.");
+ } else {
+ negExamples.add(nextExample);
+ logger.info("Suggested example is considered as negative example.");
+ }
+ if(learnedQuery.equals(exampleFinder.getCurrentQuery())){
+ continue;
+ }
+ learnedQuery = exampleFinder.getCurrentQuery();
+ logger.info("Learned query:\n" + learnedQuery);
+ equivalentQueries = isEquivalentQuery(resources, learnedQuery, endpoint);
+ logger.info("Original query and learned query are equivalent: " + equivalentQueries);
+ } while(!equivalentQueries);
+
+ int posExamplesCount = posExamples.size();
+ int negExamplesCount = negExamples.size();
+ int examplesCount = posExamplesCount + negExamplesCount;
+ double queryTime = MonitorFactory.getTimeMonitor("Query").getTotal();
+ double lggTime = MonitorFactory.getTimeMonitor("LGG").getTotal();
+ double nbrTime = MonitorFactory.getTimeMonitor("NBR").getTotal();
+ double totalTime = queryTime + nbrTime + lggTime;
+
+ write2DB(ps, id, query, learnedQuery,
+ examplesCount, posExamplesCount, negExamplesCount,
+ totalTime, queryTime, lggTime, nbrTime);
+ logger.info("Number of examples needed: "
+ + (posExamples.size() + negExamples.size())
+ + "(+" + posExamples.size() + "/-" + negExamples.size() + ")");
+ learnedCnt++;
+ if(testedCnt == 200){
+ break;
}
- logger.info("Query returned " + resources.size() + " results:\n" + resources);
-
-
- //start learning
- exampleFinder = new ExampleFinder(endpoint, selectQueriesCache, constructQueriesCache);
- posExamples = new ArrayList<String>();
- negExamples = new ArrayList<String>();
- //we choose the first resource in the set as positive example
- String posExample = resources.first();
- logger.info("Selected " + posExample + " as first positive example.");
- posExamples.add(posExample);
- //we ask for the next similar example
-// String nextExample = exampleFinder.findSimilarExample(posExamples, negExamples).getURI();
-// logger.info("Next suggested example is " + nextExample);
-// //if the example is contained in the resultset of the query, we add it to the positive examples,
-// //otherwise to the negatives
-// if(resources.contains(nextExample)){
-// posExamples.add(nextExample);
-// logger.info("Suggested example is considered as positive example.");
-// } else {
-// negExamples.add(nextExample);
-// logger.info("Suggested example is considered as negative example.");
-// }
-// nextExample = exampleFinder.findSimilarExample(posExamples, negExamples).getURI();
-
- String nextExample;
- String learnedQuery;
- boolean equivalentQueries = false;
- do{
- nextExample = exampleFinder.findSimilarExample(posExamples, negExamples).getURI();
- logger.info("Next suggested example is " + nextExample);
- //if the example is contained in the resultset of the query, we add it to the positive examples,
- //otherwise to the negatives
- if(resources.contains(nextExample)){
- posExamples.add(nextExample);
- logger.info("Suggested example is considered as positive example.");
- } else {
- negExamples.add(nextExample);
- logger.info("Suggested example is considered as negative example.");
- }
- learnedQuery = exampleFinder.getCurrentQuery();
- logger.info("Learned query:\n" + learnedQuery);
- equivalentQueries = isEquivalentQuery(resources, learnedQuery, endpoint);
- logger.info("Original query and learned query are equivalent: " + equivalentQueries);
- } while(!equivalentQueries);
-
- logger.info("Number of examples needed: " + (posExamples.size() + negExamples.size()));
-
- break;
+ } catch (Exception e) {
+ logger.error("Error while learning query " + id, e);
+ }
}
+ logger.info("Learned " + learnedCnt + " of " + testedCnt + " queries");
+ logger.info("Time to compute LGG(total): " + MonitorFactory.getTimeMonitor("LGG").getTotal());
+ logger.info("Time to compute LGG(avg): " + MonitorFactory.getTimeMonitor("LGG").getAvg());
+ logger.info("Time to compute LGG(min): " + MonitorFactory.getTimeMonitor("LGG").getMin());
+ logger.info("Time to compute LGG(max): " + MonitorFactory.getTimeMonitor("LGG").getMax());
}
+ private static void write2DB(PreparedStatement ps,
+ int id, String originalQuery, String learnedQuery, int examplesCount,
+ int posExamplesCount, int negExamplesCount, double totalTime,
+ double queryTime, double lggTime, double nbrTime){
+ try {
+ ps.setInt(1, id);
+ ps.setString(2, originalQuery);
+ ps.setString(3, learnedQuery);
+ ps.setInt(4, examplesCount);
+ ps.setInt(5, posExamplesCount);
+ ps.setInt(6, negExamplesCount);
+ ps.setDouble(7, totalTime);
+ ps.setDouble(8, queryTime);
+ ps.setDouble(9, lggTime);
+ ps.setDouble(10, nbrTime);
+
+ ps.executeUpdate();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+
/**
* Check if resultset of the learned query is equivalent to the resultset of the original query
* @param originalResources
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/QueryFilterScript.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/QueryFilterScript.java 2010-12-13 13:03:48 UTC (rev 2536)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/QueryFilterScript.java 2010-12-13 13:39:52 UTC (rev 2537)
@@ -19,6 +19,7 @@
import com.hp.hpl.jena.graph.Triple;
import com.hp.hpl.jena.query.Query;
import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QueryParseException;
import com.hp.hpl.jena.sparql.algebra.Algebra;
import com.hp.hpl.jena.sparql.algebra.Op;
import com.hp.hpl.jena.sparql.core.BasicPattern;
@@ -36,7 +37,20 @@
private Connection conn;
private SparqlEndpoint endpoint = SparqlEndpoint.getEndpointDBpedia();
+ private static final String PREFIXES = "PREFIX owl: <http://www.w3.org/2002/07/owl#> " +
+ "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> " +
+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> " +
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> " +
+ "PREFIX foaf: <http://xmlns.com/foaf/0.1/> " +
+ "PREFIX dc: <http://purl.org/dc/elements/1.1/> " +
+ "PREFIX : <http://dbpedia.org/resource/> " +
+ "PREFIX dbpedia2: <http://dbpedia.org/property/> " +
+ "PREFIX dbpedia: <http://dbpedia.org/> " +
+ "PREFIX skos: <http://www.w3.org/2004/02/skos/core#> " +
+ "PREFIX umbelBus: <http://umbel.org/umbel/sc/Business> " +
+ "PREFIX umbelCountry: <http://umbel.org/umbel/sc/IndependentCountry>";
+
public QueryFilterScript(){
try {
Class.forName("com.mysql.jdbc.Driver");
@@ -51,7 +65,8 @@
private void run(){
// countQueryResultSet();
- filterQueriesWithTargetVarNotSubject();
+ filterQueriesWithSyntaxError();
+// filterQueriesWithTargetVarNotSubject();
}
private void countQueryResultSet(){
@@ -109,12 +124,42 @@
}
}
+ private void filterQueriesWithSyntaxError(){
+ try {
+ Statement st = conn.createStatement();
+ PreparedStatement ps = conn.prepareStatement("DELETE FROM queries_final WHERE id = ?");
+ ResultSet rs = st.executeQuery("SELECT * FROM queries_final where query not like '%filter%'");
+
+ int id;
+ String query;
+ while(rs.next()){
+ id = rs.getInt("id");
+ query = rs.getString("query");
+
+ try {
+ if(!checkQuerySyntax(query)){
+ System.out.println(query);
+ System.out.println(rs.getInt("resultCount"));
+ ps.setInt(1, id);
+// ps.execute();
+ }
+ } catch (Exception e) {
+ logger.error("ERROR. An error occured while working with query " + id, e);
+ }
+
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+ }
+
private void filterQueriesWithTargetVarNotSubject(){
try {
Statement st = conn.createStatement();
- PreparedStatement ps = conn.prepareStatement("DELETE FROM tmp WHERE id = ?");
+ PreparedStatement ps = conn.prepareStatement("DELETE FROM queries_final WHERE id = ?");
- ResultSet rs = st.executeQuery("SELECT * FROM tmp");
+ ResultSet rs = st.executeQuery("SELECT * FROM queries_final WHERE resultCount<2000 AND query not like '%filter%'");
int id;
String query;
@@ -170,15 +215,25 @@
return true;
}
- private boolean checkQuerySyntax(String query) {
- Query q = QueryFactory.create(query);
- Op op = Algebra.compile(q);
- // ... perform checks ... can we fully decide when an algebra expression is not in the target language?
- SSE.write(op) ;
+ private boolean checkQuerySyntax(String queryString) {
+ queryString = queryString.replaceAll("owl:sameAs", "<http://www.w3.org/2002/07/owl#owl:sameAs>");
+ queryString = queryString.replaceAll("skos:subject", "<http://www.w3.org/2004/02/skos/core#subject>");
+// Query q = QueryFactory.create(query);
+// Op op = Algebra.compile(q);
+// // ... perform checks ... can we fully decide when an algebra expression is not in the target language?
+// SSE.write(op) ;
+ try {
+ QueryFactory.create(queryString);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
return true;
}
private boolean checkTargetVarIsSubject(String queryString){
+ queryString = queryString.replaceAll("owl:sameAs", "<http://www.w3.org/2002/07/owl#owl:sameAs>");
+ queryString = queryString.replaceAll("skos:subject", "<http://www.w3.org/2004/02/skos/core#subject>");
try {
Query query = QueryFactory.create(queryString);
Element queryPattern = query.getQueryPattern();
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/QuerySyntaxFilterScript.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/QuerySyntaxFilterScript.java 2010-12-13 13:03:48 UTC (rev 2536)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/QuerySyntaxFilterScript.java 2010-12-13 13:39:52 UTC (rev 2537)
@@ -14,7 +14,16 @@
* @param args
*/
public static void main(String[] args) {
- String queryString = "SELECT ?var0 WHERE {<s> <p> ?var0;<p1> <o1>.}";
+// String queryString = "SELECT ?var0 WHERE {<s> <p> ?var0;<p1> <o1>.}";
+// String queryString = "SELECT DISTINCT ?var0, ?var1 WHERE { <http://dbpedia.org/resource/Taylor_Swift> skos:subject ?var0. " +
+// "?var0 rdfs:label ?var1 FILTER langMatches( lang(?var1), \"en\" ) }";
+ String queryString = "PREFIX dc: <http://purl.org/dc/elements/1.1/> PREFIX : <http://dbpedia.org/resource/> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> " +
+ "PREFIX dbpedia2: <http://dbpedia.org/property/> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX owl: <http://www.w3.org/2002/07/owl#> " +
+ "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> PREFIX dbpedia: <http://dbpedia.org/> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> " +
+ "PREFIX skos: <http://www.w3.org/2004/02/skos/core#> " +
+ "SELECT ?var0 ?var1 WHERE { { ?var1 ?var0 :Bohol_Sea .} " +
+ "FILTER ( ( isURI(?var1) && ( ! regex(?var0, \"^http://dbpedia.org/property/redirect\") ) ) " +
+ "&& ( ! regex(?var0, \"^http://dbpedia.org/property/disambiguates\") ) ) }";
Query query = QueryFactory.create(queryString);
Element queryPattern = query.getQueryPattern();
// System.out.println(queryPattern);
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/SingleQueryEvaluationScript.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/SingleQueryEvaluationScript.java 2010-12-13 13:03:48 UTC (rev 2536)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/SingleQueryEvaluationScript.java 2010-12-13 13:39:52 UTC (rev 2537)
@@ -55,12 +55,12 @@
Logger.getLogger(SPARQLQueryGeneratorImpl.class).setLevel(Level.INFO);
Logger.getLogger(LGGGeneratorImpl.class).setLevel(Level.OFF);
Logger.getLogger(NBRGeneratorImpl.class).setLevel(Level.OFF);
- Logger.getLogger(Generalisation.class).setLevel(Level.OFF);
+ Logger.getLogger(Generalisation.class).setLevel(Level.INFO);
SPARQLEndpointEx endpoint = new SPARQLEndpointEx(
-// new URL("http://dbpedia.org/sparql"),
- new URL("http://db0.aksw.org:8999/sparql"),
+ new URL("http://dbpedia.org/sparql"),
+// new URL("http://db0.aksw.org:8999/sparql"),
Collections.singletonList("http://dbpedia.org"),
Collections.<String>emptyList(),
null, null,
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/datastructures/impl/QueryTreeImpl.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/datastructures/impl/QueryTreeImpl.java 2010-12-13 13:03:48 UTC (rev 2536)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/datastructures/impl/QueryTreeImpl.java 2010-12-13 13:39:52 UTC (rev 2537)
@@ -292,6 +292,49 @@
getUserObjectClosure(this, objects);
return objects;
}
+
+ public int getTriplePatternCount(){
+ return countTriplePattern(this);
+ }
+
+ private int countTriplePattern(QueryTree<N> tree){
+ int cnt = 0;
+ Object object;
+ if(!tree.isLeaf()){
+ for(QueryTree<N> child : tree.getChildren()){
+ object = child.getUserObject();
+ boolean objectIsResource = !object.equals("?");
+ cnt++;
+ if(!objectIsResource){
+ cnt+=countTriplePattern(child);
+ }
+ }
+ }
+ return cnt;
+ }
+
+ public QueryTree<N> getSPARQLQueryTree(){
+ return createSPARQLQueryTree(this);
+ }
+
+ private QueryTree<N> createSPARQLQueryTree(QueryTree<N> tree){
+ QueryTree<N> copy = new QueryTreeImpl<N>(tree.getUserObject());
+ if(tree.getUserObject().equals("?")){
+ for(QueryTree<N> child : tree.getChildren()){
+ copy.addChild((QueryTreeImpl<N>) createSPARQLQueryTree(child), tree.getEdge(child));
+ }
+ }
+// for(QueryTree<N> child : tree.getChildren()){
+// if(child.getUserObject().equals("?")){
+// copy.addChild((QueryTreeImpl<N>) createSPARQLQueryTree(child), tree.getEdge(child));
+// } else {
+// copy.addChild((QueryTreeImpl<N>) child, tree.getEdge(child));
+// }
+//
+// }
+
+ return copy;
+ }
private void getUserObjectClosure(QueryTree<N> tree, Set<N> bin) {
bin.add(tree.getUserObject());
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java 2010-12-13 13:03:48 UTC (rev 2536)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java 2010-12-13 13:39:52 UTC (rev 2537)
@@ -28,6 +28,9 @@
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
import org.dllearner.sparqlquerygenerator.datastructures.impl.QueryTreeImpl;
+import com.jamonapi.Monitor;
+import com.jamonapi.MonitorFactory;
+
/**
*
* @author Lorenz Bühmann
@@ -68,12 +71,15 @@
if(trees.size() == 1){
return trees.iterator().next();
}
+ Monitor mon = MonitorFactory.getTimeMonitor("LGG");
+ mon.start();
QueryTree<N> lgg = computeLGG(treeList.get(0), treeList.get(1), learnFilters);
logger.info("LGG for 1 and 2:\n" + lgg.getStringRepresentation());
for(int i = 2; i < treeList.size(); i++){
lgg = computeLGG(lgg, treeList.get(i), learnFilters);
logger.info("LGG for 1-" + (i+1) + ":\n" + lgg.getStringRepresentation());
}
+ mon.stop();
logger.info("LGG = ");
logger.info(lgg.getStringRepresentation());
@@ -82,10 +88,12 @@
}
private QueryTree<N> computeLGG(QueryTree<N> tree1, QueryTree<N> tree2, boolean learnFilters){
- logger.debug("Computing LGG for");
- logger.debug(tree1.getStringRepresentation());
- logger.debug("and");
- logger.debug(tree2.getStringRepresentation());
+ if(logger.isDebugEnabled()){
+ logger.debug("Computing LGG for");
+ logger.debug(tree1.getStringRepresentation());
+ logger.debug("and");
+ logger.debug(tree2.getStringRepresentation());
+ }
QueryTree<N> lgg = new QueryTreeImpl<N>(tree1.getUserObject());
// if(!lgg.getUserObject().equals(tree2.getUserObject())){
@@ -114,36 +122,46 @@
Set<QueryTreeImpl<N>> addedChildren;
QueryTreeImpl<N> lggChild;
for(Object edge : tree1.getEdges()){
- logger.debug("Regarding egde: " + edge);
+ if(logger.isDebugEnabled()){
+ logger.debug("Regarding egde: " + edge);
+ }
addedChildren = new HashSet<QueryTreeImpl<N>>();
for(QueryTree<N> child1 : tree1.getChildren(edge)){
for(QueryTree<N> child2 : tree2.getChildren(edge)){
lggChild = (QueryTreeImpl<N>) computeLGG(child1, child2, learnFilters);
boolean add = true;
for(QueryTreeImpl<N> addedChild : addedChildren){
- logger.debug("Subsumption test");
+ if(logger.isDebugEnabled()){
+ logger.debug("Subsumption test");
+ }
if(addedChild.isSubsumedBy(lggChild)){
- logger.debug("Previously added child");
- logger.debug(addedChild.getStringRepresentation());
- logger.debug("is subsumed by");
- logger.debug(lggChild.getStringRepresentation());
- logger.debug("so we can skip adding the LGG");
+ if(logger.isDebugEnabled()){
+ logger.debug("Previously added child");
+ logger.debug(addedChild.getStringRepresentation());
+ logger.debug("is subsumed by");
+ logger.debug(lggChild.getStringRepresentation());
+ logger.debug("so we can skip adding the LGG");
+ }
add = false;
break;
} else if(lggChild.isSubsumedBy(addedChild)){
- logger.debug("Computed LGG");
- logger.debug(lggChild.getStringRepresentation());
- logger.debug("is subsumed by previously added child");
- logger.debug(addedChild.getStringRepresentation());
- logger.debug("so we can remove it");
+ if(logger.isDebugEnabled()){
+ logger.debug("Computed LGG");
+ logger.debug(lggChild.getStringRepresentation());
+ logger.debug("is subsumed by previously added child");
+ logger.debug(addedChild.getStringRepresentation());
+ logger.debug("so we can remove it");
+ }
lgg.removeChild(addedChild);
}
}
if(add){
lgg.addChild(lggChild, edge);
addedChildren.add(lggChild);
- logger.debug("Adding child");
- logger.debug(lggChild.getStringRepresentation());
+ if(logger.isDebugEnabled()){
+ logger.debug("Adding child");
+ logger.debug(lggChild.getStringRepresentation());
+ }
}
}
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java 2010-12-13 13:03:48 UTC (rev 2536)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java 2010-12-13 13:39:52 UTC (rev 2537)
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -29,6 +30,8 @@
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
import org.dllearner.sparqlquerygenerator.datastructures.impl.QueryTreeImpl;
+import com.hp.hpl.jena.sparql.function.library.e;
+
/**
*
* @author Lorenz Bühmann
@@ -65,17 +68,54 @@
// }
// }
//
+ System.out.println(printTreeWithValues(nbr, matrix));
+
+ List<QueryTree<N>> candidates2Remove = new ArrayList<QueryTree<N>>();
+
for(Entry<QueryTree<N>, List<Integer>> entry : matrix.entrySet()){
- System.err.println(entry.getValue());
if(sum(entry.getValue()) < negExampleTrees.size()/2.0){
- System.err.println("REMOVE");
- nbr.removeChild((QueryTreeImpl<N>) entry.getKey());
+ candidates2Remove.add(entry.getKey());
}
}
+ removeLeafs(nbr, candidates2Remove);
return nbr;
}
+ private void removeLeafs(QueryTree<N> nbr, List<QueryTree<N>> candidates2Remove){
+ for(Iterator<QueryTree<N>> iter = nbr.getLeafs().iterator(); iter.hasNext();){
+ QueryTree<N> leaf = iter.next();
+
+ if(candidates2Remove.contains(leaf)){
+ leaf.getParent().removeChild((QueryTreeImpl<N>) leaf);
+ }
+ }
+ }
+
+ private String printTreeWithValues(QueryTree<N> tree, Map<QueryTree<N>, List<Integer>> matrix){
+ int depth = tree.getPathToRoot().size();
+ StringBuilder sb = new StringBuilder();
+ if(tree.isRoot()){
+ sb.append("TREE\n\n");
+ }
+// ren = ren.replace("\n", "\n" + sb);
+ sb.append(tree.getUserObject() + "(" +matrix.get(tree) + ")");
+ sb.append("\n");
+ for (QueryTree<N> child : tree.getChildren()) {
+ for (int i = 0; i < depth; i++) {
+ sb.append("\t");
+ }
+ Object edge = tree.getEdge(child);
+ if (edge != null) {
+ sb.append(" ");
+ sb.append(edge);
+ sb.append(" ---> ");
+ }
+ sb.append(printTreeWithValues(child, matrix));
+ }
+ return sb.toString();
+ }
+
private int sum(List<Integer> list){
int sum = 0;
for(Integer i : list){
@@ -90,39 +130,58 @@
return Collections.singletonList(computeNBR(posExampleTree, negExampleTrees));
}
+// private void checkTree(Map<QueryTree<N>, List<Integer>> matrix, QueryTree<N> posTree, QueryTree<N> negTree, int index){
+// int entry;
+// if(!posTree.getUserObject().equals("?") && !posTree.getUserObject().equals(negTree.getUserObject())){
+// entry = 1;
+// } else {
+// entry = 1;
+// for(Object edge : posTree.getEdges()){
+// for(QueryTree<N> child1 : posTree.getChildren(edge)){
+// for(QueryTree<N> child2 : negTree.getChildren(edge)){
+// if(!posTree.getUserObject().equals("?") && child1.getUserObject().equals(child2.getUserObject())){
+// entry = 0;break;
+// }
+// if(posTree.getUserObject().equals("?")){
+// checkTree(matrix, child1, child2, index);
+// }
+// }
+// }
+// }
+// Object edge;
+// for(QueryTree<N> child1 : posTree.getChildren()){
+// edge = posTree.getEdge(child1);
+// for(QueryTree<N> child2 : negTree.getChildren(edge)){
+//
+// }
+//
+// }
+// }
+// setMatrixEntry(matrix, posTree, index, entry);
+// if(entry == 1){
+// for(QueryTree<N> child : posTree.getChildrenClosure()){
+// setMatrixEntry(matrix, child, index, 0);
+// }
+// }
+// }
+
private void checkTree(Map<QueryTree<N>, List<Integer>> matrix, QueryTree<N> posTree, QueryTree<N> negTree, int index){
- int entry;
- if(!posTree.getUserObject().equals("?") && !posTree.getUserObject().equals(negTree.getUserObject())){
+ int entry = 1;
+ Object edge;
+ for(QueryTree<N> child1 : posTree.getChildren()){
entry = 1;
- } else {
- entry = 1;
- for(Object edge : posTree.getEdges()){
- for(QueryTree<N> child1 : posTree.getChildren(edge)){
- for(QueryTree<N> child2 : negTree.getChildren(edge)){
- if(!posTree.getUserObject().equals("?") && child1.getUserObject().equals(child2.getUserObject())){
- entry = 0;break;
- }
- if(posTree.getUserObject().equals("?")){
- checkTree(matrix, child1, child2, index);
- }
- }
- }
- }
- Object edge;
- for(QueryTree<N> child1 : posTree.getChildren()){
- edge = posTree.getEdge(child1);
- for(QueryTree<N> child2 : negTree.getChildren(edge)){
-
- }
-
- }
+ edge = posTree.getEdge(child1);
+ for(QueryTree<N> child2 : negTree.getChildren(edge)){
+ if(!child1.getUserObject().equals("?") && child1.getUserObject().equals(child2.getUserObject())){
+ entry = 0;checkTree(matrix, child1, child2, index);
+ } else if(child1.getUserObject().equals("?")){
+ entry = 0;
+ checkTree(matrix, child1, child2, index);
+ }
+ }
+ setMatrixEntry(matrix, child1, index, entry);
}
- setMatrixEntry(matrix, posTree, index, entry);
- if(entry == 1){
- for(QueryTree<N> child : posTree.getChildrenClosure()){
- setMatrixEntry(matrix, child, index, 0);
- }
- }
+
}
private void setMatrixEntry(Map<QueryTree<N>, List<Integer>> matrix, QueryTree<N> row, int column, int entry){
@@ -134,7 +193,7 @@
try {
list.set(column, entry);
} catch (IndexOutOfBoundsException e) {
- list.add(column, entry);
+ list.add(entry);
}
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java 2010-12-13 13:03:48 UTC (rev 2536)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/util/Filter.java 2010-12-13 13:39:52 UTC (rev 2537)
@@ -54,6 +54,9 @@
filters.add(FOAF.Image.toString());
filters.add(FOAF.surname.toString());
filters.add(FOAF.birthday.toString());
+ filters.add(FOAF.name.toString());
+ filters.add(FOAF.firstName.toString());
+ filters.add(FOAF.givenname.toString());
return filters;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-12-13 18:06:00
|
Revision: 2550
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2550&view=rev
Author: lorenz_b
Date: 2010-12-13 18:05:53 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
Added limit for query(edge count) when executing generalisation.
Surrounded all logging with if-statements to avoid logging when it is not used.
Modified Paths:
--------------
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/datastructures/QueryTree.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-12-13 17:32:21 UTC (rev 2549)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-12-13 18:05:53 UTC (rev 2550)
@@ -18,7 +18,6 @@
import org.dllearner.sparqlquerygenerator.impl.SPARQLQueryGeneratorCachedImpl;
import org.dllearner.sparqlquerygenerator.operations.nbr.NBRGenerator;
import org.dllearner.sparqlquerygenerator.operations.nbr.NBRGeneratorImpl;
-import org.dllearner.sparqlquerygenerator.operations.nbr.strategy.BruteForceNBRStrategy;
import org.dllearner.sparqlquerygenerator.operations.nbr.strategy.GreedyNBRStrategy;
import org.dllearner.sparqlquerygenerator.util.ModelGenerator;
@@ -137,16 +136,22 @@
}
private Example findExampleByGeneralisation(QueryTree<String> tree) throws SPARQLQueryException{
- logger.info("Using generalisation");
- logger.info("Query before generalisation: \n\n" + tree.toSPARQLQueryString(true));
+ if(logger.isInfoEnabled()){
+ logger.info("Using generalisation");
+ logger.info("Query before generalisation: \n\n" + tree.toSPARQLQueryString(true));
+ }
+
Generalisation<String> posGen = new Generalisation<String>();
QueryTree<String> genTree = posGen.generalise(tree);
currentQuery = genTree.toSPARQLQueryString(true);
currentQueryTree = genTree;
- logger.info("Query after generalisation: \n\n" + currentQuery);
+ if(logger.isInfoEnabled()){
+ logger.info("Query after generalisation: \n\n" + currentQuery);
+ }
+
if(makeAlwaysNBR){
makeNBR(currentQueryTree, null);
}
@@ -171,13 +176,22 @@
while(rs.hasNext()){
qs = rs.next();
uri = qs.getResource("x0").getURI();
- logger.info(uri);
+ if(logger.isInfoEnabled()){
+ logger.info(uri);
+ }
+
if(!posExamples.contains(uri) && !negExamples.contains(uri)){
- logger.info("Found new example: " + uri);
+ if(logger.isInfoEnabled()){
+ logger.info("Found new example: " + uri);
+ }
+
return getExample(uri);
}
}
- logger.info("Found no new example. Trying again generalisation...");
+ if(logger.isInfoEnabled()){
+ logger.info("Found no new example. Trying again generalisation...");
+ }
+
return findExampleByGeneralisation(genTree);
}
@@ -223,9 +237,13 @@
private Example findExampleByLGG(List<QueryTree<String>> posExamplesTrees,
List<QueryTree<String>> negExamplesTrees) throws SPARQLQueryException{
- logger.info("USING LGG");
+ if(logger.isInfoEnabled()){
+ logger.info("USING LGG");
+ }
if(negExamplesTrees.isEmpty()){
- logger.info("No negative examples given. Avoiding big queries by GENERALISATION");
+ if(logger.isInfoEnabled()){
+ logger.info("No negative examples given. Avoiding big queries by GENERALISATION");
+ }
queryGen.getSPARQLQueries(posExamplesTrees);
QueryTree<String> lgg = queryGen.getLastLGG();
return findExampleByGeneralisation(lgg);
@@ -234,12 +252,17 @@
List<String> queries = queryGen.getSPARQLQueries(posExamplesTrees, negExamplesTrees);
for(String query : queries){
if(testedQueries.contains(query)){
- logger.info("Skipping query because it was already tested before:\n" + query);
+ if(logger.isInfoEnabled()){
+ logger.info("Skipping query because it was already tested before:\n" + query);
+ }
continue;
}
- logger.info("Trying query");
+ if(logger.isInfoEnabled()){
+ logger.info("Trying query");
+ logger.info(query);
+ }
currentQuery = query;
- logger.info(query);
+
String result = "";
try {
result = selectCache.executeSelectQuery(endpoint, getLimitedQuery(currentQuery, (posExamples.size()+negExamples.size()+1), true));
@@ -259,15 +282,21 @@
return getExample(uri);
}
}
- logger.info("Query result contains no new examples. Trying another query...");
+ if(logger.isInfoEnabled()){
+ logger.info("Query result contains no new examples. Trying another query...");
+ }
}
- logger.info("None of the queries contained a new example.");
- logger.info("Changing to Generalisation...");
+ if(logger.isInfoEnabled()){
+ logger.info("None of the queries contained a new example.");
+ logger.info("Changing to Generalisation...");
+ }
return findExampleByGeneralisation(queryGen.getLastLGG());
}
private Example getExample(String uri){
- logger.info("Retrieving data for resource " + uri);
+ if(logger.isInfoEnabled()){
+ logger.info("Retrieving data for resource " + uri);
+ }
StringBuilder sb = new StringBuilder();
sb.append("SELECT ?label ?imageURL ?comment WHERE{\n");
sb.append("OPTIONAL{\n");
@@ -306,8 +335,8 @@
return new Example(uri, label, imageURL, comment);
}
- public void setMakeAlwaysNBR(boolean makeAlwaysNRB){
- this.makeAlwaysNBR = makeAlwaysNRB;
+ public void setMakeAlwaysNBR(boolean makeAlwaysNBR){
+ this.makeAlwaysNBR = makeAlwaysNBR;
}
public String encodeHTML(String s) {
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java 2010-12-13 17:32:21 UTC (rev 2549)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java 2010-12-13 18:05:53 UTC (rev 2550)
@@ -1,7 +1,6 @@
package org.dllearner.autosparql.server;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -9,20 +8,17 @@
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
import org.dllearner.sparqlquerygenerator.datastructures.impl.QueryTreeImpl;
-import com.hp.hpl.jena.vocabulary.OWL;
import com.hp.hpl.jena.vocabulary.RDF;
public class Generalisation<N> {
private static final Logger logger = Logger.getLogger(Generalisation.class);
- private int maxEdgeCount = 10;
+ private int maxEdgeCount = 15;
public double pruningFactor = 0.5;
boolean invert = false;
- private List<QueryTree<N>> rest;
-
public QueryTree<N> generalise(QueryTree<N> queryTree){
QueryTree<N> copy = new QueryTreeImpl<N>(queryTree);
@@ -30,9 +26,9 @@
// removeStatementsWithProperty(copy, OWL.sameAs.getURI());
// retainTypeEdges(copy);
- pruneTree(copy, pruningFactor);
+ return pruneTree(copy, pruningFactor);
- return copy;
+// return copy;
}
public void setMaxEdgeCount(int maxEdgeCount){
@@ -61,29 +57,75 @@
}
- private void pruneTree(QueryTree<N> tree, double limit){
- logger.info("Pruning tree:");
-// logger.info(tree.getStringRepresentation());
- logger.info("Number of triple pattern: " + ((QueryTreeImpl<N>)tree).getTriplePatternCount());
-// logger.info(((QueryTreeImpl<N>)tree).getSPARQLQueryTree().getStringRepresentation());
- int childCountBefore = tree.getChildCount();
+ private QueryTree<N> pruneTree(QueryTree<N> tree, double limit){
+ if(logger.isInfoEnabled()){
+ logger.info("Pruning tree:");
+// logger.info(tree.getStringRepresentation());
+ logger.info("Number of triple pattern: " + ((QueryTreeImpl<N>)tree).getTriplePatternCount());
+// logger.info(((QueryTreeImpl<N>)tree).getSPARQLQueryTree().getStringRepresentation());
+ }
- List<QueryTree<N>> children = new ArrayList<QueryTree<N>>(tree.getChildren());
-// Collections.shuffle(children);
- QueryTree<N> child;
- for(Iterator<QueryTree<N>> iter = children.iterator(); iter.hasNext(); ){
- child = iter.next();
- logger.info("Removing child: " + child);
- tree.removeChild((QueryTreeImpl<N>) child);
- if( (tree.getChildCount()) <= maxEdgeCount
- && (double)tree.getChildCount()/childCountBefore <= limit){
- break;
- }
+ tree = ((QueryTreeImpl<N>)tree).getSPARQLQueryTree();
+
+ int edgeCount = tree.getChildrenClosure().size()-1;
+ if( edgeCount > maxEdgeCount){
+ removeLeafs(tree, edgeCount-maxEdgeCount);
+ } else {
+ removeLeafs(tree, edgeCount/2);
}
+ return tree;
+// List<QueryTree<N>> children = new ArrayList<QueryTree<N>>(tree.getChildren());
+// QueryTree<N> child;
+// for(Iterator<QueryTree<N>> iter = children.iterator(); iter.hasNext(); ){
+// child = iter.next();
+// if(logger.isInfoEnabled()){
+// logger.info("Removing child: " + child);
+// }
+// tree.removeChild((QueryTreeImpl<N>) child);
+// int newEdgeCount = tree.getUserObjectClosure().size()-1;
+// if( newEdgeCount <= maxEdgeCount
+// && (double)newEdgeCount/edgeCount <= limit){
+// break;
+// }
+// }
+// return tree;
}
+ private void removeLeafs(QueryTree<N> tree, int cnt){
+ int level = tree.getMaxDepth();
+
+ while(cnt > 0){
+ for(QueryTree<N> leaf : getLeafsAtLevel(tree, level)){
+ if(logger.isInfoEnabled()){
+ logger.info("Removing edge [" +
+ leaf.getParent().getUserObject() + "--" + leaf.getParent().getEdge(leaf) + "-->" + leaf.getUserObject() + "]");
+ }
+ leaf.getParent().removeChild((QueryTreeImpl<N>) leaf);
+ cnt--;
+ if(cnt == 0){
+ break;
+ }
+ }
+ level--;
+ }
+ if(logger.isInfoEnabled()){
+ logger.info(tree.getStringRepresentation());
+ }
+ }
+
+ private List<QueryTree<N>> getLeafsAtLevel(QueryTree<N> tree, int level){
+ List<QueryTree<N>> leafs = new ArrayList<QueryTree<N>>();
+ for(QueryTree<N> leaf : tree.getLeafs()){
+ if(leaf.getPathToRoot().size() == level){
+ leafs.add(leaf);
+ }
+ }
+
+ return leafs;
+ }
+
private void retainTypeEdges(QueryTree<N> tree){
for(QueryTree<N> child : tree.getChildren()){
if(!tree.getEdge(child).equals(RDF.type.toString())){
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java 2010-12-13 17:32:21 UTC (rev 2549)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java 2010-12-13 18:05:53 UTC (rev 2550)
@@ -218,9 +218,11 @@
ps.setDouble(9, lggTime);
ps.setDouble(10, nbrTime);
+ logger.info(ps.toString());
+
ps.executeUpdate();
} catch (SQLException e) {
- System.err.println(e.getMessage());
+ logger.error(e);
e.printStackTrace();
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/datastructures/QueryTree.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/datastructures/QueryTree.java 2010-12-13 17:32:21 UTC (rev 2549)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/datastructures/QueryTree.java 2010-12-13 18:05:53 UTC (rev 2550)
@@ -62,6 +62,8 @@
void sortChildren(Comparator<QueryTree<N>> comparator);
int getChildCount();
+
+ int getMaxDepth();
boolean isRoot();
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java 2010-12-13 17:32:21 UTC (rev 2549)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java 2010-12-13 18:05:53 UTC (rev 2550)
@@ -156,7 +156,10 @@
private void learnPosOnly(){
resultQueries.clear();
if(posQueryTrees.size() == 2 || newPosExample != null){
- logger.debug("Computing LGG ...");
+ if(logger.isDebugEnabled()){
+ logger.debug("Computing LGG ...");
+ }
+
Monitor monitor = MonitorFactory.getTimeMonitor("LGG monitor");
monitor.start();
@@ -170,9 +173,11 @@
newPosExample = null;
- logger.debug("LGG");
- logger.debug(lgg.getStringRepresentation());
- logger.debug("LGG computation time: " + monitor.getTotal() + " ms");
+ if(logger.isDebugEnabled()){
+ logger.debug("LGG");
+ logger.debug(lgg.getStringRepresentation());
+ logger.debug("LGG computation time: " + monitor.getTotal() + " ms");
+ }
}
resultQueries.add(lgg.toSPARQLQueryString(true));
@@ -182,7 +187,10 @@
private void learnPosNeg(){
resultQueries.clear();
if(newPosExample != null){
- logger.info("Computing LGG ...");
+ if(logger.isDebugEnabled()){
+ logger.debug("Computing LGG ...");
+ }
+
Monitor lggMonitor = MonitorFactory.getTimeMonitor("LGG monitor");
lggMonitor.start();
@@ -196,9 +204,11 @@
newPosExample = null;
- logger.info("LGG");
- logger.info(lgg.getStringRepresentation());
- logger.info("LGG computation time: " + lggMonitor.getTotal() + " ms");
+ if(logger.isDebugEnabled()){
+ logger.debug("LGG");
+ logger.debug(lgg.getStringRepresentation());
+ logger.debug("LGG computation time: " + lggMonitor.getTotal() + " ms");
+ }
}
@@ -208,16 +218,19 @@
int i = 1;
for(QueryTree<String> nbr : nbrGenerator.getNBRs(lgg, negQueryTrees)){
- logger.info("NBR " + i++);
- logger.info(nbr.getStringRepresentation());
+ if(logger.isDebugEnabled()){
+ logger.debug("NBR " + i++);
+ logger.debug(nbr.getStringRepresentation());
+ }
resultQueries.add(nbr.toSPARQLQueryString(true));
resultTrees.add(nbr);
}
nbrMonitor.stop();
+ if(logger.isDebugEnabled()){
+ logger.debug("Time to make NBR: " + nbrMonitor.getTotal() + " ms");
+ }
- logger.info("Time to make NBR: " + nbrMonitor.getTotal() + " ms");
-
}
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java 2010-12-13 17:32:21 UTC (rev 2549)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java 2010-12-13 18:05:53 UTC (rev 2550)
@@ -61,11 +61,19 @@
public QueryTree<N> getLGG(List<QueryTree<N>> trees, boolean learnFilters) {
List<QueryTree<N>> treeList = new ArrayList<QueryTree<N>>(trees);
- logger.info("Computing LGG for");
+ if(logger.isInfoEnabled()){
+ logger.info("Computing LGG for");
+ }
+
for(int i = 0; i < treeList.size(); i++){
- logger.info(treeList.get(i).getStringRepresentation());
+ if(logger.isInfoEnabled()){
+ logger.info(treeList.get(i).getStringRepresentation());
+ }
+
if(i != treeList.size() - 1){
- logger.info("and");
+ if(logger.isInfoEnabled()){
+ logger.info("and");
+ }
}
}
@@ -75,16 +83,24 @@
Monitor mon = MonitorFactory.getTimeMonitor("LGG");
mon.start();
QueryTree<N> lgg = computeLGG(treeList.get(0), treeList.get(1), learnFilters);
- logger.info("LGG for 1 and 2:\n" + lgg.getStringRepresentation());
+ if(logger.isInfoEnabled()){
+ logger.info("LGG for 1 and 2:\n" + lgg.getStringRepresentation());
+ }
+
for(int i = 2; i < treeList.size(); i++){
lgg = computeLGG(lgg, treeList.get(i), learnFilters);
- logger.info("LGG for 1-" + (i+1) + ":\n" + lgg.getStringRepresentation());
+ if(logger.isInfoEnabled()){
+ logger.info("LGG for 1-" + (i+1) + ":\n" + lgg.getStringRepresentation());
+ }
}
mon.stop();
- logger.info("LGG = ");
- logger.info(lgg.getStringRepresentation());
+ if(logger.isInfoEnabled()){
+ logger.info("LGG = ");
+ logger.info(lgg.getStringRepresentation());
+ }
+
return lgg;
}
@@ -167,8 +183,10 @@
}
}
}
- logger.debug("Computed LGG:");
- logger.debug(lgg.getStringRepresentation());
+ if(logger.isDebugEnabled()){
+ logger.debug("Computed LGG:");
+ logger.debug(lgg.getStringRepresentation());
+ }
return lgg;
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java 2010-12-13 17:32:21 UTC (rev 2549)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java 2010-12-13 18:05:53 UTC (rev 2550)
@@ -27,17 +27,18 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.log4j.Logger;
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
import org.dllearner.sparqlquerygenerator.datastructures.impl.QueryTreeImpl;
-import com.hp.hpl.jena.sparql.function.library.e;
-
/**
*
* @author Lorenz Bühmann
*
*/
public class GreedyNBRStrategy<N> implements NBRStrategy<N>{
+
+ private static final Logger logger = Logger.getLogger(GreedyNBRStrategy.class);
@Override
public QueryTree<N> computeNBR(QueryTree<N> posExampleTree,
@@ -68,7 +69,9 @@
// }
// }
//
- System.out.println(printTreeWithValues(nbr, matrix));
+ if(logger.isInfoEnabled()){
+ logger.info(printTreeWithValues(nbr, matrix));
+ }
List<QueryTree<N>> candidates2Remove = new ArrayList<QueryTree<N>>();
@@ -180,6 +183,11 @@
}
}
setMatrixEntry(matrix, child1, index, entry);
+ if(entry == 1){
+ for(QueryTree<N> child : posTree.getChildrenClosure()){
+ setMatrixEntry(matrix, child, index, 0);
+ }
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-12-13 18:45:53
|
Revision: 2551
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2551&view=rev
Author: lorenz_b
Date: 2010-12-13 18:45:46 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
Avoiding using positive generalisation if negative examples exist.
Modified Paths:
--------------
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/SPARQLQueryGeneratorCached.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-12-13 18:05:53 UTC (rev 2550)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-12-13 18:45:46 UTC (rev 2551)
@@ -1,6 +1,7 @@
package org.dllearner.autosparql.server;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -288,9 +289,9 @@
}
if(logger.isInfoEnabled()){
logger.info("None of the queries contained a new example.");
- logger.info("Changing to Generalisation...");
+ logger.info("Making again NBR...");
}
- return findExampleByGeneralisation(queryGen.getLastLGG());
+ return findExampleByLGG(Collections.singletonList(queryGen.getCurrentQueryTree()), negExamplesTrees);
}
private Example getExample(String uri){
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java 2010-12-13 18:05:53 UTC (rev 2550)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java 2010-12-13 18:45:46 UTC (rev 2551)
@@ -65,7 +65,7 @@
Logger.getLogger(SPARQLQueryGeneratorImpl.class).setLevel(Level.OFF);
Logger.getLogger(LGGGeneratorImpl.class).setLevel(Level.OFF);
Logger.getLogger(NBRGeneratorImpl.class).setLevel(Level.OFF);
- Logger.getLogger(Generalisation.class).setLevel(Level.INFO);
+ Logger.getLogger(Generalisation.class).setLevel(Level.OFF);
SPARQLEndpointEx endpoint = new SPARQLEndpointEx(
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/SPARQLQueryGeneratorCached.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/SPARQLQueryGeneratorCached.java 2010-12-13 18:05:53 UTC (rev 2550)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/SPARQLQueryGeneratorCached.java 2010-12-13 18:45:46 UTC (rev 2551)
@@ -43,5 +43,7 @@
List<String> getSPARQLQueries(List<QueryTree<String>> posExamples, List<QueryTree<String>> negExamples, boolean learnFilters);
QueryTree<String> getLastLGG();
+
+ QueryTree<String> getCurrentQueryTree();
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java 2010-12-13 18:05:53 UTC (rev 2550)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java 2010-12-13 18:45:46 UTC (rev 2551)
@@ -232,5 +232,9 @@
}
}
+
+ public QueryTree<String> getCurrentQueryTree(){
+ return resultTrees.get(0);
+ }
}
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java 2010-12-13 18:05:53 UTC (rev 2550)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/lgg/LGGGeneratorImpl.java 2010-12-13 18:45:46 UTC (rev 2551)
@@ -80,8 +80,7 @@
if(trees.size() == 1){
return trees.iterator().next();
}
- Monitor mon = MonitorFactory.getTimeMonitor("LGG");
- mon.start();
+
QueryTree<N> lgg = computeLGG(treeList.get(0), treeList.get(1), learnFilters);
if(logger.isInfoEnabled()){
logger.info("LGG for 1 and 2:\n" + lgg.getStringRepresentation());
@@ -93,7 +92,6 @@
logger.info("LGG for 1-" + (i+1) + ":\n" + lgg.getStringRepresentation());
}
}
- mon.stop();
if(logger.isInfoEnabled()){
logger.info("LGG = ");
@@ -111,6 +109,8 @@
logger.debug("and");
logger.debug(tree2.getStringRepresentation());
}
+ Monitor mon = MonitorFactory.getTimeMonitor("LGG");
+ mon.start();
QueryTree<N> lgg = new QueryTreeImpl<N>(tree1.getUserObject());
// if(!lgg.getUserObject().equals(tree2.getUserObject())){
@@ -183,8 +183,9 @@
}
}
}
+ mon.stop();
if(logger.isDebugEnabled()){
- logger.debug("Computed LGG:");
+ logger.debug("Computed LGG(" + mon.getLastValue() + "ms):");
logger.debug(lgg.getStringRepresentation());
}
return lgg;
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java 2010-12-13 18:05:53 UTC (rev 2550)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/operations/nbr/strategy/GreedyNBRStrategy.java 2010-12-13 18:45:46 UTC (rev 2551)
@@ -31,6 +31,9 @@
import org.dllearner.sparqlquerygenerator.datastructures.QueryTree;
import org.dllearner.sparqlquerygenerator.datastructures.impl.QueryTreeImpl;
+import com.jamonapi.Monitor;
+import com.jamonapi.MonitorFactory;
+
/**
*
* @author Lorenz Bühmann
@@ -43,13 +46,8 @@
@Override
public QueryTree<N> computeNBR(QueryTree<N> posExampleTree,
List<QueryTree<N>> negExampleTrees) {
-// Map<QueryTree<N>, Integer> tree2Index = new Hashtable<QueryTree<N>, Integer>();
-// int rowIndex = 0;
-// for(QueryTree<N> child : posExampleTree.getChildrenClosure()){
-// tree2Index.put(child, rowIndex);
-// rowIndex++;
-// }
-// int[][] matrix = new int[rowIndex][negExampleTrees.size()];
+ Monitor mon = MonitorFactory.getTimeMonitor("NBR");
+ mon.start();
QueryTree<N> nbr = new QueryTreeImpl<N>(posExampleTree);
Map<QueryTree<N>, List<Integer>> matrix = new HashMap<QueryTree<N>, List<Integer>>();
@@ -58,23 +56,11 @@
checkTree(matrix, nbr, negExampleTrees.get(i), i);
}
- int sum;
-// for(int row = 0; row < matrix.length; row++){
-// sum = 0;
-// for(int column = 0; column < matrix[row].length; column++){
-// sum += matrix[row][column];
-// }
-// if(sum < negExampleTrees.size()/2){
-// nbr.removeChild(tree2Index.get(key));
-// }
-// }
-//
if(logger.isInfoEnabled()){
logger.info(printTreeWithValues(nbr, matrix));
}
List<QueryTree<N>> candidates2Remove = new ArrayList<QueryTree<N>>();
-
for(Entry<QueryTree<N>, List<Integer>> entry : matrix.entrySet()){
if(sum(entry.getValue()) < negExampleTrees.size()/2.0){
candidates2Remove.add(entry.getKey());
@@ -82,6 +68,8 @@
}
removeLeafs(nbr, candidates2Remove);
+ mon.stop();
+
return nbr;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-12-13 20:36:40
|
Revision: 2554
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2554&view=rev
Author: lorenz_b
Date: 2010-12-13 20:36:33 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
Some fixes for eval.
Modified Paths:
--------------
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java
trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-12-13 19:54:28 UTC (rev 2553)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/ExampleFinder.java 2010-12-13 20:36:33 UTC (rev 2554)
@@ -162,8 +162,12 @@
if(testedQueries.contains(currentQuery) && !currentQueryTree.getChildren().isEmpty()){
return findExampleByGeneralisation(currentQueryTree);
} else {
- result = selectCache.executeSelectQuery(endpoint, getLimitedQuery(currentQuery, (posExamples.size()+negExamples.size()+1), true));
- testedQueries.add(currentQuery);
+ if(currentQueryTree.getChildren().isEmpty()){
+ result = selectCache.executeSelectQuery(endpoint, getLimitedQuery("SELECT ?x0 WHERE {?x0 ?y ?z.FILTER(REGEX(?x0,'http://dbpedia.org/resource'))}", (posExamples.size()+negExamples.size()+1), true));
+ } else {
+ result = selectCache.executeSelectQuery(endpoint, getLimitedQuery(currentQuery, (posExamples.size()+negExamples.size()+1), true));
+ testedQueries.add(currentQuery);
+ }
}
} catch (Exception e) {
@@ -252,12 +256,13 @@
List<String> queries = queryGen.getSPARQLQueries(posExamplesTrees, negExamplesTrees);
for(String query : queries){
- if(testedQueries.contains(query)){
+ if(!queryGen.getCurrentQueryTree().getChildren().isEmpty() && testedQueries.contains(query)){
if(logger.isInfoEnabled()){
logger.info("Skipping query because it was already tested before:\n" + query);
}
continue;
}
+
if(logger.isInfoEnabled()){
logger.info("Trying query");
logger.info(query);
@@ -266,8 +271,12 @@
String result = "";
try {
- result = selectCache.executeSelectQuery(endpoint, getLimitedQuery(currentQuery, (posExamples.size()+negExamples.size()+1), true));
- testedQueries.add(currentQuery);
+ if(queryGen.getCurrentQueryTree().getChildren().isEmpty()){
+ result = selectCache.executeSelectQuery(endpoint, getLimitedQuery("SELECT ?x0 WHERE {?x0 ?y ?z.FILTER(REGEX(?x0,'http://dbpedia.org/resource'))}", (posExamples.size()+negExamples.size()+1), true));
+ } else {
+ result = selectCache.executeSelectQuery(endpoint, getLimitedQuery(currentQuery, (posExamples.size()+negExamples.size()+1), true));
+ testedQueries.add(currentQuery);
+ }
} catch (Exception e) {
e.printStackTrace();
throw new SPARQLQueryException(e, encodeHTML(query));
@@ -291,8 +300,8 @@
logger.info("None of the queries contained a new example.");
logger.info("Making Generalisation...");
}
- return findExampleByGeneralisation(queryGen.getCurrentQueryTree());
-// return findExampleByLGG(Collections.singletonList(queryGen.getCurrentQueryTree()), negExamplesTrees);
+// return findExampleByGeneralisation(queryGen.getCurrentQueryTree());
+ return findExampleByLGG(Collections.singletonList(queryGen.getCurrentQueryTree()), negExamplesTrees);
}
private Example getExample(String uri){
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java 2010-12-13 19:54:28 UTC (rev 2553)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/Generalisation.java 2010-12-13 20:36:33 UTC (rev 2554)
@@ -71,7 +71,12 @@
if( edgeCount > maxEdgeCount){
removeLeafs(tree, edgeCount-maxEdgeCount);
} else {
- removeLeafs(tree, edgeCount/2);
+ if(edgeCount == 1){
+ removeLeafs(tree, 1);
+ } else {
+ removeLeafs(tree, edgeCount/2);
+ }
+
}
return tree;
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java 2010-12-13 19:54:28 UTC (rev 2553)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java 2010-12-13 20:36:33 UTC (rev 2554)
@@ -32,6 +32,7 @@
import org.dllearner.sparqlquerygenerator.impl.SPARQLQueryGeneratorImpl;
import org.dllearner.sparqlquerygenerator.operations.lgg.LGGGeneratorImpl;
import org.dllearner.sparqlquerygenerator.operations.nbr.NBRGeneratorImpl;
+import org.dllearner.sparqlquerygenerator.operations.nbr.strategy.GreedyNBRStrategy;
import org.dllearner.sparqlquerygenerator.util.ModelGenerator;
import org.ini4j.IniFile;
@@ -65,8 +66,9 @@
Logger.getLogger(SPARQLQueryGeneratorImpl.class).setLevel(Level.OFF);
Logger.getLogger(LGGGeneratorImpl.class).setLevel(Level.OFF);
Logger.getLogger(NBRGeneratorImpl.class).setLevel(Level.OFF);
+ Logger.getLogger(GreedyNBRStrategy.class).setLevel(Level.OFF);
Logger.getLogger(Generalisation.class).setLevel(Level.OFF);
- Logger.getLogger(ExampleFinder.class).setLevel(Level.OFF);
+ Logger.getLogger(ExampleFinder.class).setLevel(Level.INFO);
SPARQLEndpointEx endpoint = new SPARQLEndpointEx(
@@ -115,6 +117,9 @@
//iterate over the queries
int testedCnt = 0;
int learnedCnt = 0;
+ int mostGeneralQueryCount = 0;
+ String mostGeneralQuery = "SELECT ?x0 WHERE {?x0 ?y ?z.}";
+ boolean failed = false;
while(queries.next()){
id = queries.getInt("id");
query = queries.getString("query");
@@ -123,7 +128,8 @@
MonitorFactory.getTimeMonitor("Query").reset();
MonitorFactory.getTimeMonitor("LGG").reset();
MonitorFactory.getTimeMonitor("NBR").reset();
-
+ mostGeneralQueryCount = 0;
+ failed = false;
try {
//send query to SPARQLEndpoint
rs = SparqlQuery.convertJSONtoResultSet(selectQueriesCache.executeSelectQuery(endpoint, query));
@@ -164,31 +170,43 @@
negExamples.add(nextExample);
logger.info("Suggested example is considered as negative example.");
}
- if(learnedQuery.equals(exampleFinder.getCurrentQuery())){
- continue;
+
+ if(learnedQuery.equals(mostGeneralQuery)){
+ mostGeneralQueryCount++;
+ } else {
+ mostGeneralQueryCount = 0;
}
+ if(mostGeneralQueryCount == 10){
+ logger.info("Breaking because seems to be that we run into an infinite loop");
+ failed = true;
+ break;
+ }
+
learnedQuery = exampleFinder.getCurrentQuery();
logger.info("Learned query:\n" + learnedQuery);
equivalentQueries = isEquivalentQuery(resources, learnedQuery, endpoint);
logger.info("Original query and learned query are equivalent: " + equivalentQueries);
} while(!equivalentQueries);
- int posExamplesCount = posExamples.size();
- int negExamplesCount = negExamples.size();
- int examplesCount = posExamplesCount + negExamplesCount;
- double queryTime = MonitorFactory.getTimeMonitor("Query").getTotal();
- double lggTime = MonitorFactory.getTimeMonitor("LGG").getTotal();
- double nbrTime = MonitorFactory.getTimeMonitor("NBR").getTotal();
- double totalTime = queryTime + nbrTime + lggTime;
+ if(!failed){
+ int posExamplesCount = posExamples.size();
+ int negExamplesCount = negExamples.size();
+ int examplesCount = posExamplesCount + negExamplesCount;
+ double queryTime = MonitorFactory.getTimeMonitor("Query").getTotal();
+ double lggTime = MonitorFactory.getTimeMonitor("LGG").getTotal();
+ double nbrTime = MonitorFactory.getTimeMonitor("NBR").getTotal();
+ double totalTime = queryTime + nbrTime + lggTime;
+
+ write2DB(ps, id, query, learnedQuery,
+ examplesCount, posExamplesCount, negExamplesCount,
+ totalTime, queryTime, lggTime, nbrTime);
+ logger.info("Number of examples needed: "
+ + (posExamples.size() + negExamples.size())
+ + "(+" + posExamples.size() + "/-" + negExamples.size() + ")");
+ learnedCnt++;
+ }
- write2DB(ps, id, query, learnedQuery,
- examplesCount, posExamplesCount, negExamplesCount,
- totalTime, queryTime, lggTime, nbrTime);
- logger.info("Number of examples needed: "
- + (posExamples.size() + negExamples.size())
- + "(+" + posExamples.size() + "/-" + negExamples.size() + ")");
- learnedCnt++;
-// if(testedCnt == 200){
+// if(testedCnt == 50){
// break;
// }
} catch (Exception e) {
@@ -236,6 +254,9 @@
* @return
*/
private static boolean isEquivalentQuery(SortedSet<String> originalResources, String query, SparqlEndpoint endpoint){
+ if(query.equals("SELECT ?x0 WHERE {?x0 ?y ?z.}")){
+ return false;
+ }
QueryEngineHTTP qexec = new QueryEngineHTTP(endpoint.getURL().toString(), query);
for (String dgu : endpoint.getDefaultGraphURIs()) {
qexec.addDefaultGraph(dgu);
Modified: trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java
===================================================================
--- trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java 2010-12-13 19:54:28 UTC (rev 2553)
+++ trunk/sparql-query-generator/src/main/java/org/dllearner/sparqlquerygenerator/impl/SPARQLQueryGeneratorCachedImpl.java 2010-12-13 20:36:33 UTC (rev 2554)
@@ -155,6 +155,7 @@
private void learnPosOnly(){
resultQueries.clear();
+ resultTrees.clear();
if(posQueryTrees.size() == 2 || newPosExample != null){
if(logger.isDebugEnabled()){
logger.debug("Computing LGG ...");
@@ -186,6 +187,7 @@
private void learnPosNeg(){
resultQueries.clear();
+ resultTrees.clear();
if(newPosExample != null){
if(logger.isDebugEnabled()){
logger.debug("Computing LGG ...");
@@ -210,6 +212,9 @@
logger.debug("LGG computation time: " + lggMonitor.getTotal() + " ms");
}
}
+ if(posQueryTrees.size() == 1){
+ lgg = posQueryTrees.get(0);
+ }
Monitor nbrMonitor = MonitorFactory.getTimeMonitor("NBR monitor");
@@ -225,7 +230,6 @@
resultQueries.add(nbr.toSPARQLQueryString(true));
resultTrees.add(nbr);
}
-
nbrMonitor.stop();
if(logger.isDebugEnabled()){
logger.debug("Time to make NBR: " + nbrMonitor.getTotal() + " ms");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2010-12-14 07:04:53
|
Revision: 2558
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2558&view=rev
Author: lorenz_b
Date: 2010-12-14 05:34:05 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
Added monitor to query cache.
Added more metrics for evaluation.
Modified Paths:
--------------
trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/ExtractionDBCache.java
Modified: trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java
===================================================================
--- trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java 2010-12-14 05:13:15 UTC (rev 2557)
+++ trunk/autosparql/src/main/java/org/dllearner/autosparql/server/evaluation/EvaluationScript.java 2010-12-14 05:34:05 UTC (rev 2558)
@@ -96,8 +96,8 @@
PreparedStatement ps = conn.prepareStatement("INSERT INTO evaluation (" +
"id, original_query, learned_query, triple_pattern_count," +
"examples_needed, pos_examples_needed, neg_examples_needed," +
- "total_time_in_ms, query_time_in_ms, lgg_time_in_ms, nbr_time_in_ms) " +
- "VALUES(?,?,?,?,?,?,?,?,?,?,?)");
+ "total_time_in_ms, query_time_in_ms, query_time_avg, lgg_time_in_ms, lgg_time_avg, nbr_time_in_ms, nbr_time_avg) " +
+ "VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
//fetch all queries from table 'tmp', where the number of results is lower than 2000
Statement st = conn.createStatement();
@@ -204,11 +204,14 @@
double queryTime = MonitorFactory.getTimeMonitor("Query").getTotal();
double lggTime = MonitorFactory.getTimeMonitor("LGG").getTotal();
double nbrTime = MonitorFactory.getTimeMonitor("NBR").getTotal();
+ double queryTimeAvg = MonitorFactory.getTimeMonitor("Query").getAvg();
+ double lggTimeAvg = MonitorFactory.getTimeMonitor("LGG").getAvg();
+ double nbrTimeAvg = MonitorFactory.getTimeMonitor("NBR").getAvg();
double totalTime = queryTime + nbrTime + lggTime;
write2DB(ps, id, query, learnedQuery, triplePatternCount,
examplesCount, posExamplesCount, negExamplesCount,
- totalTime, queryTime, lggTime, nbrTime);
+ totalTime, queryTime, queryTimeAvg, lggTime, lggTimeAvg, nbrTime, nbrTimeAvg);
logger.info("Number of examples needed: "
+ (posExamples.size() + negExamples.size())
+ "(+" + posExamples.size() + "/-" + negExamples.size() + ")");
@@ -223,17 +226,17 @@
}
}
logger.info("Learned " + learnedCnt + " of " + testedCnt + " queries");
- logger.info("Time to compute LGG(total): " + MonitorFactory.getTimeMonitor("LGG").getTotal());
- logger.info("Time to compute LGG(avg): " + MonitorFactory.getTimeMonitor("LGG").getAvg());
- logger.info("Time to compute LGG(min): " + MonitorFactory.getTimeMonitor("LGG").getMin());
- logger.info("Time to compute LGG(max): " + MonitorFactory.getTimeMonitor("LGG").getMax());
+ logger.info(MonitorFactory.getTimeMonitor("Query"));
+ logger.info(MonitorFactory.getTimeMonitor("LGG"));
+ logger.info(MonitorFactory.getTimeMonitor("NBR"));
}
private static void write2DB(PreparedStatement ps,
int id, String originalQuery, String learnedQuery, int triplePatternCount,
int examplesCount, int posExamplesCount, int negExamplesCount,
- double totalTime, double queryTime, double lggTime, double nbrTime){
+ double totalTime, double queryTime, double queryTimeAvg,
+ double lggTime, double lggTimeAvg, double nbrTime, double nbrTimeAvg){
try {
ps.setInt(1, id);
ps.setString(2, originalQuery);
@@ -244,8 +247,11 @@
ps.setInt(7, negExamplesCount);
ps.setDouble(8, totalTime);
ps.setDouble(9, queryTime);
- ps.setDouble(10, lggTime);
- ps.setDouble(11, nbrTime);
+ ps.setDouble(10, queryTimeAvg);
+ ps.setDouble(11, lggTime);
+ ps.setDouble(12, lggTimeAvg);
+ ps.setDouble(13, nbrTime);
+ ps.setDouble(14, nbrTimeAvg);
ps.executeUpdate();
} catch (SQLException e) {
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/ExtractionDBCache.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/ExtractionDBCache.java 2010-12-14 05:13:15 UTC (rev 2557)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/ExtractionDBCache.java 2010-12-14 05:34:05 UTC (rev 2558)
@@ -39,6 +39,8 @@
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
+import com.jamonapi.Monitor;
+import com.jamonapi.MonitorFactory;
/**
* The class is used to cache information about resources to a database.
@@ -63,6 +65,8 @@
MessageDigest md5;
+ private Monitor mon = MonitorFactory.getTimeMonitor("Query");
+
public ExtractionDBCache(String cacheDir) {
databaseDirectory = cacheDir;
try {
@@ -95,6 +99,7 @@
}
public Model executeConstructQuery(SparqlEndpoint endpoint, String query) throws SQLException, UnsupportedEncodingException {
+ mon.start();
byte[] md5 = md5(query);
// Timestamp currTS = new Timestamp(new java.util.Date().getTime());
PreparedStatement ps=conn.prepareStatement("SELECT * FROM QUERY_CACHE WHERE QUERYHASH=? LIMIT 1");
@@ -151,7 +156,7 @@
ps2.setClob(3, new StringReader(modelStr));
ps2.setTimestamp(4, new java.sql.Timestamp(new java.util.Date().getTime()));
}
-
+ mon.stop();
ps2.executeUpdate();
return m2;
@@ -159,7 +164,10 @@
}
public String executeSelectQuery(SparqlEndpoint endpoint, String query) {
+
try {
+
+ mon.start();
byte[] md5 = md5(query);
PreparedStatement ps=conn.prepareStatement("SELECT * FROM QUERY_CACHE WHERE QUERYHASH=? LIMIT 1");
ps.setBytes(1, md5);
@@ -199,13 +207,15 @@
ps2.setClob(3, new StringReader(json));
ps2.setTimestamp(4, new java.sql.Timestamp(new java.util.Date().getTime()));
}
-
+ mon.stop();
ps2.executeUpdate();
return json;
}
} catch(SQLException e) {
e.printStackTrace();
return null;
+ } finally{
+ mon.stop();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X