Update entropy calculation logic

jasonnam · Jan 20, 2017 · 12b7082 · 12b7082
1 parent a2f626c
commit 12b7082
Showing 1 changed file with 22 additions and 7 deletions.
diff --git a/Source/Navajo.swift b/Source/Navajo.swift
@@ -76,38 +76,53 @@ open class Navajo: NSObject {
             return 0.0
         }
 
+        var includesLowercaseCharacter = false,
+            includesUppercaseCharacter = false,
+            includesDecimalDigitCharacter = false,
+            includesPunctuationCharacter = false,
+            includesSymbolCharacter = false,
+            includesWhitespaceCharacter = false,
+            includesNonBaseCharacter = false
+
         var sizeOfCharacterSet: Float = 0
 
         string.enumerateSubstrings(in: string.startIndex ..< string.endIndex, options: String.EnumerationOptions.byComposedCharacterSequences) { subString, _, _, _ in
             guard let subString = subString, let unicodeScalar = UnicodeScalar((subString as NSString).character(at: 0)) else {
                 return
             }
 
-            if CharacterSet.lowercaseLetters.contains(unicodeScalar) {
+            if !includesLowercaseCharacter && CharacterSet.lowercaseLetters.contains(unicodeScalar) {
+                includesLowercaseCharacter = true
                 sizeOfCharacterSet += 26
             }
 
-            if CharacterSet.uppercaseLetters.contains(unicodeScalar) {
+            if !includesUppercaseCharacter && CharacterSet.uppercaseLetters.contains(unicodeScalar) {
+                includesUppercaseCharacter = true
                 sizeOfCharacterSet += 26
             }
 
-            if CharacterSet.decimalDigits.contains(unicodeScalar) {
+            if !includesDecimalDigitCharacter && CharacterSet.decimalDigits.contains(unicodeScalar) {
+                includesDecimalDigitCharacter = true
                 sizeOfCharacterSet += 10
             }
 
-            if CharacterSet.symbols.contains(unicodeScalar) {
+            if !includesSymbolCharacter && CharacterSet.symbols.contains(unicodeScalar) {
+                includesSymbolCharacter = true
                 sizeOfCharacterSet += 10
             }
 
-            if CharacterSet.punctuationCharacters.contains(unicodeScalar) {
+            if !includesPunctuationCharacter && CharacterSet.punctuationCharacters.contains(unicodeScalar) {
+                includesPunctuationCharacter = true
                 sizeOfCharacterSet += 20
             }
 
-            if CharacterSet.whitespacesAndNewlines.contains(unicodeScalar) {
+            if !includesWhitespaceCharacter && CharacterSet.whitespacesAndNewlines.contains(unicodeScalar) {
+                includesWhitespaceCharacter = true
                 sizeOfCharacterSet += 1
             }
 
-            if CharacterSet.nonBaseCharacters.contains(unicodeScalar) {
+            if !includesNonBaseCharacter && CharacterSet.nonBaseCharacters.contains(unicodeScalar) {
+                includesNonBaseCharacter = true
                 sizeOfCharacterSet += 32 + 128
             }
         }