[DL-Learner SVN] SF.net SVN: dl-learner:[4238] trunk/components-core/src/main/java/org/ dllearner/algorithms/qtl/operations

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

Revision: 4238
          http://sourceforge.net/p/dl-learner/code/4238
Author:   lorenz_b
Date:     2014-02-20 14:56:46 +0000 (Thu, 20 Feb 2014)
Log Message:
-----------
Fixed bug in QTL.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/NBR.java
    trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/PostLGG.java
    trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/lgg/LGGGeneratorImpl.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/NBR.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/NBR.java	2014-02-20 14:08:02 UTC (rev 4237)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/NBR.java	2014-02-20 14:56:46 UTC (rev 4238)
@@ -282,7 +282,13 @@
 		determiningNodeIds = getDeterminingNodeIds(lgg, negTrees);
 		logger.debug("Computing next question...");
 		postLGG = getFilteredTree(lgg);
-		PostLGG<N> postGen = new PostLGG<N>((SPARQLEndpointEx) endpoint);
+		PostLGG<N> postGen;
+		if(endpoint != null){
+			postGen = new PostLGG<N>((SPARQLEndpointEx) endpoint);
+		} else {
+			postGen = new PostLGG<N>();
+		}
+		
 		postGen.simplifyTree(postLGG, negTrees);
 		if(logger.isDebugEnabled()){
 			String treeString;
@@ -418,7 +424,7 @@
 	
 	private SortedSet<String> getAllResources(String query){
 		SortedSet<String> resources = new TreeSet<String>();
-		query = "SELECT DISTINCT " + query.substring(7) + " LIMIT 1000";
+		query = query + " LIMIT 1000";
 		
 		ResultSet rs;
 		if(selectCache == null){

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/PostLGG.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/PostLGG.java	2014-02-20 14:08:02 UTC (rev 4237)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/PostLGG.java	2014-02-20 14:56:46 UTC (rev 4238)
@@ -36,14 +36,24 @@
 		this.endpoint = endpoint;
 	}
 	
+	public PostLGG(){
+		
+	}
+	
 	public void simplifyTree(QueryTree<N> tree, List<QueryTree<N>> negTrees){
 		if(tree.getChildren().isEmpty()){
 			return;
 		}
-		System.out.println(tree.getStringRepresentation());
+		
 		if(logger.isDebugEnabled()){
+			String s;
+			if(endpoint != null){
+				s = TreeHelper.getAbbreviatedTreeRepresentation(tree, endpoint.getBaseURI(), endpoint.getPrefixes()); 
+			} else {
+				s= tree.getStringRepresentation();
+			}
 			logger.debug("Making post LGG simplification");
-			logger.debug("LGG:\n" + TreeHelper.getAbbreviatedTreeRepresentation(tree, endpoint.getBaseURI(), endpoint.getPrefixes()));
+			logger.debug("LGG:\n" + s);
 			int i = 1;
 //			for(QueryTree<N> negTree : negTrees){
 //				logger.debug("Neg tree (" + i++ + "/" + negTrees.size() +"):\n" + TreeHelper.getAbbreviatedTreeRepresentation(negTree, endpoint.getBaseURI(), endpoint.getPrefixes()));

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/lgg/LGGGeneratorImpl.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/lgg/LGGGeneratorImpl.java	2014-02-20 14:08:02 UTC (rev 4237)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/lgg/LGGGeneratorImpl.java	2014-02-20 14:56:46 UTC (rev 4238)
@@ -101,13 +101,14 @@
 		}
 		Monitor mon = MonitorFactory.getTimeMonitor("LGG");
 		mon.start();
-		QueryTree<N> lgg = getLGG(treeList.get(0), treeList.get(1), learnFilters);
+		QueryTree<N> lgg = computeLGG(treeList.get(0), treeList.get(1), learnFilters);
 		if(logger.isDebugEnabled()){
 			logger.debug("LGG for 1 and 2:\n" + lgg.getStringRepresentation());
 		}
 		
 		for(int i = 2; i < treeList.size(); i++){
-			lgg = getLGG(lgg, treeList.get(i), learnFilters);
+			nodeId = 0;
+			lgg = computeLGG(lgg, treeList.get(i), learnFilters);
 			if(logger.isDebugEnabled()){
 				logger.debug("LGG for 1-" + (i+1) + ":\n" + lgg.getStringRepresentation());
 			}

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