diff --git a/bin/langeval b/bin/langeval
new file mode 100755
index 00000000..68a4821c
--- /dev/null
+++ b/bin/langeval
@@ -0,0 +1,21 @@
+#!/bin/sh
+#set -x
+VONDA_VERSIONS="3.0\|2\|1"
+. `dirname $0`/utils.sh
+
+if test -z "$JARIMAGES"; then
+ if test -z "$jardir"; then
+ cd `getscriptdir`/..
+ jardir=`pwd`
+ cd $here
+ fi
+
+ JARIMAGES=`find $jardir -name vonda-\*.jar | tr '\012' ':'`
+fi
+
+if test -z "$JARIMAGES"; then
+ echo "No executable image found"
+ exit 1
+fi
+MAINCLASS=de.dfki.mlt.rudimant.agent.nlp.EvalLangServices
+java $silent -cp "$JARIMAGES" $MAINCLASS "$@"
diff --git a/bin/srgseval b/bin/utils.sh
old mode 100755
new mode 100644
similarity index 69%
rename from bin/srgseval
rename to bin/utils.sh
index e76a775d..e8e577f4
--- a/bin/srgseval
+++ b/bin/utils.sh
@@ -1,10 +1,7 @@
-#!/bin/sh
-#set -x
-VONDA_VERSIONS="3.0\|2\|1"
script_dir=`dirname $0`
here=`pwd`
-if test -f "$script_dir/logback.xml"; then
- silent="$silent -Dlogback.configurationFile=$script_dir/logback.xml "
+if test -f "logback.xml"; then
+ silent="$silent -Dlogback.configurationFile=logback.xml "
else
silent="-Dorg.slf4j.simpleLogger.defaultLogLevel=warn "
fi
@@ -45,18 +42,7 @@ else
}
fi
-if test -z "$jardir"; then
+getscriptdir() {
script_dir=`realpath "$0"`
- script_dir=`dirname "$script_dir"`
- cd $script_dir
- cd ../compiler/target
- jardir=`pwd`
- cd $here
-fi
-
-JARIMAGE=`find $jardir -name vonda-\*-compiler.jar | grep "$VONDA_VERSIONS" | head -1`
-if test -z "$JARIMAGE"; then
- echo "No executable image found"
- exit 1
-fi
-java $silent -cp "$JARIMAGE" de.dfki.mlt.rudimant.agent.nlp.EvalSrgs "$@"
+ dirname "$script_dir"
+}
diff --git a/bin/vondac b/bin/vondac
index eee0f104..4dfc4dc5 100755
--- a/bin/vondac
+++ b/bin/vondac
@@ -1,55 +1,10 @@
#!/bin/sh
#set -x
VONDA_VERSIONS="3.0\|2\|1"
-script_dir=`dirname $0`
-here=`pwd`
-if test -f "$script_dir/logback.xml"; then
- silent="$silent -Dlogback.configurationFile=$script_dir/logback.xml "
-else
- silent="-Dorg.slf4j.simpleLogger.defaultLogLevel=warn "
-fi
-
-java --version | grep -q ' 1[1-6]\.' && \
- silent="${silent}--illegal-access=permit "
-
-silent="${silent}--add-modules=ALL-SYSTEM \
---add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
---add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
---add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
---add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
---add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
---add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED "
-
-if realpath . > /dev/null 2>&1 ; then
- :
-else
- # does not exist on Mac OSX
- realpath() {
- target=$1
-
- cd `dirname $target`
- target=`basename $target`
-
- # Iterate down a (possible) chain of symlinks
- while [ -L "$target" ]
- do
- target=`readlink $target`
- cd `dirname $target`
- target=`basename $target`
- done
-
- # Compute the canonicalized name by finding the physical path
- # for the directory we're in and appending the target file.
- phys_dir=`pwd -P`
- echo "$phys_dir/$target"
- }
-fi
+. `dirname $0`/utils.sh
if test -z "$jardir"; then
- script_dir=`realpath "$0"`
- script_dir=`dirname "$script_dir"`
- cd $script_dir
- cd ../compiler/target
+ cd `getscriptdir`/../compiler/target
jardir=`pwd`
cd $here
fi
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 02e5659a..bf5dedee 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -11,7 +11,7 @@
de.dfki.mlt
vonda-top
- 3.2.3
+ 3.2.4
..
@@ -19,7 +19,7 @@
de.dfki.mlt
vonda
- 3.2.2
+ ${project.version}
diff --git a/compiler/src/main/java/de/dfki/mlt/rudimant/compiler/CompilerMain.java b/compiler/src/main/java/de/dfki/mlt/rudimant/compiler/CompilerMain.java
index 13354a14..882a37ab 100644
--- a/compiler/src/main/java/de/dfki/mlt/rudimant/compiler/CompilerMain.java
+++ b/compiler/src/main/java/de/dfki/mlt/rudimant/compiler/CompilerMain.java
@@ -19,21 +19,18 @@
package de.dfki.mlt.rudimant.compiler;
-import static de.dfki.mlt.rudimant.common.Constants.*;
+import static de.dfki.mlt.rudimant.common.Configs.*;
+import static de.dfki.mlt.rudimant.common.Constants.RULE_LOCATION_FILE;
import static de.dfki.mlt.rudimant.compiler.Constants.COMPILER_VERSION;
import static java.nio.file.Files.createDirectories;
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.yaml.snakeyaml.Yaml;
-
import de.dfki.lt.hfc.WrongFormatException;
import de.dfki.mlt.rudimant.common.IncludeInfo;
import de.dfki.mlt.rudimant.compiler.io.BisonParser;
@@ -98,23 +95,6 @@ static void setValue(String key, String option, Object def,
}
}
- public static Map readConfig(File confFile)
- throws FileNotFoundException {
- Yaml yaml = new Yaml();
- File confDir = confFile.getParentFile();
- if (confDir == null) {
- confDir = new File(".");
- }
- Map configs = yaml.load(new FileReader(confFile));
- configs.put(CFG_CONFIG_DIRECTORY, confDir);
- return configs;
- }
-
- public static Map readConfig(String confName)
- throws FileNotFoundException {
- return readConfig(new File(confName));
- }
-
/**
* Saves generated rule structure and errors/warnings to a YAML file
*/
diff --git a/compiler/src/main/java/de/dfki/mlt/rudimant/compiler/RudimantCompiler.java b/compiler/src/main/java/de/dfki/mlt/rudimant/compiler/RudimantCompiler.java
index f2ff3a04..4df2bfe6 100644
--- a/compiler/src/main/java/de/dfki/mlt/rudimant/compiler/RudimantCompiler.java
+++ b/compiler/src/main/java/de/dfki/mlt/rudimant/compiler/RudimantCompiler.java
@@ -20,7 +20,8 @@
package de.dfki.mlt.rudimant.compiler;
import static com.google.common.io.Files.asCharSink;
-import static de.dfki.mlt.rudimant.common.Constants.*;
+import static de.dfki.mlt.rudimant.common.Configs.*;
+import static de.dfki.mlt.rudimant.common.Constants.RULE_FILE_EXTENSION;
import static de.dfki.mlt.rudimant.compiler.Constants.AGENT_DEFS;
import static de.dfki.mlt.rudimant.compiler.tree.GrammarFile.parseAndTypecheck;
import static java.nio.file.Files.createDirectories;
diff --git a/compiler/src/test/java/de/dfki/mlt/rudimant/CoverageTest.java b/compiler/src/test/java/de/dfki/mlt/rudimant/CoverageTest.java
index 86273ee7..8036f151 100644
--- a/compiler/src/test/java/de/dfki/mlt/rudimant/CoverageTest.java
+++ b/compiler/src/test/java/de/dfki/mlt/rudimant/CoverageTest.java
@@ -18,9 +18,11 @@
*/
package de.dfki.mlt.rudimant;
-import static de.dfki.mlt.rudimant.common.Constants.*;
+import static de.dfki.mlt.rudimant.common.Configs.CFG_CONFIG_DIRECTORY;
+import static de.dfki.mlt.rudimant.common.Configs.CFG_VISUALISE;
import static de.dfki.mlt.rudimant.compiler.tree.TestUtilities.RESOURCE_DIR;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
@@ -31,6 +33,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Map;
+
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/compiler/src/test/java/de/dfki/mlt/rudimant/compiler/tree/TestHelper.java b/compiler/src/test/java/de/dfki/mlt/rudimant/compiler/tree/TestHelper.java
index ac23743c..3460e5a1 100644
--- a/compiler/src/test/java/de/dfki/mlt/rudimant/compiler/tree/TestHelper.java
+++ b/compiler/src/test/java/de/dfki/mlt/rudimant/compiler/tree/TestHelper.java
@@ -1,6 +1,6 @@
package de.dfki.mlt.rudimant.compiler.tree;
-import static de.dfki.mlt.rudimant.common.Constants.CFG_CONFIG_DIRECTORY;
+import static de.dfki.mlt.rudimant.common.Configs.*;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -27,14 +27,14 @@ public class TestHelper {
private static File confDir;
public static Map configs;
- public static void readConfig(String configFile) throws FileNotFoundException {
- configs = CompilerMain.readConfig(configFile);
+ public static void getConfig(String configFile) throws FileNotFoundException {
+ configs = readConfig(configFile);
confDir = (File)configs.get(CFG_CONFIG_DIRECTORY);
}
public static void setUp(String configFile, String h, String f)
throws FileNotFoundException {
- readConfig(configFile);
+ getConfig(configFile);
header = h;
footer = f;
}
diff --git a/library/pom.xml b/library/pom.xml
index a5a9eed9..f19f06df 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -11,7 +11,7 @@
de.dfki.mlt
vonda-top
- 3.2.3
+ 3.2.4
..
diff --git a/library/src/main/java/de/dfki/mlt/rudimant/agent/Agent.java b/library/src/main/java/de/dfki/mlt/rudimant/agent/Agent.java
index 026790d1..db93ca1c 100644
--- a/library/src/main/java/de/dfki/mlt/rudimant/agent/Agent.java
+++ b/library/src/main/java/de/dfki/mlt/rudimant/agent/Agent.java
@@ -19,7 +19,7 @@
package de.dfki.mlt.rudimant.agent;
-import static de.dfki.mlt.rudimant.common.Constants.CFG_DEBUG_PORT;
+import static de.dfki.mlt.rudimant.common.Configs.CFG_DEBUG_PORT;
import static de.dfki.mlt.rudimant.common.Constants.STATE_ALWAYS;
import static de.dfki.mlt.rudimant.common.Constants.STATE_NEVER;
@@ -48,9 +48,9 @@
import de.dfki.lt.hfc.db.rdfProxy.RdfClass;
import de.dfki.lt.hfc.db.rdfProxy.RdfProxy;
import de.dfki.lt.tr.dialogue.cplan.DagNode;
-import de.dfki.mlt.rudimant.agent.nlp.LanguageServices;
import de.dfki.mlt.rudimant.agent.nlp.DiaHierarchy;
import de.dfki.mlt.rudimant.agent.nlp.DialogueAct;
+import de.dfki.mlt.rudimant.agent.nlp.LanguageServices;
import de.dfki.mlt.rudimant.agent.nlp.Pair;
import de.dfki.mlt.rudimant.common.RuleLogger;
import de.dfki.mlt.rudimant.common.SimpleServer;
diff --git a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/EvalSrgs.java b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/EvalLangServices.java
similarity index 87%
rename from library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/EvalSrgs.java
rename to library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/EvalLangServices.java
index 10ea6dcb..f5d70daa 100644
--- a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/EvalSrgs.java
+++ b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/EvalLangServices.java
@@ -1,5 +1,7 @@
package de.dfki.mlt.rudimant.agent.nlp;
+import static de.dfki.mlt.rudimant.common.Configs.*;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
@@ -15,13 +17,13 @@
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
-public class EvalSrgs {
- private static Logger logger = LoggerFactory.getLogger(EvalSrgs.class);
+public class EvalLangServices {
+ private static Logger logger = LoggerFactory.getLogger(EvalLangServices.class);
PrintWriter hits;
PrintWriter misses;
- SrgsParser srgs = new SrgsParser();
+ LanguageServices ls;
private static class Section {
private Section(String i, String e) {
@@ -64,20 +66,28 @@ public static List readCorpus(File f) throws FileNotFoundException {
}
}
- public void loadSrgs(File configDir, Map config) {
+ public void loadServices(Map config) {
logger.info("Loading grammar from {}", config.get("grammar"));
+ File configDir = (File)config.get(CFG_CONFIG_DIRECTORY);
String language = (String)config.get("language");
if (language == null) {
language = "en_EN";
}
- if (!srgs.init(configDir, language, config)) {
- logger.error("SRGS grammar loading failed");
+ ls = new LanguageServices();
+ try {
+ ls.loadGrammar(configDir, language, config);
+ } catch (Exception ex) {
+ logger.error("grammar loading failed: {}", ex.getMessage());
throw new RuntimeException();
}
}
- private DialogueAct parse(String input) {
- return srgs.analyse(input);
+ public DialogueAct parse(String input) {
+ return ls.interpret(input);
+ }
+
+ public Pair generate(DialogueAct input) {
+ return ls.generate(input.getDag());
}
private static final Pattern ANNOT_REGEX = Pattern.compile(
@@ -91,11 +101,9 @@ private static String removeAnnotations(String input) {
@SuppressWarnings("unchecked")
void evaluate(File configFile) throws FileNotFoundException {
- File configDir = configFile.getAbsoluteFile().getParentFile();
- Yaml yaml = new Yaml();
- Map configs =
- (Map) yaml.load(new FileReader(configFile));
- loadSrgs(configDir, configs);
+ Map configs = readConfig(configFile);
+ loadServices(configs);
+ File configDir = (File)configs.get(CFG_CONFIG_DIRECTORY);
List corpora = (List)configs.get("corpora");
for (String corpName : corpora) {
File corpus = new File(corpName);
@@ -189,7 +197,7 @@ void parseCorpus(File rootDir, File corpusFile) throws FileNotFoundException {
}
public static void main(String[] args) throws FileNotFoundException {
- EvalSrgs e = new EvalSrgs();
+ EvalLangServices e = new EvalLangServices();
if (args.length == 0) {
System.out.println("Usage: eval_nlu configfile.yml");
System.out.println(" the configfile.yml needs a \"corpus\" property "
diff --git a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/Interpreter.java b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/Interpreter.java
index 043971cd..e48eee47 100644
--- a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/Interpreter.java
+++ b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/Interpreter.java
@@ -19,7 +19,7 @@
package de.dfki.mlt.rudimant.agent.nlp;
-import static de.dfki.mlt.rudimant.common.Constants.CFG_NLU_CONVERTER;
+import static de.dfki.mlt.rudimant.common.Configs.CFG_NLU_CONVERTER;
import java.io.File;
import java.io.IOException;
diff --git a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/LanguageGenerator.java b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/LanguageGenerator.java
index 45154215..6918d7fd 100644
--- a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/LanguageGenerator.java
+++ b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/LanguageGenerator.java
@@ -19,7 +19,9 @@
package de.dfki.mlt.rudimant.agent.nlp;
-import static de.dfki.mlt.rudimant.common.Constants.*;
+import static de.dfki.mlt.rudimant.common.Configs.CFG_NLG_GENERATION_PROJECT;
+import static de.dfki.mlt.rudimant.common.Configs.CFG_NLG_MAPPER_PROJECT;
+import static de.dfki.mlt.rudimant.common.Configs.CFG_NLG_TRANSLATE_NUMBERS;
import java.io.File;
import java.io.FileNotFoundException;
@@ -87,6 +89,7 @@ protected void load() {
* of failure.
* @throws FileNotFoundException
*/
+ @Override
public boolean init(File configDir, String lang,
Map cfgs) {
configs = new HashMap<>(cfgs);
@@ -159,6 +162,7 @@ private DagNode toDag(String genericDialogueAct) {
return generate(rawInput);
}
+ @Override
public Pair generate(DagNode rawInput) {
// obsolete
// _ruleMapper.schemaLfStringToLfString(genericDialogueAct));
diff --git a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/LanguageServices.java b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/LanguageServices.java
index 3e2698bb..bbe537c2 100644
--- a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/LanguageServices.java
+++ b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/LanguageServices.java
@@ -19,7 +19,7 @@
package de.dfki.mlt.rudimant.agent.nlp;
-import static de.dfki.mlt.rudimant.common.Constants.*;
+import static de.dfki.mlt.rudimant.common.Configs.*;
import java.io.File;
import java.io.IOException;
@@ -109,11 +109,11 @@ private static String stringify(String in) {
public Generator getGenerator() {
return _generator;
}
-
+
public Interpreter getInterpreter() {
return _interpreter;
}
-
+
public Pair generate(DagNode saEvent) {
Pair toSay = null;
if (_generator != null) {
diff --git a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/SrgsParser.java b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/SrgsParser.java
index d10f2c60..2d754184 100644
--- a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/SrgsParser.java
+++ b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/SrgsParser.java
@@ -1,6 +1,6 @@
package de.dfki.mlt.rudimant.agent.nlp;
-import static de.dfki.mlt.rudimant.common.Constants.*;
+import static de.dfki.mlt.rudimant.common.Configs.*;
import static org.jvoicexml.processor.BestTreeFinder.*;
import java.io.File;
diff --git a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/TrivialTokenizer.java b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/TrivialTokenizer.java
index 3fe5def1..f0033082 100644
--- a/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/TrivialTokenizer.java
+++ b/library/src/main/java/de/dfki/mlt/rudimant/agent/nlp/TrivialTokenizer.java
@@ -1,6 +1,6 @@
package de.dfki.mlt.rudimant.agent.nlp;
-import static de.dfki.mlt.rudimant.common.Constants.*;
+import static de.dfki.mlt.rudimant.common.Configs.*;
import java.io.File;
import java.util.Map;
diff --git a/library/src/main/java/de/dfki/mlt/rudimant/common/Configs.java b/library/src/main/java/de/dfki/mlt/rudimant/common/Configs.java
new file mode 100644
index 00000000..3a5d9717
--- /dev/null
+++ b/library/src/main/java/de/dfki/mlt/rudimant/common/Configs.java
@@ -0,0 +1,79 @@
+package de.dfki.mlt.rudimant.common;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.Map;
+
+import org.yaml.snakeyaml.Yaml;
+
+public class Configs {
+
+ // TODO: MAYBE ADD CONFIG FOR CHARSET USED IN SOURCE AND GENERATED FILES
+ // Only used internally, the directory where the config file is located,
+ // resp. to which all relative file references will be resolved
+ public static final String CFG_CONFIG_DIRECTORY = "configDirectory";
+
+ /** The location of the ontology configuration file, if any */
+ public static final String CFG_ONTOLOGY_FILE = "ontologyFile";
+
+ public static final String CFG_INPUT_FILE = "inputFile";
+ public static final String CFG_OUTPUT_DIRECTORY = "outputDirectory";
+ public static final String CFG_AGENT_BASE_CLASS = "agentBase";
+ public static final String CFG_TYPE_ERROR_FATAL = "failOnError";
+ public static final String CFG_TYPE_DEFS_FILE = "typeDef";
+ public static final String CFG_PRINT_ERRORS = "printErrors";
+ public static final String CFG_PACKAGE = "rootPackage";
+ public static final String CFG_NAME_TO_URI = "nameToURI";
+ public static final String CFG_NAME_TO_CLASS = "nameToClass";
+ public static final String CFG_VISUALISE = "visualise";
+ public static final String CFG_PERSISTENT_VARS = "persistentVars";
+
+ /** the port for the debugger to connect to the running system */
+ public static final String CFG_DEBUG_PORT = "debugPort";
+
+ /** The class of NLG or NLU plugin classes */
+ public static final String CFG_CLASS = "class";
+ /** NLG option section */
+ public static final String CFG_NLG_KEY = "NLG";
+ /** NLG mapper config */
+ public static final String CFG_NLG_MAPPER_PROJECT = "mapperProject";
+ /** NLG main config */
+ public static final String CFG_NLG_GENERATION_PROJECT = "generationProject";
+ /** NLG Flag if numbers should be translated to text by ICU or not */
+ public static final String CFG_NLG_TRANSLATE_NUMBERS = "translateNumbers";
+
+ /** NLU option section */
+ public static final String CFG_NLU_KEY = "NLU";
+ /** NLU config key for grammar name, semantics depends on plugin */
+ public static final String CFG_NLU_GRAMMAR = "grammar";
+ /** NLU specify location of project file for cplan based converter of JSON
+ * input, see Interpreter abstract base class
+ */
+ public static final String CFG_NLU_CONVERTER = "converter";
+ /** NLU config key for eventually loading a tokenizer */
+ public static final String CFG_NLU_TOKENIZER= "tokenizer";
+
+ /** TrivialTokenizer: convert input to lowercase in preprocess */
+ public static final String CFG_TOK_TOLOWER = "toLower";
+ /** TrivialTokenizer: Remove punctuation symbols from input string, currently
+ * fixed set */
+ public static final String CFG_TOK_REMOVE_PUNCTUATION = "removePunctuation";
+
+ public static Map readConfig(File confFile)
+ throws FileNotFoundException {
+ Yaml yaml = new Yaml();
+ File confDir = confFile.getParentFile();
+ if (confDir == null) {
+ confDir = new File(".");
+ }
+ Map configs = yaml.load(new FileReader(confFile));
+ configs.put(CFG_CONFIG_DIRECTORY, confDir);
+ return configs;
+ }
+
+ public static Map readConfig(String confName)
+ throws FileNotFoundException {
+ return readConfig(new File(confName));
+ }
+}
diff --git a/library/src/main/java/de/dfki/mlt/rudimant/common/Constants.java b/library/src/main/java/de/dfki/mlt/rudimant/common/Constants.java
index 2b4cf3f4..97a95ede 100644
--- a/library/src/main/java/de/dfki/mlt/rudimant/common/Constants.java
+++ b/library/src/main/java/de/dfki/mlt/rudimant/common/Constants.java
@@ -22,57 +22,6 @@
/** A set of constants only relevant at run-time and compilation */
public interface Constants {
- // TODO: MAYBE ADD CONFIG FOR CHARSET USED IN SOURCE AND GENERATED FILES
- // Only used internally, the directory where the config file is located,
- // resp. to which all relative file references will be resolved
- public static final String CFG_CONFIG_DIRECTORY = "configDirectory";
-
- /** The location of the ontology configuration file, if any */
- public static final String CFG_ONTOLOGY_FILE = "ontologyFile";
-
- public static final String CFG_INPUT_FILE = "inputFile";
- public static final String CFG_OUTPUT_DIRECTORY = "outputDirectory";
- public static final String CFG_AGENT_BASE_CLASS = "agentBase";
- public static final String CFG_TYPE_ERROR_FATAL = "failOnError";
- public static final String CFG_TYPE_DEFS_FILE = "typeDef";
- public static final String CFG_PRINT_ERRORS = "printErrors";
- public static final String CFG_PACKAGE = "rootPackage";
- public static final String CFG_NAME_TO_URI = "nameToURI";
- public static final String CFG_NAME_TO_CLASS = "nameToClass";
- public static final String CFG_VISUALISE = "visualise";
- public static final String CFG_PERSISTENT_VARS = "persistentVars";
-
- /** the port for the debugger to connect to the running system */
- public static final String CFG_DEBUG_PORT = "debugPort";
-
- /** The class of NLG or NLU plugin classes */
- public static final String CFG_CLASS = "class";
- /** NLG option section */
- public static final String CFG_NLG_KEY = "NLG";
- /** NLG mapper config */
- public static final String CFG_NLG_MAPPER_PROJECT = "mapperProject";
- /** NLG main config */
- public static final String CFG_NLG_GENERATION_PROJECT = "generationProject";
- /** NLG Flag if numbers should be translated to text by ICU or not */
- public static final String CFG_NLG_TRANSLATE_NUMBERS = "translateNumbers";
-
- /** NLU option section */
- public static final String CFG_NLU_KEY = "NLU";
- /** NLU config key for grammar name, semantics depends on plugin */
- public static final String CFG_NLU_GRAMMAR = "grammar";
- /** NLU specify location of project file for cplan based converter of JSON
- * input, see Interpreter abstract base class
- */
- public static final String CFG_NLU_CONVERTER = "converter";
- /** NLU config key for eventually loading a tokenizer */
- public static final String CFG_NLU_TOKENIZER= "tokenizer";
-
- /** TrivialTokenizer: convert input to lowercase in preprocess */
- public static final String CFG_TOK_TOLOWER = "toLower";
- /** TrivialTokenizer: Remove punctuation symbols from input string, currently
- * fixed set */
- public static final String CFG_TOK_REMOVE_PUNCTUATION = "removePunctuation";
-
public static final String RULE_FILE_EXTENSION = ".rudi";
public static final String RULE_LOCATION_FILE = "RuleLoc.yml";
diff --git a/pom.xml b/pom.xml
index 3faff38d..c5851d3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
de.dfki.mlt
vonda-top
- 3.2.3
+ 3.2.4
pom