From: <lor...@us...> - 2012-07-20 12:44:47
|
Revision: 3801 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3801&view=rev Author: lorenz_b Date: 2012-07-20 12:44:41 +0000 (Fri, 20 Jul 2012) Log Message: ----------- Some changes for precomputing metrics. Modified Paths: -------------- trunk/components-ext/pom.xml trunk/components-ext/src/main/java/org/dllearner/algorithm/qtl/operations/NBR.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner2.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner3.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/util/SPARQLEndpointMetrics.java trunk/components-ext/src/main/resources/tbsl/oxford_dataproperty_mappings.txt Modified: trunk/components-ext/pom.xml =================================================================== --- trunk/components-ext/pom.xml 2012-07-20 12:43:03 UTC (rev 3800) +++ trunk/components-ext/pom.xml 2012-07-20 12:44:41 UTC (rev 3801) @@ -53,7 +53,6 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>3.5.0</version> </dependency> <!--BEGIN Logging Dependencies--> @@ -155,7 +154,6 @@ <dependency> <groupId>org.ini4j</groupId> <artifactId>ini4j</artifactId> - <version>0.5.2</version> </dependency> <dependency> <groupId>net.didion.jwnl</groupId> Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/qtl/operations/NBR.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/qtl/operations/NBR.java 2012-07-20 12:43:03 UTC (rev 3800) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/qtl/operations/NBR.java 2012-07-20 12:44:41 UTC (rev 3801) @@ -40,6 +40,7 @@ import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.sparql.expr.E_Equals; import com.hp.hpl.jena.sparql.expr.E_LogicalNot; import com.hp.hpl.jena.sparql.expr.ExprVar; @@ -744,10 +745,14 @@ String uri; QuerySolution qs; + RDFNode node; while(rs.hasNext()){ qs = rs.next(); - uri = qs.getResource("x0").getURI(); - resources.add(uri); + node = qs.get("x0"); + if(node.isURIResource()){ + uri = qs.getResource("x0").getURI(); + resources.add(uri); + } } return resources; Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner2.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner2.java 2012-07-20 12:43:03 UTC (rev 3800) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner2.java 2012-07-20 12:44:41 UTC (rev 3801) @@ -286,6 +286,10 @@ this.mappingIndex = mappingIndex; } + public void setCache(ExtractionDBCache cache) { + this.cache = cache; + } + public void setKnowledgebase(Knowledgebase knowledgebase){ this.endpoint = knowledgebase.getEndpoint(); this.resourcesIndex = knowledgebase.getResourceIndex(); Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner3.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner3.java 2012-07-20 12:43:03 UTC (rev 3800) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner3.java 2012-07-20 12:44:41 UTC (rev 3801) @@ -645,7 +645,7 @@ for(SPARQL_Triple typeTriple : q.getRDFTypeTriples(varName)){ types.add(typeTriple.getValue().getName().replace(">", "").replace("<", "")); } - for(String type : types){System.out.println(type); + for(String type : types){ metrics.getGoodness(new NamedClass(type), new ObjectProperty(predicate.getName().replace(">", "").replace("<", "")), new Individual(object.getName().replace(">", "").replace("<", ""))); Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/util/SPARQLEndpointMetrics.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/util/SPARQLEndpointMetrics.java 2012-07-20 12:43:03 UTC (rev 3800) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/util/SPARQLEndpointMetrics.java 2012-07-20 12:44:41 UTC (rev 3801) @@ -362,25 +362,25 @@ } } - for(NamedClass cls1 : classes){ - for(NamedClass cls2 : classes){ - if(!cls1.equals(cls2)){ - log.info("Processing class " + cls1 + " and class " + cls2); - try { - getPMI(cls1, cls2); - getPMI(cls2, cls1); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } +// for(NamedClass cls1 : classes){ +// for(NamedClass cls2 : classes){ +// if(!cls1.equals(cls2)){ +// log.info("Processing class " + cls1 + " and class " + cls2); +// try { +// getPMI(cls1, cls2); +// getPMI(cls2, cls1); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// } +// } log.info("Done in " + ((System.currentTimeMillis() - startTime)/1000d) + "s"); } public static void main(String[] args) { - SparqlEndpoint endpoint = SparqlEndpoint.getEndpointDBpediaLiveAKSW(); - ExtractionDBCache cache = new ExtractionDBCache("/opt/tbsl/cache"); + SparqlEndpoint endpoint = SparqlEndpoint.getEndpointDBpedia(); + ExtractionDBCache cache = new ExtractionDBCache("/opt/tbsl/cache2"); String NS = "http://dbpedia.org/ontology/"; String NS_Res = "http://dbpedia.org/resource/"; Modified: trunk/components-ext/src/main/resources/tbsl/oxford_dataproperty_mappings.txt =================================================================== --- trunk/components-ext/src/main/resources/tbsl/oxford_dataproperty_mappings.txt 2012-07-20 12:43:03 UTC (rev 3800) +++ trunk/components-ext/src/main/resources/tbsl/oxford_dataproperty_mappings.txt 2012-07-20 12:44:41 UTC (rev 3801) @@ -1,5 +1,4 @@ http://www.w3.org/2006/vcard/ns#street-address|address, location, postal code -http://www.w3.org/2006/vcard/ns#locality|address, location http://purl.org/goodrelations/v1#description|description http://purl.org/goodrelations/v1#hasPrice|has price, price http://diadem.cs.ox.ac.uk/ontologies/real-estate#receptions|receptions, reception room, reception rooms \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |