Merge pull request soapyigu#227 from rockbruno/patch-1

soapyigu · web-flow · commit ba4f85054b82 · 2018-11-20T22:13:04.000-08:00
Simplify ValidPalindromeII.swift
diff --git a/String/ValidPalindromeII.swift b/String/ValidPalindromeII.swift
@@ -8,33 +8,25 @@
 
 class ValidPalindromeII {
     func validPalindrome(_ s: String) -> Bool {
-        var i = 0, j = s.count - 1
-        let sChars = Array(s)
-        
-        while i < j {
-            if sChars[i] != sChars[j] {
-                return isPalindrome(sChars, i + 1, j) || isPalindrome(sChars, i, j - 1)
-            } else {
-                i += 1
-                j -= 1
-            }
-        }
-        
-        return true
+        let array = Array(s)
+        return isPalindrome(array, 0, array.count - 1)
     }
     
-    fileprivate func isPalindrome(_ s: [Character], _ i: Int, _ j: Int) -> Bool {
+    fileprivate func isPalindrome(_ array: [Character], _ i: Int, _ j: Int, alreadyRemoved: Bool = false) -> Bool {
         var i = i, j = j
-        
         while i < j {
-            if s[i] != s[j] {
-                return false
+            if array[i] != array[j] {
+                if alreadyRemoved {
+                    return false
+                } else {
+                    return isPalindrome(array, i + 1, j, alreadyRemoved: true) || 
+                           isPalindrome(array, i, j - 1, alreadyRemoved: true)
+                }
             } else {
                 i += 1
                 j -= 1
             }
         }
-        
         return true
     }
-}
+}
