Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions src/main/java/org/apache/commons/codec/language/Metaphone.java
Original file line number Diff line number Diff line change
Expand Up @@ -246,23 +246,19 @@ public String metaphone(final String txt) {
if (isPreviousChar(local, n, 'S') && !isLastChar(wdsz, n) && FRONTV.indexOf(local.charAt(n + 1)) >= 0) {
break;
}
if (regionMatch(local, n, "CIA")) { // "CIA" -> X
if (isPreviousChar(local, n, 'S') && isNextChar(local, n, 'H')) { // SCH->sk
code.append('K');
break;
}
if (regionMatch(local, n, "CIA") || isNextChar(local, n, 'H')) { // "CIA" -> X or CH -> X
code.append('X');
break;
}
if (!isLastChar(wdsz, n) && FRONTV.indexOf(local.charAt(n + 1)) >= 0) {
code.append('S');
break; // CI,CE,CY -> S
}
if (isPreviousChar(local, n, 'S') && isNextChar(local, n, 'H')) { // SCH->sk
code.append('K');
break;
}
if (!isNextChar(local, n, 'H') || n == 0 && wdsz >= 3 && isVowel(local, 2)) { // CH consonant -> K consonant
code.append('K');
} else {
code.append('X'); // CHvowel -> X
}
code.append('K'); // default C -> K
break;
case 'D':
if (!isLastChar(wdsz, n + 1) && isNextChar(local, n, 'G') && FRONTV.indexOf(local.charAt(n + 2)) >= 0) { // DGE DGI DGY -> J
Expand Down
21 changes: 19 additions & 2 deletions src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,28 @@ void testTIOAndTIAToX() {

@Test
void testTranslateOfSCHAndCH() {
assertEquals("SNS", getStringEncoder().metaphone("SCIENCE"));
assertEquals("SN", getStringEncoder().metaphone("SCENE"));
assertEquals("S", getStringEncoder().metaphone("SCY"));
assertEquals("SKTL", getStringEncoder().metaphone("SCHEDULE"));
assertEquals("SKMT", getStringEncoder().metaphone("SCHEMATIC"));

assertEquals("KRKT", getStringEncoder().metaphone("CHARACTER"));
assertEquals("TSKR", getStringEncoder().metaphone("DISCHARGE"));
assertEquals("EX", getStringEncoder().metaphone("ECHO"));
assertEquals("TX", getStringEncoder().metaphone("TEACH"));
assertEquals("XR", getStringEncoder().metaphone("CHERI"));
assertEquals("XP", getStringEncoder().metaphone("CHIP"));
assertEquals("XRST", getStringEncoder().metaphone("CHRIST"));
assertEquals("X", getStringEncoder().metaphone("CIAO"));
assertEquals("ST", getStringEncoder().metaphone("CITY"));
assertEquals("KT", getStringEncoder().metaphone("CAT"));

}

@Test
void testTranslateOfCHCharacterWithMaxCodeLenFive() {
final Metaphone metaphone = new Metaphone();
metaphone.setMaxCodeLen(5);
assertEquals("XRKTR", metaphone.metaphone("CHARACTER"));
}

@Test
Expand Down