Changeset 301

Timestamp:

06/22/08 20:32:07 (7 months ago)

Author:

chris

Message:

Change names of Hebrew morphological features as requested by Nicolai.

Files:

• lex/trunk/src/com/qwirx/lex/morph/HebrewMorphemeGenerator.java (modified) (3 diffs)
• lex/trunk/test/com/qwirx/lex/HebrewConverterTest.java (modified) (1 diff)

lex/trunk/src/com/qwirx/lex/morph/HebrewMorphemeGenerator.java

@@ -182 +182 @@
-            }
-            
-NS
+AM
-            
-            // String stemNum = word.getEMdFValue("verbal_stem").toString();
@@ -188 +188 @@
-                stem, "V/STM");
-            
-LEX
+NUC
-            
-            handler.convert("graphical_verbal_ending", false,
-
-
-
+
+
+
+
-        }
-        else if (psp.equals("noun")
-            || psp.equals("proper_noun"))
-        {
-HEAD/NCOM
+N/NUC
-            
-            if (psp.equals("proper_noun"))
@@ -207 +208 @@
-            handler.convert("graphical_lexeme", false, gloss, type);
-            handler.convert("graphical_nominal_ending", false,
-
-
+
+
+
-        }
-        else if (psp.equals("none"))

lex/trunk/test/com/qwirx/lex/HebrewConverterTest.java

@@ -121 +121 @@
-        assertEquals("PERF-", columns.get(3)[1]);
-    }
+
+    public void testMorphemeGeneration() throws Exception
+    {
+        StringBuffer hebrewText = new StringBuffer();
+        List<String[]> columns = new ArrayList<String[]>();
+        
+        Sheaf sheaf = m_Emdros.getSheaf
+        (
+            "SELECT ALL OBJECTS IN " +
+            "{" + m_Emdros.getMinM() + "-" + m_Emdros.getMaxM() + "} " +
+            "WHERE [clause self = 28951 " + // Gen 2,24(b)
+            "       GET logical_struct_id, logical_structure "+
+            "        [phrase GET phrase_type, phrase_function, argument_name, "+
+            "                    type_id, macrorole_number "+
+            "          [word GET lexeme, phrase_dependent_part_of_speech, " +
+            "                    tense, stem, wordnet_gloss, wordnet_synset, " +
+            "                    graphical_preformative, " +
+            "                    graphical_locative, " +
+            "                    graphical_lexeme, " +
+            "                    graphical_pron_suffix, " +
+            "                    graphical_verbal_ending, " +
+            "                    graphical_root_formation, " +
+            "                    graphical_nominal_ending, " +
+            "                    person, number, gender, state, " +
+            "                    surface_consonants, " +
+            "                    suffix_person, suffix_number, suffix_gender " +
+            "          ]"+
+            "        ]"+
+            "      ]"
+        );
+
+        MatchedObject clause = null;
+        SheafConstIterator sci = sheaf.const_iterator();
+        if (sci.hasNext()) 
+        {
+            Straw straw = sci.next();
+            StrawConstIterator swci = straw.const_iterator();
+            if (swci.hasNext()) 
+            {
+                clause = swci.next();
+            }
+        }
+
+        SheafConstIterator phrases = clause.getSheaf().const_iterator();
+        List<MorphEdge> morphEdges = new ArrayList<MorphEdge>();
+        boolean isFirstWord = true;
+        HebrewMorphemeGenerator generator = new HebrewMorphemeGenerator();
+
+        while (phrases.hasNext()) 
+        {
+            MatchedObject phrase =
+                phrases.next().const_iterator().next();
+
+            SheafConstIterator words = phrase.getSheaf().const_iterator();
+            
+            while (words.hasNext()) 
+            {
+                MatchedObject word = words.next().const_iterator().next();
+
+                HebrewGlossTableGeneratingMorphemeHandler hmh = 
+                    new HebrewGlossTableGeneratingMorphemeHandler(
+                        columns, word, hebrewText,
+                        morphEdges, isFirstWord,
+                        !phrases.hasNext() && !words.hasNext());
+                    
+                generator.parse(word, hmh, true, m_SQL);
+            }
+        }
+
+        assertEquals("CONJ",     morphEdges.get(0).symbol());
+        assertEquals("V/TAM",    morphEdges.get(1).symbol());
+        assertEquals("V/STM",    morphEdges.get(2).symbol());
+        assertEquals("V/NUC",    morphEdges.get(3).symbol());
+        assertEquals("AG/PSA",   morphEdges.get(4).symbol());
+        assertEquals("PRON/DCA", morphEdges.get(5).symbol());
+        assertEquals("P",        morphEdges.get(6).symbol());
+        assertEquals("N/NUC",    morphEdges.get(7).symbol());
+        assertEquals("N/PNS",    morphEdges.get(8).symbol());
+        assertEquals("N/POS",    morphEdges.get(9).symbol());
+    }
-    
-    public static void main(String[] args)