- poprawienie testów "shellowych" (doTest.sh - teraz działają)

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/trunk@257 ff4e3ee1-f430-4e82-ade0-24591c43f1fd

- poprawienie testów "shellowych" (doTest.sh - teraz działają)
git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/trunk@257 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Michał Lenart
1 parent 5e5f3286
Showing 3 changed files with 9 additions and 8 deletions
doTest.sh
fsabuilder/morfeusz_builder
morfeusz/Environment.cpp
@@ -7,14 +7,16 @@ DIR=$3
 echo "build test FSA for $DIR"
-TMP_DICTIONARY=`mktemp`
+TMP_DICTIONARY=`mktemp -d`
+DICT_NAME=test
+
 python fsabuilder/morfeusz_builder \
-    --$WHAT \
+    --only-$WHAT \
     --input-files $DIR/dictionary.tab \
-    -o $TMP_DICTIONARY \
+    --dict $DICT_NAME \
+    --dict-dir $TMP_DICTIONARY \
     --tagset-file=$DIR/tagset.dat \
-    --segments-file=$DIR/segmentation.dat \
-    --serialization-method=V1
+    --segments-file=$DIR/segmentation.dat
 echo "testing $DIR"
@@ -23,7 +25,7 @@ OUTPUT=$DIR/output.txt
 TMP_OUTPUT=`mktemp`
 ARGS=`cat $DIR/ARGS`
-$CMD -i $TMP_DICTIONARY $ARGS < $INPUT > $TMP_OUTPUT
+$CMD --dict-dir $TMP_DICTIONARY --dict $DICT_NAME $ARGS < $INPUT > $TMP_OUTPUT
 if [ $? -ne 0 ]
 then
@@ -72,7 +72,7 @@ def _parseOptions():
                         #~ default=False,
                         #~ action='store_true',
                         #~ help='this option is ignored and exists only for backwards compatibility')
-    parser.add_option('--dict-name',
+    parser.add_option('--dict',
                         dest='dictName',
                         help='the name of result dictionary')
     parser.add_option('--dict-dir',
@@ -173,7 +173,6 @@ namespace morfeusz {
     }
     void Environment::setDictionary(const std::string& dictName) {
-        cerr << "SETTING DICT: " << dictName << endl;
         this->dictionary = DictionariesRepository::instance.getDictionary(dictName, this->processorType);
         idResolver = dictionary->idResolver;
         this->idResolver.setCharsetConverter(currentCharsetConverter);