diff options
| author | Rocky Madden <git@rockymadden.com> | 2012-11-18 11:23:43 -0700 |
|---|---|---|
| committer | Rocky Madden <git@rockymadden.com> | 2012-11-18 11:23:43 -0700 |
| commit | 9b4a7bf6a2842058f1d0bf14db5c8f2544c4d50d (patch) | |
| tree | f5da84cf3f1f2b6439cf1cf37de22a09bf564948 /core | |
| parent | ad77432abb4bb3a332149da0ad643ade1d51b396 (diff) | |
| download | stringmetric-9b4a7bf6a2842058f1d0bf14db5c8f2544c4d50d.tar.gz stringmetric-9b4a7bf6a2842058f1d0bf14db5c8f2544c4d50d.tar.bz2 stringmetric-9b4a7bf6a2842058f1d0bf14db5c8f2544c4d50d.zip | |
Cleaned up method.
Diffstat (limited to 'core')
| -rwxr-xr-x | core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala index 0ea3177..d40ebba 100755 --- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala +++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala @@ -40,11 +40,16 @@ object NysiisAlgorithm extends StringAlgorithm with FilterableStringAlgorithm { } private[this] def cleanRight(ca: Array[Char]) = - if (ca.length >= 1 && (ca.last == 'a' || ca.last == 's')) - ca.dropRight(ca.reverseIterator.takeWhile(c => c == 'a' || c == 's').length) - else if (ca.length >= 2 && ca.last == 'y' && ca(ca.length - 2) == 'a') - ca.dropRight(2) :+ 'y' - else ca + if (ca.length == 0) ca + else + ca.last match { + // All vowels will be encoded as 'a' at the point this is called. + case 'a' | 's' => + ca.dropRight(ca.reverseIterator.takeWhile(c => c == 'a' || c == 's').length) + case 'y' if (ca.length >= 2 && ca(ca.length - 2) == 'a') => + ca.dropRight(2) :+ 'y' + case _ => ca + } private[this] def deduplicate(ca: Array[Char]) = if (ca.length <= 1) ca |