summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Culkin <bjculkin@mix.wvu.edu>2017-09-14 18:09:53 -0700
committerBenjamin Culkin <bjculkin@mix.wvu.edu>2017-09-14 18:09:53 -0700
commit97b5ea7b3796ec9852e2853785f729f1a875c7d7 (patch)
tree106b53328d340eabe70d93d13b2e2146870c449c
parent6c307cc6dfb8088281c1432814068f472d0a03d4 (diff)
Fix some noun inflections
-rw-r--r--.classpath48
-rw-r--r--data/nouns.txt25
-rw-r--r--src/examples/java/bjc/inflexion/examples/InflexionTester.java2
3 files changed, 54 insertions, 21 deletions
diff --git a/.classpath b/.classpath
index a22b331..94c765c 100644
--- a/.classpath
+++ b/.classpath
@@ -1,16 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/examples/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="src/examples/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="data">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/data/nouns.txt b/data/nouns.txt
index 1be3d15..fca5b39 100644
--- a/data/nouns.txt
+++ b/data/nouns.txt
@@ -32,7 +32,7 @@ coney => coneys | conies
cony => conys | conies
doe => does
-do => does
+do => dos
ellipse => ellipses
ellipsis => ellipses
@@ -191,6 +191,7 @@ ipse dixit => | ipse dixits
lex humana => | leges humanae
line-out => line-outs | lines-out
lord-lieutenant => lord-lieutenants | lords-lieutenant
+low-life => low-lifes
magnum opus => magnum opuses | magna opera
malum in se => | mala in se
man-child => men-children |
@@ -512,6 +513,7 @@ batz => batzes
blitz => blitzes
chintz => chintzes
coz => cozes
+kibitz => kibitzes
quartz => quartzes
snooze => snoozes
topaz => topazes
@@ -1677,6 +1679,7 @@ chitarrone => | chitarroni
cognoscente => | cognoscenti
concetto => | concetti
condottiere => | condottieri
+confetto => | confetti
conoscente => | conoscenti
contadino => | contadini
conversazione => conversaziones | conversazioni
@@ -1748,6 +1751,7 @@ fermata => fermatas | fermate
fioritura => | fioriture
frottola => | frottole
granita => | granite
+lasagna => lasagnas | lasagne
loggia => loggias | loggie
mafiosa => | mafiose
mantelletta => | mantellette
@@ -1826,7 +1830,7 @@ calypso => calypsos
canto => cantos
cappuccino => cappuccinos
casino => casinos
-cello => cellos
+cello => cellos | celli
centavo => centavos
Chicago => Chicagos
Chimango => Chimangos
@@ -2172,6 +2176,7 @@ minyan => | minyanim
parnas => | parnassim
parnass => | parnassim
seraph => seraphs | seraphim
+sheqel => sheqels | sheqalim
shochet => | shochetim
ulpan => | ulpanim
zuz => zuzzes | zuzim
@@ -2587,6 +2592,7 @@ mezuzah => mezuzoth
minnelied => minnelieder
nachtlokal => nachtlokale
nebenkern => nebenkerne
+ninja => ninjas | shinobi
nockerl => nockerln
ogle => oglys
orthoceras => orthocerata
@@ -2699,7 +2705,10 @@ wady => wadies | wadys
zemirah => zemiroth | zemirot
zita => ziti | zite
-
+# Proper nouns whose owners said they should be pluralized differently
+prius => priuses | prii
+# Not technically correct, but occasionally used.
+prius => | priora
# "General" as a noun (as opposed to a postfix adjective)...
adjutant general => adjutant generals
@@ -2779,19 +2788,24 @@ its => theirs
# Standard patterns of inflection for other nouns (in increasing order of generality)...
+-tto => -tti
+
-ao => -aos |
-eo => -eos |
-io => -ios |
-oo => -oos |
-uo => -uos |
+
-alf => | -alves
-elf => | -elves
-olf => | -olves
+
-anx => -anxes | -anges
-inx => -inxes | -inges
-ynx => -ynxes | -ynges
+
-arf => | -arves
--ceps => -ceps |
+-ceps => -ceps | -cepses
-ch => -ches |
-sh => -shes |
-eaf => -eaves |
@@ -2801,16 +2815,19 @@ its => theirs
-oe => -oes |
-o => -oes |
-quy => -quies |
+
-ay => -ays |
-ey => -eys |
-iy => -iys |
-oy => -oys |
-uy => -uys |
+
-ss => -sses |
-sis => | -ses
#-[^s]sis => | -[^s]ses
-trix => -trixes | -trices
-us => -uses |
+-ex => -xes | -ices
-x => -xes |
-y => -ies |
-z => -zzes |
diff --git a/src/examples/java/bjc/inflexion/examples/InflexionTester.java b/src/examples/java/bjc/inflexion/examples/InflexionTester.java
index ab1d87f..d174c00 100644
--- a/src/examples/java/bjc/inflexion/examples/InflexionTester.java
+++ b/src/examples/java/bjc/inflexion/examples/InflexionTester.java
@@ -65,7 +65,7 @@ public class InflexionTester {
System.out.println("Inflected string: " + inflected);
- System.out.print("\nEnter a noun to inflect (blank line to quit): ");
+ System.out.print("\nEnter a string to inflect (blank line to quit): ");
ln = scn.nextLine().trim();
}