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

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

Revision: 1209
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1209&view=rev
Author:   jenslehmann
Date:     2008-09-15 09:20:10 +0000 (Mon, 15 Sep 2008)

Log Message:
-----------
added error handling for incorrect component names in conf files

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/cli/ConfMapper.java
    trunk/src/dl-learner/org/dllearner/cli/Start.java

Modified: trunk/src/dl-learner/org/dllearner/cli/ConfMapper.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/ConfMapper.java	2008-09-15 07:59:19 UTC (rev 1208)
+++ trunk/src/dl-learner/org/dllearner/cli/ConfMapper.java	2008-09-15 09:20:10 UTC (rev 1209)
@@ -21,6 +21,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.Map.Entry;
 
@@ -148,5 +149,26 @@
 	
 	public String getComponentTypeString(Class<? extends Component> typeClass) {
 		return inverseTypeMapping.get(typeClass);
-	}		
+	}
+	
+	public Set<String> getKnowledgeSources() {
+		return knowledgeSourceMapping.keySet();
+	}
+	
+	public Set<String> getReasoners() {
+		return reasonerMapping.keySet();
+	}
+	
+	public Set<String> getLearningProblems() {
+		return learningProblemMapping.keySet();
+	}
+	
+	public Set<String> getLearningAlgorithms() {
+		return learningAlgorithmMapping.keySet();
+	}	
+	
+	public Set<String> getComponents() {
+		return componentMapping.keySet();
+	}	
+	
 }

Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/Start.java	2008-09-15 07:59:19 UTC (rev 1208)
+++ trunk/src/dl-learner/org/dllearner/cli/Start.java	2008-09-15 09:20:10 UTC (rev 1209)
@@ -216,7 +216,10 @@
 		ConfFileOption reasonerOption = parser.getConfOptionsByName("reasoner");
 		Class<? extends ReasonerComponent> rcClass;
 		if(reasonerOption != null) {
-			rcClass = confMapper.getReasonerComponentClass(reasonerOption.getStringValue()); 
+			rcClass = confMapper.getReasonerComponentClass(reasonerOption.getStringValue());
+			if(rcClass == null) {
+				handleError("Invalid value \"" + reasonerOption.getStringValue() + "\" in " + reasonerOption + ". Valid values are " + confMapper.getReasoners() + ".");
+			}			
 		} else {
 			rcClass = FastInstanceChecker.class;
 		}
@@ -231,7 +234,10 @@
 		ConfFileOption problemOption = parser.getConfOptionsByName("problem");
 		Class<? extends LearningProblem> lpClass;
 		if(problemOption != null) {
-			lpClass = confMapper.getLearningProblemClass(problemOption.getStringValue()); 
+			lpClass = confMapper.getLearningProblemClass(problemOption.getStringValue());
+			if(lpClass == null) {
+				handleError("Invalid value \"" + problemOption.getStringValue() + "\" in " + problemOption + ". Valid values are " + confMapper.getLearningProblems() + ".");
+			}			
 		} else {
 			lpClass = PosNegDefinitionLP.class;
 		}
@@ -250,7 +256,10 @@
 		ConfFileOption algorithmOption = parser.getConfOptionsByName("algorithm");
 		Class<? extends LearningAlgorithm> laClass;
 		if(problemOption != null) {
-			laClass = confMapper.getLearningAlgorithmClass(algorithmOption.getStringValue()); 
+			laClass = confMapper.getLearningAlgorithmClass(algorithmOption.getStringValue());
+			if(laClass == null) {
+				handleError("Invalid value \"" + algorithmOption.getStringValue() + "\" in " + algorithmOption + ". Valid values are " + confMapper.getLearningAlgorithms() + ".");
+			}			
 		} else {
 			laClass = ExampleBasedROLComponent.class;
 		}		


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