[DL-Learner SVN] SF.net SVN: dl-learner:[2607] trunk

[<jen...@us...>]

Revision: 2607
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2607&view=rev
Author:   jenslehmann
Date:     2011-01-12 14:01:09 +0000 (Wed, 12 Jan 2011)

Log Message:
-----------
some changes to observe LGG

Modified Paths:
--------------
    trunk/autosparql/src/test/java/org/dllearner/autosparql/server/NBRTest.java
    trunk/components-core/src/main/java/org/dllearner/utilities/Helper.java

Modified: trunk/autosparql/src/test/java/org/dllearner/autosparql/server/NBRTest.java
===================================================================
--- trunk/autosparql/src/test/java/org/dllearner/autosparql/server/NBRTest.java	2011-01-12 13:43:38 UTC (rev 2606)
+++ trunk/autosparql/src/test/java/org/dllearner/autosparql/server/NBRTest.java	2011-01-12 14:01:09 UTC (rev 2607)
@@ -247,7 +247,7 @@
 			negTrees.add(tree);
 			
 //			logger.debug("Pos trees:\n " + printTrees(posTrees));
-			logger.info("Positive examples: " + Helper.getAbbreviatedList(posExamples, baseURI, prefixes));
+			logger.info("Positive examples: " + Helper.getAbbreviatedCollection(posExamples, baseURI, prefixes));
 			
 			QueryTree<String> lgg = lggGen.getLGG(posTrees);
 			
@@ -256,6 +256,7 @@
 			
 			while(!isEquivalentQuery(targetResources, learnedQuery, endpoint, cache)){
 				logger.info("#Resources in LGG: " + getResultCount(lgg.toSPARQLQueryString(), endpoint, cache));
+//				logger.info("#Resources in LGG: " + Helper.getAbbreviatedCollection(getResult(lgg.toSPARQLQueryString(), endpoint, cache),baseURI,prefixes));
 				logger.info("#Resources in POST-LGG: " + getResultCount(nbrGen.getPostLGG().toSPARQLQueryString(), endpoint, cache));
 				uri = example.getURI();
 				knownResources.add(uri);
@@ -271,7 +272,7 @@
 					logger.info("Found new negative example " + uri);
 					negTrees.add(tree);
 				}
-				logger.info("Positive examples: " + Helper.getAbbreviatedList(posExamples, baseURI, prefixes));
+				logger.info("Positive examples: " + Helper.getAbbreviatedCollection(posExamples, baseURI, prefixes));
 //				logger.debug("Pos trees:\n " + printTrees(posTrees));
 				example = nbrGen.getQuestionOptimised(lgg, negTrees, knownResources);
 				learnedQuery = nbrGen.getQuery();
@@ -301,7 +302,7 @@
 		
 	}
 	
-	private int getResultCount(String query, SparqlEndpoint endpoint, ExtractionDBCache cache){
+	private SortedSet<String> getResult(String query, SparqlEndpoint endpoint, ExtractionDBCache cache){
 		com.hp.hpl.jena.query.ResultSet rs = SparqlQuery.convertJSONtoResultSet(cache.executeSelectQuery(endpoint, getDistinctQuery(query)));
 		SortedSet<String> resources = new TreeSet<String>();
 		QuerySolution qs;
@@ -311,7 +312,11 @@
 				resources.add(qs.get("x0").asResource().getURI());
 			}
 		}
-		return resources.size();
+		return resources;
+	}	
+	
+	private int getResultCount(String query, SparqlEndpoint endpoint, ExtractionDBCache cache){
+		return getResult(query, endpoint, cache).size();
 	}
 	
 	private boolean isEquivalentQuery(SortedSet<String> originalResources, String query, SparqlEndpoint endpoint, ExtractionDBCache cache){

Modified: trunk/components-core/src/main/java/org/dllearner/utilities/Helper.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/Helper.java	2011-01-12 13:43:38 UTC (rev 2606)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/Helper.java	2011-01-12 14:01:09 UTC (rev 2607)
@@ -19,6 +19,7 @@
  */
 package org.dllearner.utilities;
 
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -145,7 +146,7 @@
 	 *            value.
 	 * @return A list with shortened URIs.
 	 */
-	public static String getAbbreviatedList(List<String> list, String baseURI,
+	public static String getAbbreviatedCollection(Collection<String> list, String baseURI,
 			Map<String, String> prefixes) {
 		StringBuffer str = new StringBuffer("[");
 		Iterator<String> it = list.iterator(); // easier to implement using an iterator than foreach


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