From d3df0d49ad6a7d7c30243b24081f68c96df485f0 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 21 Jul 2015 20:25:01 -0700 Subject: [PATCH] Little bit of code clean up --- Enigma/Components.swift | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Enigma/Components.swift b/Enigma/Components.swift index 53f1477..69348cd 100644 --- a/Enigma/Components.swift +++ b/Enigma/Components.swift @@ -176,15 +176,6 @@ class Rotor: FixedRotor { return Cryptor.alphabet[adjustedPosition] } - func convertToInverseExitCharacter(c: Character) throws -> Character { - let encodedPosition = try indexOfInAlphabet(c) - var adjustedPosition = (encodedPosition - position) % Cryptor.alphabet.count - if adjustedPosition < 0 { - adjustedPosition += Cryptor.alphabet.count - } - return Cryptor.alphabet[adjustedPosition] - } - override func encode(c: Character) throws -> Character { let adjustedPosition = try getIndexAdjustedForRotation(c) let encodedChar = rotatedSeries[adjustedPosition] @@ -198,7 +189,7 @@ class Rotor: FixedRotor { let adjustedChar = rotatedSeries[adjustedPosition] let lookMeUp = try indexOfInSeries(adjustedChar) let decodedChar = Cryptor.alphabet[lookMeUp] - let finalChar = try convertToInverseExitCharacter(decodedChar) + let finalChar = try convertToExitCharacter(decodedChar) print("Encode (pos \(position): \(c) -> \(finalChar)") return finalChar }