[DL-Learner SVN] SF.net SVN: dl-learner:[3820] trunk/components-ext/src/main/java/org/ dllearner/algorithm/tbsl

[<lor...@us...>]

Revision: 3820
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3820&view=rev
Author:   lorenz_b
Date:     2012-08-09 12:47:29 +0000 (Thu, 09 Aug 2012)
Log Message:
-----------
Got rid of annoying NPE.

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner2.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java

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-08-09 10:46:16 UTC (rev 3819)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner2.java	2012-08-09 12:47:29 UTC (rev 3820)
@@ -787,11 +787,11 @@
 									List<SPARQL_Triple> typeTriples = wQ.getQuery().getRDFTypeTriples(typeVar);
 									for(SPARQL_Triple typeTriple : typeTriples){
 										String typeURI = typeTriple.getValue().getName().replace("<", "").replace(">", "");
-										List<Entry<String, Integer>> mostFrequentProperties = UnknownPropertyHelper.getMostFrequentProperties(endpoint, cache, typeURI, resourceURI, direction);
-										for(Entry<String, Integer> property : mostFrequentProperties){
-											wQ.getQuery().replaceVarWithURI(slot.getAnchor(), property.getKey());
-											wQ.setScore(wQ.getScore() + 0.1);
-										}
+//										List<Entry<String, Integer>> mostFrequentProperties = UnknownPropertyHelper.getMostFrequentProperties(endpoint, cache, typeURI, resourceURI, direction);
+//										for(Entry<String, Integer> property : mostFrequentProperties){
+//											wQ.getQuery().replaceVarWithURI(slot.getAnchor(), property.getKey());
+//											wQ.setScore(wQ.getScore() + 0.1);
+//										}
 									}
 									
 								}

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java	2012-08-09 10:46:16 UTC (rev 3819)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java	2012-08-09 12:47:29 UTC (rev 3820)
@@ -51,7 +51,8 @@
                     if (clashing != null && s.type.equals(clashing)) {
                         for (SPARQL_Triple triple : query.conditions) {
                             if (triple.property.toString().equals("?"+s.anchor)) {
-                                if (triple.value.toString().equals("?"+var)) return null;
+                                if (triple.value.toString().equals("?"+var))
+                                	return null;
                             }
                         }
                     }

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java	2012-08-09 10:46:16 UTC (rev 3819)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java	2012-08-09 12:47:29 UTC (rev 3820)
@@ -382,8 +382,9 @@
                		
                		try {
                			Template temp = d2s.convert(drs,slots);
+               			temp = temp.checkandrefine();
                			if (temp == null) {continue;}
-                                       temp = temp.checkandrefine();
+                                       
                			
                			
        					if (USE_WORDNET) { // find WordNet synonyms

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.