summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRocky Madden <git@rockymadden.com>2014-01-02 11:31:40 -0700
committerRocky Madden <git@rockymadden.com>2014-01-02 11:31:40 -0700
commite4fbf6ed99b0cb51052ae39fab2e08d78f41d7c4 (patch)
tree6133afd68bfb0efa6447939c0ea9fb33812e4fd4
parent6bd9e223b8fbad00ff82f9f368eb4451e5269eeb (diff)
downloadstringmetric-e4fbf6ed99b0cb51052ae39fab2e08d78f41d7c4.tar.gz
stringmetric-e4fbf6ed99b0cb51052ae39fab2e08d78f41d7c4.tar.bz2
stringmetric-e4fbf6ed99b0cb51052ae39fab2e08d78f41d7c4.zip
More apt naming.
-rwxr-xr-xcore/source/main/scala/com/rockymadden/stringmetric/Alphabet.scala26
1 files changed, 13 insertions, 13 deletions
diff --git a/core/source/main/scala/com/rockymadden/stringmetric/Alphabet.scala b/core/source/main/scala/com/rockymadden/stringmetric/Alphabet.scala
index 5a7ee97..5e666d2 100755
--- a/core/source/main/scala/com/rockymadden/stringmetric/Alphabet.scala
+++ b/core/source/main/scala/com/rockymadden/stringmetric/Alphabet.scala
@@ -3,7 +3,7 @@ package com.rockymadden.stringmetric
import scala.collection.immutable.Set
object Alphabet {
- sealed abstract class Alphabet(val chars: Set[Char]) {
+ sealed abstract class AlphabetSet(val chars: Set[Char]) {
def isSuperset(a: Char): Boolean = chars.contains(a)
def isSuperset(a: Array[Char]): Boolean = a.length > 0 && a.takeWhile(chars.contains).length == a.length
@@ -12,31 +12,31 @@ object Alphabet {
}
- case object LowercaseConsonant extends Alphabet(
+ case object LowercaseConsonant extends AlphabetSet(
Set('b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'q', 'r', 's', 't', 'v', 'w', 'x' ,'z')
)
- case object UppercaseConsonant extends Alphabet(
+ case object UppercaseConsonant extends AlphabetSet(
Set('B', 'C', 'D', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'V', 'W', 'X' ,'Z')
)
- case object Consonant extends Alphabet(LowercaseConsonant.chars ++ UppercaseConsonant.chars)
+ case object Consonant extends AlphabetSet(LowercaseConsonant.chars ++ UppercaseConsonant.chars)
- case object LowercaseVowel extends Alphabet(Set('a', 'e', 'i', 'o', 'u'))
+ case object LowercaseVowel extends AlphabetSet(Set('a', 'e', 'i', 'o', 'u'))
- case object UppercaseVowel extends Alphabet(Set('A', 'E', 'I', 'O', 'U'))
+ case object UppercaseVowel extends AlphabetSet(Set('A', 'E', 'I', 'O', 'U'))
- case object Vowel extends Alphabet(LowercaseVowel.chars ++ UppercaseVowel.chars)
+ case object Vowel extends AlphabetSet(LowercaseVowel.chars ++ UppercaseVowel.chars)
- case object LowercaseY extends Alphabet(Set('y'))
+ case object LowercaseY extends AlphabetSet(Set('y'))
- case object UppercaseY extends Alphabet(Set('Y'))
+ case object UppercaseY extends AlphabetSet(Set('Y'))
- case object Y extends Alphabet(LowercaseY.chars ++ UppercaseY.chars)
+ case object Y extends AlphabetSet(LowercaseY.chars ++ UppercaseY.chars)
- case object LowercaseAlpha extends Alphabet(LowercaseConsonant.chars ++ LowercaseVowel.chars ++ LowercaseY.chars)
+ case object LowercaseAlpha extends AlphabetSet(LowercaseConsonant.chars ++ LowercaseVowel.chars ++ LowercaseY.chars)
- case object UppercaseAlpha extends Alphabet(UppercaseConsonant.chars ++ UppercaseVowel.chars ++ UppercaseY.chars)
+ case object UppercaseAlpha extends AlphabetSet(UppercaseConsonant.chars ++ UppercaseVowel.chars ++ UppercaseY.chars)
- case object Alpha extends Alphabet(LowercaseAlpha.chars ++ UppercaseAlpha.chars)
+ case object Alpha extends AlphabetSet(LowercaseAlpha.chars ++ UppercaseAlpha.chars)
}