From: <ku...@us...> - 2008-05-26 10:37:58
|
Revision: 927 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=927&view=rev Author: kurzum Date: 2008-05-26 03:37:56 -0700 (Mon, 26 May 2008) Log Message: ----------- fixed all immanent warnings Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticPositiveExampleFinderSPARQL.java trunk/src/dl-learner/org/dllearner/utilities/examples/SPARQLTasks.java trunk/src/dl-learner/org/dllearner/utilities/learn/LearnSparql.java Removed Paths: ------------- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderRolesSPARQL.java Deleted: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderRolesSPARQL.java =================================================================== --- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderRolesSPARQL.java 2008-05-26 09:49:09 UTC (rev 926) +++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderRolesSPARQL.java 2008-05-26 10:37:56 UTC (rev 927) @@ -1,113 +0,0 @@ -package org.dllearner.utilities.examples; - -// keep this class it still needs to be worked in -public class AutomaticExampleFinderRolesSPARQL { - -// private static Logger logger = Logger -// .getLogger(ComponentManager.class); -// -// private Cache c; -// private SparqlEndpoint se; -// private SortedSet<String> posExamples; -// private SortedSet<String> negExamples; -// private int roleLimit=1000; - - /* - public AutomaticExampleFinderRolesSPARQL(SparqlEndpoint se){ - this.c=new Cache("cachetemp"); - this.se=se; - posExamples = new TreeSet<String>(); - negExamples = new TreeSet<String>(); - } - - public void initDomainRange(String role, int poslimit, int neglimit) { - makePositiveExamplesAsDomain( role); - SortedSet<String> keepForClean = new TreeSet<String>(); - keepForClean.addAll(this.posExamples); - this.posExamples = SetManipulation.fuzzyShrink(this.posExamples, poslimit); - logger.trace("shrinking: pos Example size: "+posExamples.size()); - - makeNegativeExamplesAsRange( role); - - - //clean - negExamples.removeAll(keepForClean); - logger.trace("neg Example size after cleaning: "+negExamples.size()); - this.negExamples = SetManipulation.fuzzyShrink(negExamples, neglimit); - logger.debug("pos Example size after shrinking: "+posExamples.size()); - logger.debug("neg Example size after shrinking: "+negExamples.size()); - logger.debug("Finished examples for role: "+role); - } - - - - - private void makePositiveExamplesAsDomain(String role){ - logger.debug("making Positive Examples from Role as Domain: "+role); - this.posExamples.addAll(getDomain( role, roleLimit)); - logger.debug(" pos Example size: "+posExamples.size()); - } - - private void makeNegativeExamplesAsRange(String role){ - logger.debug("making Negative Examples from Role as Range: "+role); - this.negExamples.addAll(getRange( role, roleLimit)); - logger.debug(" neg Example size: "+negExamples.size()); - } - - private SortedSet<String> getDomain(String role,int limit){ - - String query = "" + - "SELECT DISTINCT ?domain " + - "WHERE { \n" + - "?domain <" + role + "> " + " ?o. \n" + - "?domain a []\n." + - "FILTER (!isLiteral(?domain))." + - "}\n" + - "LIMIT "+limit; - - - String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se))); - ResultSet rs =SparqlQuery.JSONtoResultSet(JSON); - JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs); - return rsc.getStringListForVariable("domain"); - - } - - private SortedSet<String> getRange(String role,int limit){ - - String query = "" + - "SELECT DISTINCT ?range " + - "WHERE { \n" + - "?s <" + role + "> " + " ?range. \n" + - "?range a [].\n" + - "FILTER (!isLiteral(?range))." + - "}\n" + - "LIMIT "+limit; - - - String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se))); - ResultSet rs =SparqlQuery.JSONtoResultSet(JSON); - JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs); - return rsc.getStringListForVariable("range"); - - } - - - - - - - public SortedSet<String> getPosExamples() { - return posExamples; - } - - public SortedSet<String> getNegExamples() { - return negExamples; - } - - - - */ - - -} Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java =================================================================== --- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-05-26 09:49:09 UTC (rev 926) +++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-05-26 10:37:56 UTC (rev 927) @@ -5,13 +5,8 @@ import org.apache.log4j.Logger; import org.dllearner.core.ComponentManager; -import org.dllearner.kb.sparql.Cache; -import org.dllearner.kb.sparql.SparqlEndpoint; -import org.dllearner.kb.sparql.SparqlQuery; import org.dllearner.utilities.datastructures.SetManipulation; -import com.hp.hpl.jena.query.ResultSet; - public class AutomaticNegativeExampleFinderSPARQL { // CHECK @@ -21,25 +16,20 @@ private SortedSet<String> fullPositiveSet; - //static boolean useRelated = false; - private SortedSet<String> fromRelated; - //static boolean useSuperClasses = false; - private SortedSet<String> fromSuperclasses; - //static boolean useParallelClasses = true; - private SortedSet<String> fromParallelClasses; + private SortedSet<String> fromRelated = new TreeSet<String>(); + private SortedSet<String> fromSuperclasses = new TreeSet<String>();; + private SortedSet<String> fromParallelClasses = new TreeSet<String>();; + private SortedSet<String> fromDomain = new TreeSet<String>();; + private SortedSet<String> fromRange = new TreeSet<String>();; static int poslimit = 10; static int neglimit = 20; - // CHECK all vars needed + // CHECK separate posexamples and fullposset public AutomaticNegativeExampleFinderSPARQL( SortedSet<String> fullPositiveSet, SPARQLTasks st) { super(); - this.fromParallelClasses = new TreeSet<String>(); - this.fromRelated = new TreeSet<String>(); - this.fromSuperclasses = new TreeSet<String>(); - this.fullPositiveSet = fullPositiveSet; this.sparqltasks = st; @@ -80,8 +70,8 @@ } - // QUALITY: weird function, best removed - public void dbpediaMakeNegativeExamplesFromRelatedInstances(String subject) { + // QUALITY: keep a while may still be needed + /*public void dbpediaMakeNegativeExamplesFromRelatedInstances(String subject) { // SortedSet<String> result = new TreeSet<String>(); String SPARQLquery = "SELECT * WHERE { \n" + "<" + subject + "> " + "?p ?o. \n" @@ -90,7 +80,7 @@ this.fromRelated.addAll(sparqltasks.queryAsSet(SPARQLquery, "o")); - } + }*/ public void makeNegativeExamplesFromParallelClasses(SortedSet<String> positiveSet, int resultLimit){ makeNegativeExamplesFromClassesOfInstances(positiveSet, resultLimit); @@ -141,5 +131,22 @@ this.fromSuperclasses.removeAll(this.fullPositiveSet); logger.debug("|-neg Example from superclass: " + fromSuperclasses.size()); } + + @SuppressWarnings("unused") + private void makeNegativeExamplesFromDomain(String role, int resultLimit){ + logger.debug("making Negative Examples from Domain of : "+role); + this.fromDomain.addAll(sparqltasks.getDomain(role, resultLimit)); + this.fromDomain.removeAll(this.fullPositiveSet); + logger.debug("|-neg Example size from Domain: "+this.fromDomain.size()); + } + + @SuppressWarnings("unused") + private void makeNegativeExamplesFromRange(String role, int resultLimit){ + logger.debug("making Negative Examples from Range of : "+role); + this.fromRange.addAll(sparqltasks.getRange(role, resultLimit)); + this.fromRange.removeAll(this.fullPositiveSet); + logger.debug("|-neg Example size from Range: "+this.fromRange.size()); + } + } Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticPositiveExampleFinderSPARQL.java =================================================================== --- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticPositiveExampleFinderSPARQL.java 2008-05-26 09:49:09 UTC (rev 926) +++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticPositiveExampleFinderSPARQL.java 2008-05-26 10:37:56 UTC (rev 927) @@ -5,8 +5,6 @@ import org.apache.log4j.Logger; import org.dllearner.core.ComponentManager; -import org.dllearner.kb.sparql.Cache; -import org.dllearner.kb.sparql.SparqlEndpoint; public class AutomaticPositiveExampleFinderSPARQL { @@ -47,7 +45,22 @@ this.posExamples = sparqltasks.retrieveInstancesForSKOSConcept(SKOSConcept, 0); logger.debug("pos Example size: "+posExamples.size()); } - + + @SuppressWarnings("unused") + public void makePositiveExamplesFromDomain(String role, int resultLimit){ + logger.debug("making Positive Examples from Domain of : "+role); + this.posExamples.addAll(sparqltasks.getDomain(role, resultLimit)); + logger.debug("pos Example size: "+posExamples.size()); + } + + @SuppressWarnings("unused") + public void makePositiveExamplesFromRange(String role, int resultLimit){ + logger.debug("making Positive Examples from Range of : "+role); + this.posExamples.addAll(sparqltasks.getRange(role, resultLimit)); + logger.debug("pos Example size: "+posExamples.size()); + } + + public SortedSet<String> getPosExamples() { return posExamples; } Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/SPARQLTasks.java =================================================================== --- trunk/src/dl-learner/org/dllearner/utilities/examples/SPARQLTasks.java 2008-05-26 09:49:09 UTC (rev 926) +++ trunk/src/dl-learner/org/dllearner/utilities/examples/SPARQLTasks.java 2008-05-26 10:37:56 UTC (rev 927) @@ -17,6 +17,7 @@ public class SPARQLTasks { //CHECK + @SuppressWarnings("unused") private static Logger logger = Logger .getLogger(SPARQLTasks.class); private Cache c; @@ -163,6 +164,38 @@ + public SortedSet<String> getDomain(String role,int resultLimit){ + + String SPARQLquery = "" + + "SELECT DISTINCT ?domain " + + "WHERE { \n" + + "?domain <" + role + "> " + " ?o. \n" + + "?domain a []\n." + + "FILTER (!isLiteral(?domain))." + + "}\n" + limit(resultLimit); + + return queryAsSet(SPARQLquery, "domain"); + + + } + + + public SortedSet<String> getRange(String role,int resultLimit){ + + String SPARQLquery = "" + + "SELECT DISTINCT ?range " + + "WHERE { \n" + + "?s <" + role + "> " + " ?range. \n" + + "?range a [].\n" + + "FILTER (!isLiteral(?range))." + + "}\n" + limit(resultLimit); + + return queryAsSet(SPARQLquery, "range"); + + } + + + /** * query a pattern with a standard SPARQL query * usage (?subject, ?predicate, <http:something> , subject ) @@ -225,11 +258,12 @@ return ""; } - @SuppressWarnings("unchecked") + public static SortedSet<String> getStringListForVariable(ResultSet rs, String var){ SortedSet<String> result = new TreeSet<String>(); //String s=ResultSetFormatter.asXMLString(this.rs); + @SuppressWarnings("unchecked") List<ResultBinding> l = ResultSetFormatter.toList(rs); for (ResultBinding resultBinding : l) { Modified: trunk/src/dl-learner/org/dllearner/utilities/learn/LearnSparql.java =================================================================== --- trunk/src/dl-learner/org/dllearner/utilities/learn/LearnSparql.java 2008-05-26 09:49:09 UTC (rev 926) +++ trunk/src/dl-learner/org/dllearner/utilities/learn/LearnSparql.java 2008-05-26 10:37:56 UTC (rev 927) @@ -1,8 +1,6 @@ package org.dllearner.utilities.learn; import java.util.HashSet; -import java.util.Iterator; -import java.util.List; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; @@ -14,7 +12,6 @@ import org.dllearner.core.LearningProblem; import org.dllearner.core.ReasonerComponent; import org.dllearner.core.ReasoningService; -import org.dllearner.core.owl.Description; import org.dllearner.kb.sparql.SparqlKnowledgeSource; import org.dllearner.learningproblems.PosNegDefinitionLP; import org.dllearner.learningproblems.PosNegLP; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |