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

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

Revision: 4087
          http://sourceforge.net/p/dl-learner/code/4087
Author:   lorenz_b
Date:     2013-09-05 09:10:33 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
Added printing.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/isle/ISLE.java
    trunk/components-core/src/main/java/org/dllearner/algorithms/isle/NLPHeuristic.java
    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
    trunk/components-core/src/main/java/org/dllearner/algorithms/isle/textretrieval/AnnotationEntityTextRetriever.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/ISLE.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/ISLE.java	2013-09-05 08:52:49 UTC (rev 4086)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/ISLE.java	2013-09-05 09:10:33 UTC (rev 4087)
@@ -81,7 +81,7 @@
 @ComponentAnn(name="ISLE", shortName="isle", version=0.5, description="CELOE is an adapted and extended version of the OCEL algorithm applied for the ontology engineering use case. See http://jens-lehmann.org/files/2011/celoe.pdf for reference.")
 public class ISLE extends AbstractCELA {
 
-	private static Logger logger = Logger.getLogger(CELOE.class);
+	private static Logger logger = Logger.getLogger(ISLE.class);
 //	private CELOEConfigurator configurator;
 	
 	private boolean isRunning = false;

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/NLPHeuristic.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/NLPHeuristic.java	2013-09-05 08:52:49 UTC (rev 4086)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/NLPHeuristic.java	2013-09-05 09:10:33 UTC (rev 4087)
@@ -107,19 +107,19 @@
 		score -= node.getRefinementCount() * nodeRefinementPenalty;
 		
 		
-		//the NLP based scoring
-//		Description expression = node.getExpression();
-////		OWLClassExpression owlapiDescription = OWLAPIConverter.getOWLAPIDescription(expression);
-////		Set<Entity> entities = OWLAPIConverter.getEntities(owlapiDescription.getSignature());
-//		Set<Entity> entities = expression.getSignature();
-//		double sum = 0;
-//		for (Entity entity : entities) {
-//			double relevance = entityRelevance.containsKey(entity) ? entityRelevance.get(entity) : 0;
-//			if(!Double.isInfinite(relevance)){
-//				sum += relevance;
-//			}
-//		}
-//		score += nlpBonusFactor * sum;
+//		the NLP based scoring
+		Description expression = node.getExpression();System.out.println(expression);
+//		OWLClassExpression owlapiDescription = OWLAPIConverter.getOWLAPIDescription(expression);
+//		Set<Entity> entities = OWLAPIConverter.getEntities(owlapiDescription.getSignature());
+		Set<Entity> entities = expression.getSignature();
+		double sum = 0;
+		for (Entity entity : entities) {
+			double relevance = entityRelevance.containsKey(entity) ? entityRelevance.get(entity) : 0;System.out.println(entity + ":" + relevance);
+			if(!Double.isInfinite(relevance)){
+				sum += relevance;
+			}
+		}
+		score += nlpBonusFactor * sum;
 		
 		return score;
 	}

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-05 08:52:49 UTC (rev 4086)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/SemanticIndex.java	2013-09-05 09:10:33 UTC (rev 4087)
@@ -75,6 +75,7 @@
                 }
                 existingAnnotatedDocuments.add(annotatedDocument);
             }
+            logger.info("Annotated document:" + annotatedDocument);
         }
         logger.info("...done.");
     }

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-05 08:52:49 UTC (rev 4086)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/simple/SimpleSemanticIndex.java	2013-09-05 09:10:33 UTC (rev 4087)
@@ -31,6 +31,7 @@
     public SimpleSemanticIndex(OWLOntology ontology, SyntacticIndex syntacticIndex) {
         super(ontology);
         SimpleEntityCandidatesTrie trie = new SimpleEntityCandidatesTrie(new RDFSLabelEntityTextRetriever(ontology), ontology);
+        trie.printTrie();
         setSemanticAnnotator(new SemanticAnnotator(
                 new SimpleWordSenseDisambiguation(ontology),
                 new TrieEntityCandidateGenerator(ontology, trie),

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/textretrieval/AnnotationEntityTextRetriever.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/textretrieval/AnnotationEntityTextRetriever.java	2013-09-05 08:52:49 UTC (rev 4086)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/textretrieval/AnnotationEntityTextRetriever.java	2013-09-05 09:10:33 UTC (rev 4087)
@@ -82,7 +82,7 @@
 				if (annotation.getValue() instanceof OWLLiteral) {
 		            OWLLiteral val = (OWLLiteral) annotation.getValue();
 		            if (val.hasLang(language)) {
-		            	String label = val.getLiteral();
+		            	String label = val.getLiteral().trim();
 		            	textWithWeight.put(label, weight);
 		            }
 		        }
@@ -92,7 +92,7 @@
 		if(textWithWeight.isEmpty() && useShortFormFallback){
 			String shortForm = sfp.getShortForm(IRI.create(entity.getURI()));
 			shortForm = Joiner.on(" ").join(LinguisticUtil.getWordsFromCamelCase(shortForm));
-			shortForm = Joiner.on(" ").join(LinguisticUtil.getWordsFromUnderscored(shortForm));
+			shortForm = Joiner.on(" ").join(LinguisticUtil.getWordsFromUnderscored(shortForm)).trim();
 			textWithWeight.put(shortForm, weight);
 		}
 		

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