[DL-Learner SVN] SF.net SVN: dl-learner: [443] trunk/src/dl-learner/org/dllearner

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

Revision: 443
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=443&view=rev
Author:   jenslehmann
Date:     2008-01-28 11:15:03 -0800 (Mon, 28 Jan 2008)

Log Message:
-----------
- fixed useRetrievalForClassification option
- fixed warnings

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/cli/Start.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
    trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java
    trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java

Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/Start.java	2008-01-28 18:28:59 UTC (rev 442)
+++ trunk/src/dl-learner/org/dllearner/cli/Start.java	2008-01-28 19:15:03 UTC (rev 443)
@@ -92,6 +92,8 @@
  */
 public class Start {
 
+	private static Logger logger = Logger.getRootLogger();	
+	
 	/**
 	 * Entry point for CLI interface.
 	 * 
@@ -109,7 +111,6 @@
 		// its messages to the console)
 		SimpleLayout layout = new SimpleLayout();
 		ConsoleAppender consoleAppender = new ConsoleAppender(layout);
-		Logger logger = Logger.getRootLogger();
 		logger.removeAllAppenders();
 		logger.addAppender(consoleAppender);
 		logger.setLevel(Level.INFO);
@@ -287,7 +288,7 @@
 		// the name of the option is suboption-part (the first part refers
 		// to its component)
 		String optionName = option.getSubOption();
-
+		
 		ConfigOption<?> configOption = cm.getConfigOption(component.getClass(), optionName);
 		// check whether such an option exists
 		if (configOption != null) {
@@ -522,8 +523,8 @@
 	}
 
 	private static void initComponent(ComponentManager cm, Component component) {
-		System.out.print("initialising component \"" + cm.getComponentName(component.getClass())
-				+ "\" ... ");
+		String startMessage = "initialising component \"" + cm.getComponentName(component.getClass())
+				+ "\" ... ";
 		long initStartTime = System.nanoTime();
 		component.init();
 		// standard messsage is just "OK" but can be more detailed for certain
@@ -538,7 +539,7 @@
 		}
 
 		long initTime = System.nanoTime() - initStartTime;
-		System.out.println(message + " (" + Helper.prettyPrintNanoSeconds(initTime, false, false)
+		logger.info(startMessage + message + " (" + Helper.prettyPrintNanoSeconds(initTime, false, false)
 				+ ")");
 	}
 

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2008-01-28 18:28:59 UTC (rev 442)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2008-01-28 19:15:03 UTC (rev 443)
@@ -25,12 +25,9 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.Map;
-import java.util.Random;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
@@ -64,7 +61,6 @@
  */
 public class SparqlKnowledgeSource extends KnowledgeSource {
 
-	private Map<Integer, String[][]> queryResult = new HashMap<Integer, String[][]>();
 	// ConfigOptions
 	public URL url;
 	// String host;

Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java	2008-01-28 18:28:59 UTC (rev 442)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java	2008-01-28 19:15:03 UTC (rev 443)
@@ -19,12 +19,14 @@
  */
 package org.dllearner.learningproblems;
 
+import java.util.Collection;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
 import org.dllearner.core.ReasoningService;
 import org.dllearner.core.Score;
+import org.dllearner.core.config.ConfigOption;
 import org.dllearner.core.dl.Concept;
 import org.dllearner.core.dl.Individual;
 import org.dllearner.utilities.Helper;
@@ -63,6 +65,10 @@
 		return "two valued definition learning problem";
 	}
 
+	public static Collection<ConfigOption<?>> createConfigOptions() {
+		return PosNegLP.createConfigOptions();
+	}
+	
 	/**
 	 * This method computes (using the reasoner) whether a concept is too weak.
 	 * If it is not weak, it returns the number of covered negative example. It

Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java	2008-01-28 18:28:59 UTC (rev 442)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java	2008-01-28 19:15:03 UTC (rev 443)
@@ -112,9 +112,9 @@
 		else if (name.equals("negativeExamples"))
 			negativeExamples = CommonConfigMappings
 					.getIndividualSet((Set<String>) entry.getValue());
-		else if (name.equals("useRetrievalForClassification"))
+		else if (name.equals("useRetrievalForClassficiation")) {
 			useRetrievalForClassification = (Boolean) entry.getValue();
-		else if (name.equals("percentPerLengthUnit"))
+		} else if (name.equals("percentPerLengthUnit"))
 			percentPerLengthUnit = (Double) entry.getValue();
 		else if (name.equals("useMultiInstanceChecks")) {
 			String value = (String) entry.getValue();


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