Changeset 6988

Timestamp:

02/24/16 13:33:39 (8 years ago)

Author:

Leif-Jöran

Message:

Completing the translation configuration test from provided file by printing the annotation tables instead of trying to find CGN tables to test if there are no CGN translation types provided.

Location:

FCSannotrans/trunk/src/main/java/nl/mpi/annot/translate

Files:

• AnnotationTranslator.java (modified) (2 diffs)
• AnnotationTranslatorTestDriver.java (modified) (1 diff)
• TranslationTables.java (modified) (2 diffs)

FCSannotrans/trunk/src/main/java/nl/mpi/annot/translate/AnnotationTranslator.java

@@ -7 +7 @@
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
@@ -53 +54 @@
         return translationTypes.getTranslationType(ttId);
     }
-    
+
+    public List<TranslationTable> getTranslationTables() {
+        return translationTables.getList();
+    }
+
     TranslationTable findTranslationTable(String fromRes, String fromLay, String toRes, String toLay, TranslationType ty) {
         return translationTables.find(fromRes, fromLay, toRes, toLay, ty);

FCSannotrans/trunk/src/main/java/nl/mpi/annot/translate/AnnotationTranslatorTestDriver.java

@@ -156 +156 @@
             return;
         }
-        if (!getTranslationTypeData(at)) {
-            return;
-        }
-        if (!getTranslationTableData(at)) {
-            return;
-        }
-        testPoSTranslations(at);
-        testPhonTranslations(at);        
+        if (getTranslationTypeData(at) && getTranslationTableData(at)) {
+            testPoSTranslations(at);
+            testPhonTranslations(at);        
+        } else {
+            for (TranslationTable ttable : at.getTranslationTables()) {
+                ttable.display();
+            }
+        }
     }
         

FCSannotrans/trunk/src/main/java/nl/mpi/annot/translate/TranslationTables.java

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 /**
@@ -54 +55 @@
         return nw;
     }
+
+    public List<TranslationTable> getList() {
+        return translationTableArray;
+    }
     
     TranslationTable find(String fromRes, String fromLay, String toRes, String toLay, TranslationType ty) {