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

[<ku...@us...>]

Revision: 750
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=750&view=rev
Author:   kurzum
Date:     2008-04-02 03:31:31 -0700 (Wed, 02 Apr 2008)

Log Message:
-----------
some more changes to the option doc generator, still not perfect

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/cli/Start.java
    trunk/src/dl-learner/org/dllearner/core/ComponentManager.java
    trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java

Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/Start.java	2008-04-01 11:48:39 UTC (rev 749)
+++ trunk/src/dl-learner/org/dllearner/cli/Start.java	2008-04-02 10:31:31 UTC (rev 750)
@@ -224,9 +224,12 @@
 		componentPrefixMapping.put(SparqlKnowledgeSource.class, "sparql");
 		// reasoners
 		componentPrefixMapping.put(DIGReasoner.class, "digReasoner");
+		componentPrefixMapping.put(FastInstanceChecker.class, "fastInstanceChecker");
 		componentPrefixMapping.put(OWLAPIReasoner.class, "owlAPIReasoner");
 		// learning problems - configured via + and - flags for examples
 		componentPrefixMapping.put(PosNegDefinitionLP.class, "posNegDefinitionLP");
+		componentPrefixMapping.put(PosNegInclusionLP.class, "posNegInclusionLP");
+		componentPrefixMapping.put(PosOnlyDefinitionLP.class, "posOnlyDefinitionLP");
 		// learning algorithms
 		componentPrefixMapping.put(ROLearner.class, "refinement");
 		componentPrefixMapping.put(ExampleBasedROLComponent.class, "refexamples");

Modified: trunk/src/dl-learner/org/dllearner/core/ComponentManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ComponentManager.java	2008-04-01 11:48:39 UTC (rev 749)
+++ trunk/src/dl-learner/org/dllearner/core/ComponentManager.java	2008-04-02 10:31:31 UTC (rev 750)
@@ -40,6 +40,7 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import org.dllearner.cli.Start;
 import org.dllearner.core.config.ConfigEntry;
 import org.dllearner.core.config.ConfigOption;
 import org.dllearner.core.config.InvalidConfigOptionValueException;
@@ -421,31 +422,43 @@
 	private String getComponentConfigString(Class<? extends Component> component) {
 		String componentDescription =  "component: " + invokeStaticMethod(component,"getName") + " (" + component.getName() + ")";
 		String str = componentDescription + "\n";
+		String CLI = getCLIMapping(component.getSuperclass().getSimpleName()+"");
 		String usage ="";
 		
-		//usage =  invokeStaticMethod(component,"getUsage")+"";
-		
-		
-		/*if(usage.equals("null")) {
-			System.out.println("Component "+component.getName()+" needs Usage definition");
+		Map<Class<? extends Component>, String> m=Start.createComponentPrefixMapping();
+		for (Class<? extends Component> c : m.keySet()) {
+			if(c.getCanonicalName().equals(component.getCanonicalName()))
+			{	usage=m.get(c);
+			}
 		}
-		else	{
-			System.out.println(usage +" |in| "+ component.getName());
+	
+		for(int i=0; i<componentDescription.length(); i++) {
+			str += "=";
 		}
-		*/
-		
-		for(int i=0; i<componentDescription.length(); i++)
-			str += "=";
 		str += "\n\n";
+		str += "CLI usage: "+CLI+" = "+usage+";\n\n";
 		
-		//str += "Usage:\n"+usage+"\n\n";
 		
 		for(ConfigOption<?> option : componentOptions.get(component)) {
-			str += option.toString() + "\n";
+			str += option.toString() + 
+			"CLI usage: "+usage+"."+
+			option.getName()+" = "+option.getDefaultValue()+
+			";\n\n";
 		}		
-		return str;
+		return str+"\n";
 	}
 	
+	public static String getCLIMapping(String componentSuperClass){
+		HashMap<String, String> m = new HashMap<String, String>();
+		m.put("KnowledgeSource", "import");
+		m.put("ReasonerComponent", "reasoner");
+		m.put("PosNegLP", "problem");
+		m.put("PosOnlyLP", "problem");
+		m.put("LearningAlgorithm", "algorithm");
+		return m.get(componentSuperClass);
+	}
+	
+	
 	private Object invokeStaticMethod(Class<?> clazz, String methodName, Object... args) {
 		// unfortunately Java does not seem to offer a way to call
 		// a static method given a class object directly, so we have

Modified: trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java	2008-04-01 11:48:39 UTC (rev 749)
+++ trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java	2008-04-02 10:31:31 UTC (rev 750)
@@ -77,10 +77,12 @@
 
 	public abstract boolean isValidValue(T value);
 
+	//TODO maybe change the function getClass in the options to get simpleName
 	public String getAllowedValuesDescription() {
 		return getClass().toString();
 	}
 
+	
 	@Override
 	public String toString() {
 		return "option name: " + name + "\ndescription: " + description + "\nvalues: "


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