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

[<dfl...@us...>]

Revision: 4077
          http://sourceforge.net/p/dl-learner/code/4077
Author:   dfleischhacker
Date:     2013-09-04 16:30:27 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
Fix usage of raw contents from documents

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/SimpleLinguisticAnnotator.java
    trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieLinguisticAnnotator.java
    trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/simple/SimpleSemanticIndex.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/SimpleLinguisticAnnotator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/SimpleLinguisticAnnotator.java	2013-09-04 16:26:24 UTC (rev 4076)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/SimpleLinguisticAnnotator.java	2013-09-04 16:30:27 UTC (rev 4077)
@@ -26,7 +26,7 @@
 
 	@Override
 	public Set<Annotation> annotate(Document document) {
-		String s = document.getRawContent().trim();
+		String s = document.getContent().trim();
 		System.out.println("Document:" + s);
 //		s = stopWordFilter.removeStopWords(s);
 		Set<Annotation> annotations = new HashSet<Annotation>();

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieLinguisticAnnotator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieLinguisticAnnotator.java	2013-09-04 16:26:24 UTC (rev 4076)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieLinguisticAnnotator.java	2013-09-04 16:30:27 UTC (rev 4077)
@@ -19,12 +19,11 @@
 	/**
 	 * Generates annotation based on trie's longest matching strings
 	 * @param document
-	 * @param candidatesTrie
 	 * @return
 	 */
 	@Override
 	public Set<Annotation> annotate(Document document) {
-		String content = document.getRawContent();
+		String content = document.getContent();
 		Set<Annotation> annotations = new HashSet<Annotation>();
 		for (int i=0; i<content.length(); i++) {
 			String unparsed = content.substring(i);

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/simple/SimpleSemanticIndex.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/simple/SimpleSemanticIndex.java	2013-09-04 16:26:24 UTC (rev 4076)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/simple/SimpleSemanticIndex.java	2013-09-04 16:30:27 UTC (rev 4077)
@@ -33,7 +33,7 @@
         super(ontology,
                 syntacticIndex,
                 new SimpleWordSenseDisambiguation(ontology),
-                new TrieEntityCandidateGenerator(ontology, new SimpleEntityCandidatesTrie(new RDFSLabelEntityTextRetriever(ontology))),
+                new TrieEntityCandidateGenerator(ontology, new SimpleEntityCandidatesTrie(new RDFSLabelEntityTextRetriever(ontology), ontology)),
                 new SimpleLinguisticAnnotator());
 
     }

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