final version of kotus experiment

examples/uusisuomi/Kotus.gf

@@ -30,15 +30,19 @@ oper
   d08A : Str -> NForms -- 5 vinaigrette
     = \s -> dNukke s (weakGrade s + "n") ;
   d09 : Str -> NForms -- 696 ääriraja
-    = \s -> dUkko s (s + "n") ;
+    = \s -> let a = last s in dSilakka s         
+              (s + "n")
+              (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ;
   d09A : Str -> NForms -- 1040 ääniraita
-    = \s -> dUkko s (s + weakGrade "n") ;
+    = \s -> let a = last s in dSilakka s         
+              (weakGrade s + "n")
+              (init s + case a of {"a" => "o" ; _ => "ö"} + "j" + a) ;
   d10 : Str -> NForms -- 2119 äänittäjä
     = \s -> dSilakka s (s + "n") (init s + "i" + vowelHarmony (last s)) ;
   d10A : Str -> NForms -- 284 änkkä
-    = \s -> dUkko s (weakGrade s + "n") ;
+    = \s -> dSilakka s (weakGrade s + "n") (init s + "i" + vowelHarmony (last s)) ;
   d11 : Str -> NForms -- 46 ödeema
-    = \s -> dUkko s (s + "n") ;
+    = \s -> dSilakka s (weakGrade s + "n") (init s + "i" + vowelHarmony (last s)) ;
   d12 : Str -> NForms -- 1125 örinä
     = \s -> let a = vowelHarmony (last s) in 
       dSilakka s (s + "n") 
@@ -174,7 +178,10 @@ oper
   d48A : Str -> NForms -- 481 äänne
     = \s -> dRae s (strongGrade s + "en") ;
   d49 : Str -> NForms -- 31 vempele
-    = \s -> dRae s (s + "en") ;
+    = \s -> case last s of {
+         "e" => dRae s (s + "en") ;
+         _ => dPiennar s (s + "en")
+        } ;
   d49A : Str -> NForms -- 11 vemmel
     = \s -> dPiennar s (strongGrade (init s) + "len") ;
 {-

examples/uusisuomi/Makefile

@@ -14,8 +14,8 @@ verbs:
 	cat all-differences-V
 
 nouns: 
-	export LEX=NSSK ; make -e tests
-	export LEX=Omat ; make -e tests
+#	export LEX=NSSK ; make -e tests
+#	export LEX=Omat ; make -e tests
 	export LEX=Swadesh ; make -e tests
 	export LEX=Dictionary ; make -e tests
 	export LEX=Duodecim ; make -e tests
@@ -33,13 +33,13 @@ CSC:
 
 gf-files:
 	runghc MkLex.hs 0 $(CAT) $(LEX) > $(LEX)Abs.gf
-	runghc MkLex.hs 1 $(CAT) $(LEX) > $(LEX)1.gf
+#	runghc MkLex.hs 1 $(CAT) $(LEX) > $(LEX)1.gf
 	runghc MkLex.hs 2 $(CAT) $(LEX) > $(LEX)2.gf
 	runghc MkLex.hs 3 $(CAT) $(LEX) > $(LEX)3.gf
 	runghc MkLex.hs 4 $(CAT) $(LEX) > $(LEX)4.gf
 
 experiments: gf-files
-	echo "gt -cat=Utt | l | wf exper1-$(LEX).txt" | gf -s $(LEX)1.gf
+#	echo "gt -cat=Utt | l | wf exper1-$(LEX).txt" | gf -s $(LEX)1.gf
 	echo "gt -cat=Utt | l | wf exper2-$(LEX).txt" | gf -s $(LEX)2.gf
 	echo "gt -cat=Utt | l | wf exper3-$(LEX).txt" | gf -s $(LEX)3.gf
 	echo "gt -cat=Utt | l | wf exper4-$(LEX).txt" | gf -s $(LEX)4.gf

examples/uusisuomi/Nominal.gf

@@ -144,6 +144,10 @@ resource Nominal = ResFin ** open MorphoFin,Declensions,CatFin,Prelude in {
           dArpi ukko (init (weakGrade ukko) + "en") ;
         <_ + "i", _ + ("eita" | "eitä")> => 
           dTohtori ukko ;
+        <_ + "e", nuk + ("eja" | "ejä")> => 
+          dNukke ukko ukon ;
+        <_, _ + ":" + _ + ("a" | "ä")> => dSDP ukko ;
+        <_ + ("l" | "n" | "r" | "s"), _ + ("eja" | "ejä")> => dUnix ukko ;
         <_, _ + ("a" | "ä")> => ukot ;
         _ => 
           Predef.error 
@@ -168,7 +172,7 @@ resource Nominal = ResFin ** open MorphoFin,Declensions,CatFin,Prelude in {
           dRae ukko ukon ;
         <taiv + ("as" | "äs"), taiv + ("aan" | "ään")> => 
           dRae ukko ukon ;
-        <nukk + "e", nuk + "en"> => dNukke ukko ukon ;
+        <nukk + "e", nuk + "een"> => dRae ukko ukon ;
         <arp + "i", arv + "en"> => dArpi ukko ukon ;
         <_ + ("us" | "ys"), _ + "den"> => dLujuus ukko ;
         <_, _ + ":n"> => dSDP ukko ;