Made method to print Refinement tree more generic.

SmartDataAnalytics · Feb 15, 2016 · 44558d6 · 44558d6
1 parent bc05fdf
commit 44558d6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java b/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java
@@ -801,7 +801,7 @@ private void writeSearchTree(TreeSet<OWLClassExpression> refinements) {
 				treeString.append("   ").append(ref).append("\n");
 			}
 		}
-		treeString.append(TreeUtils.toTreeString(searchTree, baseURI, prefixes)).append("\n");
+		treeString.append(TreeUtils.toTreeString(searchTree)).append("\n");
 
 		// replace or append
 		if (replaceSearchTree) {

diff --git a/components-core/src/main/java/org/dllearner/algorithms/celoe/PCELOE.java b/components-core/src/main/java/org/dllearner/algorithms/celoe/PCELOE.java
@@ -836,7 +836,7 @@ private void writeSearchTree(TreeSet<OWLClassExpression> refinements) {
 				treeString.append("   ").append(ref).append("\n");
 			}
 		}
-		treeString.append(TreeUtils.toTreeString(searchTree, baseURI, prefixes)).append("\n");
+		treeString.append(TreeUtils.toTreeString(searchTree)).append("\n");
 
 		// replace or append
 		if (replaceSearchTree) {

diff --git a/components-core/src/main/java/org/dllearner/utilities/TreeUtils.java b/components-core/src/main/java/org/dllearner/utilities/TreeUtils.java
@@ -18,32 +18,31 @@
  */
 package org.dllearner.utilities;
 
-import java.util.Map;
-
-import org.dllearner.algorithms.celoe.OENode;
+import org.dllearner.core.AbstractSearchTreeNode;
 import org.dllearner.utilities.datastructures.AbstractSearchTree;
 
+import java.util.Map;
+
 public class TreeUtils {
 
-	public static String toTreeString(AbstractSearchTree<OENode> tree,
-			String baseURI, Map<String, String> prefixes) {
-		return TreeUtils.toTreeString(tree.getRoot(), baseURI, prefixes);
+	public static String toTreeString(
+			AbstractSearchTree<? extends AbstractSearchTreeNode<? extends AbstractSearchTreeNode>> tree) {
+		return TreeUtils.toTreeString(tree.getRoot());
 	}
-	public static String toTreeString(OENode node,
-			String baseURI, Map<String, String> prefixes) {
-		return TreeUtils.toTreeString(node, 0, baseURI, prefixes).toString();
+	public static String toTreeString(AbstractSearchTreeNode<? extends AbstractSearchTreeNode> node) {
+		return TreeUtils.toTreeString(node, 0).toString();
 	}
 
-	private static StringBuilder toTreeString(OENode node,
-			int depth, String baseURI, Map<String, String> prefixes) {
+	private static StringBuilder toTreeString(AbstractSearchTreeNode<? extends AbstractSearchTreeNode> node,
+			int depth) {
 		StringBuilder treeString = new StringBuilder();
 		for(int i=0; i<depth-1; i++)
 			treeString.append("  ");
 		if(depth!=0)
 			treeString.append("|--> ");
-		treeString.append(node.getShortDescription(baseURI, prefixes)).append("\n");
-		for(OENode child : node.getChildren()) {
-			treeString.append(TreeUtils.toTreeString(child, depth+1, baseURI, prefixes));
+		treeString.append(node.toString()).append("\n");
+		for(AbstractSearchTreeNode child : node.getChildren()) {
+			treeString.append(TreeUtils.toTreeString(child, depth+1));
 		}
 		return treeString;
 	}