[DL-Learner SVN] SF.net SVN: dl-learner:[4174] trunk/components-core/src/main/java/org/ dllearner/algorithms/isle/index

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

Revision: 4174
          http://sourceforge.net/p/dl-learner/code/4174
Author:   lorenz_b
Date:     2013-11-25 09:47:35 +0000 (Mon, 25 Nov 2013)
Log Message:
-----------
ISLE.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/NormalizedTextMapper.java
    trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieEntityCandidateGenerator.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/NormalizedTextMapper.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/NormalizedTextMapper.java	2013-11-25 09:42:56 UTC (rev 4173)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/NormalizedTextMapper.java	2013-11-25 09:47:35 UTC (rev 4174)
@@ -60,6 +60,7 @@
                 curNormalizedLength += p.getNormalizedLength();
                 curOriginalLength += p.getOriginalLength();
                 if (curNormalizedLength >= length) {
+                	//TODO refactoring
 //                    return new Annotation(originalDocument, originalStart, curOriginalLength);
                 }
 

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieEntityCandidateGenerator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieEntityCandidateGenerator.java	2013-11-25 09:42:56 UTC (rev 4173)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieEntityCandidateGenerator.java	2013-11-25 09:47:35 UTC (rev 4174)
@@ -1,6 +1,8 @@
 package org.dllearner.algorithms.isle.index;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+
 import org.dllearner.algorithms.isle.EntityCandidateGenerator;
 import org.dllearner.algorithms.isle.StopWordFilter;
 import org.dllearner.core.owl.Entity;
@@ -39,6 +41,7 @@
     public void postProcess(HashMap<Annotation,Set<Entity>> candidatesMap, int window, StopWordFilter stopWordFilter) {
     	Set<Annotation> annotations = candidatesMap.keySet();
     	List<Annotation> sortedAnnotations = new ArrayList<Annotation>(annotations);
+    	//TODO refactoring
     	/**
     	  
     	
@@ -108,17 +111,10 @@
     }
 
 	private Annotation mergeAnnotations(Annotation annotation_i, Annotation annotation_j) {
-		return null;
-//		int offset;
-//		int length;
-//		if (annotation_i.getOffset() < annotation_j.getOffset()) {
-//			offset = annotation_i.getOffset();
-//			length = annotation_j.getOffset() - offset + annotation_j.getLength(); 
-//		} else {
-//			offset = annotation_j.getOffset();
-//			length = annotation_i.getOffset() - offset + annotation_i.getLength();
-//		}
-//		return new Annotation(annotation_i.getReferencedDocument(), offset, length);
+		List<Token> tokens = Lists.newArrayList();
+		tokens.addAll(annotation_i.getTokens());
+		tokens.addAll(annotation_j.getTokens());
+		return new Annotation(annotation_i.getReferencedDocument(), tokens);
 	}
 
 	@Override

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