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

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

Revision: 4079
          http://sourceforge.net/p/dl-learner/code/4079
Author:   lorenz_b
Date:     2013-09-04 16:44:09 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
Removed dir loading.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/SemanticIndex.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/semantic/SemanticIndex.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/SemanticIndex.java	2013-09-04 16:33:44 UTC (rev 4078)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/SemanticIndex.java	2013-09-04 16:44:09 UTC (rev 4079)
@@ -48,14 +48,24 @@
 				this.semanticAnnotator = semanticAnnotator;
 	}
 	
+	public SemanticIndex() {
+}
+	
 	/**
+	 * @param semanticAnnotator the semanticAnnotator to set
+	 */
+	public void setSemanticAnnotator(SemanticAnnotator semanticAnnotator) {
+		this.semanticAnnotator = semanticAnnotator;
+	}
+	
+	/**
 	 * Precompute the whole index, i.e. iterate over all entities and compute all annotated documents.
 	 */
 	public void buildIndex(Set<TextDocument> documents){
 		logger.info("Creating semantic index...");
 		index = new HashMap<Entity, Set<AnnotatedDocument>>();
 		for (TextDocument document : documents) {
-			logger.debug("Processing document:\n" + document);
+			logger.info("Processing document:\n" + document);
 			AnnotatedDocument annotatedDocument = semanticAnnotator.processDocument(document);
 			for (Entity entity : annotatedDocument.getContainedEntities()) {
 				Set<AnnotatedDocument> existingAnnotatedDocuments = index.get(entity);

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:33:44 UTC (rev 4078)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/simple/SimpleSemanticIndex.java	2013-09-04 16:44:09 UTC (rev 4079)
@@ -4,13 +4,12 @@
 package org.dllearner.algorithms.isle.index.semantic.simple;
 
 import org.dllearner.algorithms.isle.SimpleWordSenseDisambiguation;
-import org.dllearner.algorithms.isle.index.SimpleEntityCandidateGenerator;
+import org.dllearner.algorithms.isle.index.SemanticAnnotator;
 import org.dllearner.algorithms.isle.index.SimpleEntityCandidatesTrie;
-import org.dllearner.algorithms.isle.index.SimpleLinguisticAnnotator;
 import org.dllearner.algorithms.isle.index.TrieEntityCandidateGenerator;
+import org.dllearner.algorithms.isle.index.TrieLinguisticAnnotator;
 import org.dllearner.algorithms.isle.index.semantic.SemanticIndex;
 import org.dllearner.algorithms.isle.index.syntactic.SyntacticIndex;
-import org.dllearner.algorithms.isle.textretrieval.AnnotationEntityTextRetriever;
 import org.dllearner.algorithms.isle.textretrieval.RDFSLabelEntityTextRetriever;
 import org.semanticweb.owlapi.model.OWLOntology;
 
@@ -30,11 +29,11 @@
      * @param syntacticIndex index to query for documents containing the labels
      */
     public SimpleSemanticIndex(OWLOntology ontology, SyntacticIndex syntacticIndex) {
-        super(ontology,
-                syntacticIndex,
+    	SimpleEntityCandidatesTrie trie = new SimpleEntityCandidatesTrie(new RDFSLabelEntityTextRetriever(ontology), ontology);
+    	setSemanticAnnotator(new SemanticAnnotator(
                 new SimpleWordSenseDisambiguation(ontology),
-                new TrieEntityCandidateGenerator(ontology, new SimpleEntityCandidatesTrie(new RDFSLabelEntityTextRetriever(ontology), ontology)),
-                new SimpleLinguisticAnnotator());
+                new TrieEntityCandidateGenerator(ontology, trie),
+                new TrieLinguisticAnnotator(trie)));
 
     }
 

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