[DL-Learner SVN] SF.net SVN: dl-learner:[2993] trunk

[<jen...@us...>]

Revision: 2993
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2993&view=rev
Author:   jenslehmann
Date:     2011-08-04 12:21:46 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
fixed enrichment script

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/core/ComponentManager.java
    trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EnrichmentEvaluation.java

Modified: trunk/components-core/src/main/java/org/dllearner/core/ComponentManager.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/ComponentManager.java	2011-08-04 12:01:55 UTC (rev 2992)
+++ trunk/components-core/src/main/java/org/dllearner/core/ComponentManager.java	2011-08-04 12:21:46 UTC (rev 2993)
@@ -485,11 +485,11 @@
 		pool.registerComponent(la);
 		return la;
 	}
-
-	public <T extends LearningAlgorithm> T learningAlgorithm(Class<T> laClass, AbstractKnowledgeSource ks) {
-		T la = invokeConstructor(laClass, new Class[] { AbstractKnowledgeSource.class }, new Object[] { ks });
-		return la;
-	}	
+//
+//	public <T extends LearningAlgorithm> T learningAlgorithm(Class<T> laClass, KnowledgeSource ks) {
+//		T la = invokeConstructor(laClass, new Class[] { KnowledgeSource.class }, new Object[] { ks });
+//		return la;
+//	}	
 	
 	/**
 	 * The <code>ComponentManager</code> factory methods produce component

Modified: trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EnrichmentEvaluation.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EnrichmentEvaluation.java	2011-08-04 12:01:55 UTC (rev 2992)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EnrichmentEvaluation.java	2011-08-04 12:21:46 UTC (rev 2993)
@@ -19,6 +19,7 @@
  */
 package org.dllearner.scripts.evaluation;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -69,7 +70,7 @@
 		
 	}
 	
-	public void start() {
+	public void start() throws IllegalArgumentException, SecurityException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 		
 		ComponentManager cm = ComponentManager.getInstance();
 		
@@ -83,12 +84,11 @@
 		for(Class<? extends AxiomLearningAlgorithm> algorithmClass : objectPropertyAlgorithms) {
 			int objectProperties = 0;
 			for(ObjectProperty property : properties) {
-//				SubPropertyOfAxiomLearner learner = new SubPropertyOfAxiomLearner(ks);
-				AxiomLearningAlgorithm learner = cm.learningAlgorithm(algorithmClass, ks);
+
+				// dynamically invoke constructor with SPARQL knowledge source
+				AxiomLearningAlgorithm learner = algorithmClass.getConstructor(SparqlEndpointKS.class).newInstance(ks);
 				ConfigHelper.configure(learner, "propertyToDescribe", property.toString());
-				ConfigHelper.configure(learner, "maxExecutionTimeInSeconds", maxExecutionTimeInSeconds);
-				
-				
+				ConfigHelper.configure(learner, "maxExecutionTimeInSeconds", maxExecutionTimeInSeconds);				
 //				learner.setPropertyToDescribe(property);
 //				learner.setMaxExecutionTimeInSeconds(10);
 				System.out.println("Applying " + ComponentManager.getName(learner) + " on " + property + " ... ");
@@ -133,7 +133,7 @@
 		
 	}
 	
-	public static void main(String[] args) {
+	public static void main(String[] args) throws IllegalArgumentException, SecurityException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 		EnrichmentEvaluation ee = new EnrichmentEvaluation();
 		ee.start();
 		ee.printResultsPlain();


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