Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2319] trunk
|
From: <jen...@us...> - 2010-09-21 11:41:16
|
Revision: 2319
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2319&view=rev
Author: jenslehmann
Date: 2010-09-21 11:41:09 +0000 (Tue, 21 Sep 2010)
Log Message:
-----------
fixed compile errors in all modules except scripts
Modified Paths:
--------------
trunk/interfaces/src/main/java/org/dllearner/cli/DocumentationGenerator.java
trunk/interfaces/src/main/java/org/dllearner/cli/Start.java
trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParser.java
trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParserConstants.java
trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParserTokenManager.java
trunk/interfaces/src/main/java/org/dllearner/confparser/conf.jj
trunk/interfaces/src/main/java/org/dllearner/gui/Config.java
trunk/interfaces/src/test/java/org/dllearner/test/junit/ReasonerTests.java
trunk/scripts/pom.xml
Removed Paths:
-------------
trunk/scripts/src/main/java/org/dllearner/scripts/ConfigDocumentationGenerator.java
Modified: trunk/interfaces/src/main/java/org/dllearner/cli/DocumentationGenerator.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/DocumentationGenerator.java 2010-09-21 10:53:10 UTC (rev 2318)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/DocumentationGenerator.java 2010-09-21 11:41:09 UTC (rev 2319)
@@ -22,7 +22,8 @@
import java.io.File;
import org.dllearner.core.Component;
-import org.dllearner.core.ConfMapper;
+import org.dllearner.cli.ConfMapper;
+import org.dllearner.core.ComponentManager;
import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.LearningProblem;
@@ -40,6 +41,12 @@
private ConfMapper confMapper = new ConfMapper();
+ private ComponentManager cm;
+
+ public DocumentationGenerator() {
+ cm = ComponentManager.getInstance();
+ }
+
/**
* Writes documentation for all components available in this
* <code>ComponentManager</code> instance. It goes through
@@ -59,7 +66,7 @@
doc += "*********************\n\n";
doc += "BEGIN MANUAL PART\n";
doc += "END MANUAL PART\n\n";
- for(Class<? extends Component> component : knowledgeSources) {
+ for(Class<? extends Component> component : cm.getKnowledgeSources()) {
if(component != SparqlKnowledgeSource.class){continue;}
doc += getComponentConfigString(component, KnowledgeSource.class);
}
@@ -67,21 +74,21 @@
doc += "*************\n";
doc += "* Reasoners *\n";
doc += "*************\n\n";
- for(Class<? extends Component> component : reasonerComponents) {
+ for(Class<? extends Component> component : cm.getReasonerComponents()) {
doc += getComponentConfigString(component, ReasonerComponent.class);
}
doc += "*********************\n";
doc += "* Learning Problems *\n";
doc += "*********************\n\n";
- for(Class<? extends Component> component : learningProblems) {
+ for(Class<? extends Component> component : cm.getLearningProblems()) {
doc += getComponentConfigString(component, LearningProblem.class);
}
doc += "***********************\n";
doc += "* Learning Algorithms *\n";
doc += "***********************\n\n";
- for(Class<? extends Component> component : learningAlgorithms) {
+ for(Class<? extends Component> component : cm.getLearningAlgorithms()) {
doc += getComponentConfigString(component, LearningAlgorithm.class);
}
@@ -89,7 +96,8 @@
}
private String getComponentConfigString(Class<? extends Component> component, Class<? extends Component> componentType) {
- String componentDescription = "component: " + invokeStaticMethod(component, "getName") + " (" + component.getName() + ")";
+// String componentDescription = "component: " + invokeStaticMethod(component, "getName") + " (" + component.getName() + ")";
+ String componentDescription = "component: " + cm.getComponentName(component);
String str = componentDescription + "\n";
String cli = confMapper.getComponentTypeString(componentType);
String usage = confMapper.getComponentString(component);
@@ -104,7 +112,7 @@
str += "conf file usage: "+cli+" = "+usage+";\n\n";
}
- for(ConfigOption<?> option : componentOptions.get(component)) {
+ for(ConfigOption<?> option : ComponentManager.getConfigOptions(component)) {
String val = (option.getDefaultValue()==null)?"":option.getDefaultValue()+"";
str += option.toString() +
"conf file usage: "+usage+"."
@@ -113,4 +121,14 @@
return str+"\n";
}
+ /**
+ * @param args
+ */
+ public static void main(String[] args) {
+ File file = new File("doc/configOptions.txt");
+ DocumentationGenerator dg = new DocumentationGenerator();
+ dg.writeConfigDocumentation(file);
+ System.out.println("Done");
+ }
+
}
Modified: trunk/interfaces/src/main/java/org/dllearner/cli/Start.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/Start.java 2010-09-21 10:53:10 UTC (rev 2318)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/Start.java 2010-09-21 11:41:09 UTC (rev 2319)
@@ -73,9 +73,9 @@
import org.dllearner.learningproblems.PosNegLPStandard;
import org.dllearner.learningproblems.PosOnlyLP;
import org.dllearner.learningproblems.ScorePosNeg;
-import org.dllearner.parser.ConfParser;
+import org.dllearner.confparser.ConfParser;
import org.dllearner.parser.KBParser;
-import org.dllearner.parser.ParseException;
+import org.dllearner.confparser.ParseException;
import org.dllearner.parser.TokenMgrError;
import org.dllearner.reasoning.DIGReasoner;
import org.dllearner.reasoning.FastInstanceChecker;
@@ -222,6 +222,7 @@
* @throws ComponentInitException
* @throws ParseException
* @throws FileNotFoundException
+ * @throws
* @throws IOException
*/
public Start(File file) throws ComponentInitException, ParseException, FileNotFoundException {
@@ -777,16 +778,16 @@
try {
concept = KBParser.parseConcept(queryStr);
- } catch (ParseException e1) {
- e1.printStackTrace();
- System.err
- .println("The concept you entered could not be parsed. Please try again.");
- parsedCorrectly = false;
} catch (TokenMgrError e) {
e.printStackTrace();
System.err
.println("An error occured during parsing. Please enter a syntactically valid concept.");
parsedCorrectly = false;
+ } catch (org.dllearner.parser.ParseException e) {
+ e.printStackTrace();
+ System.err
+ .println("The concept you entered could not be parsed. Please try again.");
+ parsedCorrectly = false;
}
if (parsedCorrectly) {
Modified: trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParser.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParser.java 2010-09-21 10:53:10 UTC (rev 2318)
+++ trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParser.java 2010-09-21 11:41:09 UTC (rev 2319)
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. ConfParser.java */
-package org.dllearner.parser;
+package org.dllearner.confparser;
import java.util.HashMap;
import java.util.List;
@@ -18,9 +18,9 @@
import org.dllearner.Info;
import org.dllearner.cli.*;
+import org.dllearner.parser.KBParser;
import org.dllearner.utilities.datastructures.*;
-@SuppressWarnings("all")
public class ConfParser implements ConfParserConstants {
// examples
@@ -581,11 +581,6 @@
finally { jj_save(7, xla); }
}
- private boolean jj_3R_11() {
- if (jj_scan_token(STRING)) return true;
- return false;
- }
-
private boolean jj_3_8() {
if (jj_scan_token(27)) return true;
if (jj_scan_token(32)) return true;
@@ -755,6 +750,11 @@
return false;
}
+ private boolean jj_3R_11() {
+ if (jj_scan_token(STRING)) return true;
+ return false;
+ }
+
/** Generated Token Manager. */
public ConfParserTokenManager token_source;
SimpleCharStream jj_input_stream;
Modified: trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParserConstants.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParserConstants.java 2010-09-21 10:53:10 UTC (rev 2318)
+++ trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParserConstants.java 2010-09-21 11:41:09 UTC (rev 2319)
@@ -1,12 +1,11 @@
/* Generated By:JavaCC: Do not edit this line. ConfParserConstants.java */
-package org.dllearner.parser;
+package org.dllearner.confparser;
/**
* Token literal values and constants.
* Generated by org.javacc.parser.OtherFilesGen#start()
*/
-@SuppressWarnings("all")
public interface ConfParserConstants {
/** End of File. */
Modified: trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParserTokenManager.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParserTokenManager.java 2010-09-21 10:53:10 UTC (rev 2318)
+++ trunk/interfaces/src/main/java/org/dllearner/confparser/ConfParserTokenManager.java 2010-09-21 11:41:09 UTC (rev 2319)
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. ConfParserTokenManager.java */
-package org.dllearner.parser;
+package org.dllearner.confparser;
import java.util.HashMap;
import java.util.List;
import java.util.LinkedList;
@@ -14,10 +14,10 @@
import java.io.IOException;
import org.dllearner.Info;
import org.dllearner.cli.*;
+import org.dllearner.parser.KBParser;
import org.dllearner.utilities.datastructures.*;
/** Token Manager. */
-@SuppressWarnings("all")
public class ConfParserTokenManager implements ConfParserConstants
{
Modified: trunk/interfaces/src/main/java/org/dllearner/confparser/conf.jj
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/confparser/conf.jj 2010-09-21 10:53:10 UTC (rev 2318)
+++ trunk/interfaces/src/main/java/org/dllearner/confparser/conf.jj 2010-09-21 11:41:09 UTC (rev 2319)
@@ -28,7 +28,7 @@
}
PARSER_BEGIN(ConfParser)
-package org.dllearner.parser;
+package org.dllearner.confparser;
import java.util.HashMap;
import java.util.List;
@@ -47,6 +47,7 @@
import org.dllearner.Info;
import org.dllearner.cli.*;
+import org.dllearner.parser.KBParser;
import org.dllearner.utilities.datastructures.*;
public class ConfParser {
Modified: trunk/interfaces/src/main/java/org/dllearner/gui/Config.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/gui/Config.java 2010-09-21 10:53:10 UTC (rev 2318)
+++ trunk/interfaces/src/main/java/org/dllearner/gui/Config.java 2010-09-21 11:41:09 UTC (rev 2319)
@@ -138,7 +138,7 @@
} catch (FileNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- } catch (ParseException e) {
+ } catch (org.dllearner.confparser.ParseException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
Modified: trunk/interfaces/src/test/java/org/dllearner/test/junit/ReasonerTests.java
===================================================================
--- trunk/interfaces/src/test/java/org/dllearner/test/junit/ReasonerTests.java 2010-09-21 10:53:10 UTC (rev 2318)
+++ trunk/interfaces/src/test/java/org/dllearner/test/junit/ReasonerTests.java 2010-09-21 11:41:09 UTC (rev 2319)
@@ -345,7 +345,7 @@
}
@Test
- public void compareReasoners() throws FileNotFoundException, ComponentInitException, ParseException{
+ public void compareReasoners() throws FileNotFoundException, ComponentInitException, ParseException, org.dllearner.confparser.ParseException{
ComponentManager cm = ComponentManager.getInstance();
Start start;
Modified: trunk/scripts/pom.xml
===================================================================
--- trunk/scripts/pom.xml 2010-09-21 10:53:10 UTC (rev 2318)
+++ trunk/scripts/pom.xml 2010-09-21 11:41:09 UTC (rev 2319)
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.dllearner</groupId>
<artifactId>components-ext</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>net.sourceforge.secondstring</groupId>
<artifactId>secondstring</artifactId>
Deleted: trunk/scripts/src/main/java/org/dllearner/scripts/ConfigDocumentationGenerator.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/ConfigDocumentationGenerator.java 2010-09-21 10:53:10 UTC (rev 2318)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/ConfigDocumentationGenerator.java 2010-09-21 11:41:09 UTC (rev 2319)
@@ -1,46 +0,0 @@
-/**
- * Copyright (C) 2007, Jens Lehmann
- *
- * This file is part of DL-Learner.
- *
- * DL-Learner is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DL-Learner is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.dllearner.scripts;
-
-import java.io.File;
-
-import org.dllearner.core.ComponentManager;
-
-/**
- * Collects information about all used configuration options and
- * writes them into a file. This way the documentation is always
- * in sync with the source code.
- *
- * @author Jens Lehmann
- *
- */
-public class ConfigDocumentationGenerator {
-
- /**
- * @param args
- */
- public static void main(String[] args) {
- File file = new File("doc/configOptions.txt");
- ComponentManager cm = ComponentManager.getInstance();
- cm.writeConfigDocumentation(file);
- System.out.println("Done");
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
