Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2396] trunk
|
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.
|
