Merge pull request kodecocodes#451 from jawwad/swiftlint-fixes

vincentngo · web-flow · commit 6dc78d635da8 · 2017-04-30T17:00:01.000-04:00
Swiftlint fixes
diff --git a/All-Pairs Shortest Paths/APSP/APSP/FloydWarshall.swift b/All-Pairs Shortest Paths/APSP/APSP/FloydWarshall.swift
@@ -175,7 +175,7 @@ public struct FloydWarshallResult<T>: APSPResult where T: Hashable {
   public func path(fromVertex from: Vertex<T>, toVertex to: Vertex<T>, inGraph graph: AbstractGraph<T>) -> [T]? {
 
     if let path = recursePathFrom(fromVertex: from, toVertex: to, path: [ to ], inGraph: graph) {
-      let pathValues = path.map() { vertex in
+      let pathValues = path.map { vertex in
         vertex.data
       }
       return pathValues
diff --git a/B-Tree/BTree.playground/Contents.swift b/B-Tree/BTree.playground/Contents.swift
@@ -14,8 +14,7 @@ bTree[3]
 
 bTree.remove(2)
 
-bTree.traverseKeysInOrder {
-  key in
+bTree.traverseKeysInOrder { key in
   print(key)
 }
 
diff --git a/B-Tree/Tests/Tests/BTreeNodeTests.swift b/B-Tree/Tests/Tests/BTreeNodeTests.swift
@@ -51,4 +51,3 @@ class BTreeNodeTests: XCTestCase {
     XCTAssertEqual(root.children!.count, 2)
   }
 }
-
diff --git a/Bloom Filter/BloomFilter.playground/Contents.swift b/Bloom Filter/BloomFilter.playground/Contents.swift
@@ -10,7 +10,7 @@ public class BloomFilter<T> {
   }
 
   private func computeHashes(_ value: T) -> [Int] {
-    return hashFunctions.map() { hashFunc in abs(hashFunc(value) % array.count) }
+    return hashFunctions.map { hashFunc in abs(hashFunc(value) % array.count) }
   }
 
   public func insert(_ element: T) {
@@ -29,7 +29,7 @@ public class BloomFilter<T> {
     let hashValues = computeHashes(value)
 
     // Map hashes to indices in the Bloom Filter
-    let results = hashValues.map() { hashValue in array[hashValue] }
+    let results = hashValues.map { hashValue in array[hashValue] }
 
     // All values must be 'true' for the query to return true
 
diff --git a/Bloom Filter/BloomFilter.swift b/Bloom Filter/BloomFilter.swift
@@ -8,7 +8,7 @@ public class BloomFilter<T> {
   }
 
   private func computeHashes(_ value: T) -> [Int] {
-    return hashFunctions.map() { hashFunc in abs(hashFunc(value) % array.count) }
+    return hashFunctions.map { hashFunc in abs(hashFunc(value) % array.count) }
   }
 
   public func insert(_ element: T) {
@@ -27,7 +27,7 @@ public class BloomFilter<T> {
     let hashValues = computeHashes(value)
 
     // Map hashes to indices in the Bloom Filter
-    let results = hashValues.map() { hashValue in array[hashValue] }
+    let results = hashValues.map { hashValue in array[hashValue] }
 
     // All values must be 'true' for the query to return true
 
diff --git a/Brute-Force String Search/BruteForceStringSearch.playground/Contents.swift b/Brute-Force String Search/BruteForceStringSearch.playground/Contents.swift
@@ -6,7 +6,7 @@ extension String {
     for i in self.characters.indices {
       var j = i
       var found = true
-      for p in pattern.characters.indices{
+      for p in pattern.characters.indices {
         if j == self.characters.endIndex || self[j] != pattern[p] {
           found = false
           break
diff --git a/Brute-Force String Search/BruteForceStringSearch.swift b/Brute-Force String Search/BruteForceStringSearch.swift
@@ -6,7 +6,7 @@ extension String {
     for i in self.characters.indices {
         var j = i
         var found = true
-        for p in pattern.characters.indices{
+        for p in pattern.characters.indices {
             if j == self.characters.endIndex || self[j] != pattern[p] {
                 found = false
                 break
diff --git a/Bucket Sort/BucketSort.playground/Sources/BucketSort.swift b/Bucket Sort/BucketSort.playground/Sources/BucketSort.swift
@@ -122,7 +122,7 @@ public struct InsertionSorter: Sorter {
 // MARK: Bucket
 //////////////////////////////////////
 
-public struct Bucket<T:Sortable> {
+public struct Bucket<T: Sortable> {
   var elements: [T]
   let capacity: Int
 
diff --git a/Bucket Sort/BucketSort.swift b/Bucket Sort/BucketSort.swift
@@ -173,7 +173,7 @@ public struct InsertionSorter: Sorter {
 // MARK: Bucket
 //////////////////////////////////////
 
-public struct Bucket<T:Sortable> {
+public struct Bucket<T: Sortable> {
     var elements: [T]
     let capacity: Int
 
diff --git a/Comb Sort/Comb Sort.playground/Contents.swift b/Comb Sort/Comb Sort.playground/Contents.swift
@@ -16,5 +16,3 @@ while i < 1000 {
   i += 1
 }
 combSort(bigArray)
-
-
diff --git a/Convex Hull/Convex Hull/AppDelegate.swift b/Convex Hull/Convex Hull/AppDelegate.swift
@@ -54,4 +54,3 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 
 }
-
diff --git a/Convex Hull/Convex Hull/View.swift b/Convex Hull/Convex Hull/View.swift
@@ -150,7 +150,7 @@ class View: UIView {
         let context = UIGraphicsGetCurrentContext()
         
         // Draw hull
-        let lineWidth:CGFloat = 2.0
+        let lineWidth: CGFloat = 2.0
         
         context!.setFillColor(UIColor.black.cgColor)
         context!.setLineWidth(lineWidth)
diff --git a/Deque/Deque-Optimized.swift b/Deque/Deque-Optimized.swift
@@ -7,7 +7,7 @@ public struct Deque<T> {
   private var array: [T?]
   private var head: Int
   private var capacity: Int
-  private let originalCapacity:Int
+  private let originalCapacity: Int
 
   public init(_ capacity: Int = 10) {
     self.capacity = max(capacity, 1)
diff --git a/DiningPhilosophers/Sources/main.swift b/DiningPhilosophers/Sources/main.swift
@@ -22,8 +22,7 @@ struct ForkPair {
         if leftIndex > rightIndex {
             leftFork = ForkPair.forksSemaphore[leftIndex]
             rightFork = ForkPair.forksSemaphore[rightIndex]
-        }
-        else {
+        } else {
             leftFork = ForkPair.forksSemaphore[rightIndex]
             rightFork = ForkPair.forksSemaphore[leftIndex]
         }
diff --git a/Fixed Size Array/FixedSizeArray.playground/Contents.swift b/Fixed Size Array/FixedSizeArray.playground/Contents.swift
@@ -53,4 +53,3 @@ array.append(2)
 array[1]
 array.removeAt(index: 0)
 array.removeAll()
-
diff --git a/Graph/Graph/AdjacencyListGraph.swift b/Graph/Graph/AdjacencyListGraph.swift
@@ -12,7 +12,7 @@ import Foundation
 private class EdgeList<T> where T: Equatable, T: Hashable {
 
   var vertex: Vertex<T>
-  var edges: [Edge<T>]? = nil
+  var edges: [Edge<T>]?
 
   init(vertex: Vertex<T>) {
     self.vertex = vertex
@@ -64,7 +64,7 @@ open class AdjacencyListGraph<T>: AbstractGraph<T> where T: Equatable, T: Hashab
 
   open override func createVertex(_ data: T) -> Vertex<T> {
     // check if the vertex already exists
-    let matchingVertices = vertices.filter() { vertex in
+    let matchingVertices = vertices.filter { vertex in
       return vertex.data == data
     }
 
diff --git a/Graph/Graph/AdjacencyMatrixGraph.swift b/Graph/Graph/AdjacencyMatrixGraph.swift
@@ -46,7 +46,7 @@ open class AdjacencyMatrixGraph<T>: AbstractGraph<T> where T: Equatable, T: Hash
   // Performance: possibly O(n^2) because of the resizing of the matrix.
   open override func createVertex(_ data: T) -> Vertex<T> {
     // check if the vertex already exists
-    let matchingVertices = vertices.filter() { vertex in
+    let matchingVertices = vertices.filter { vertex in
       return vertex.data == data
     }
 
diff --git a/HaversineDistance/HaversineDistance.playground/Contents.swift b/HaversineDistance/HaversineDistance.playground/Contents.swift
@@ -1,4 +1,3 @@
-
 import UIKit
 
 func haversineDinstance(la1: Double, lo1: Double, la2: Double, lo2: Double, radius: Double = 6367444.7) -> Double {
diff --git a/Insertion Sort/InsertionSort.playground/Contents.swift b/Insertion Sort/InsertionSort.playground/Contents.swift
@@ -16,4 +16,4 @@ func insertionSort<T>(_ array: [T], _ isOrderedBefore: (T, T) -> Bool) -> [T] {
 
 let list = [ 10, -1, 3, 9, 2, 27, 8, 5, 1, 3, 0, 26 ]
 insertionSort(list, <)
-insertionSort(list, >)
+insertionSort(list, >)
diff --git a/Karatsuba Multiplication/KaratsubaMultiplication.playground/Contents.swift b/Karatsuba Multiplication/KaratsubaMultiplication.playground/Contents.swift
@@ -15,8 +15,8 @@ func ^^ (radix: Int, power: Int) -> Int {
 
 // Long Multiplication - O(n^2)
 func multiply(_ num1: Int, by num2: Int, base: Int = 10) -> Int {
-  let num1Array = String(num1).characters.reversed().map{ Int(String($0))! }
-  let num2Array = String(num2).characters.reversed().map{ Int(String($0))! }
+  let num1Array = String(num1).characters.reversed().map { Int(String($0))! }
+  let num2Array = String(num2).characters.reversed().map { Int(String($0))! }
   
   var product = Array(repeating: 0, count: num1Array.count + num2Array.count)
 
@@ -30,7 +30,7 @@ func multiply(_ num1: Int, by num2: Int, base: Int = 10) -> Int {
     product[i + num2Array.count] += carry
   }
   
-  return Int(product.reversed().map{ String($0) }.reduce("", +))!
+  return Int(product.reversed().map { String($0) }.reduce("", +))!
 }
 
 // Karatsuba Multiplication - O(n^log2(3))
diff --git a/Linked List/LinkedList.playground/Contents.swift b/Linked List/LinkedList.playground/Contents.swift
@@ -177,7 +177,7 @@ public final class LinkedList<T> {
     if list.isEmpty { return }
     var (prev, next) = nodesBeforeAndAfter(index: index)
     var nodeToCopy = list.head
-    var newNode:Node?
+    var newNode: Node?
     while let node = nodeToCopy {
       newNode = Node(value: node.value)
       newNode?.previous = prev
@@ -389,4 +389,3 @@ let listArrayLiteral2: LinkedList = ["Swift", "Algorithm", "Club"]
 listArrayLiteral2.count        // 3
 listArrayLiteral2[0]           // "Swift"
 listArrayLiteral2.removeLast()  // "Club"
-
diff --git a/Linked List/LinkedList.swift b/Linked List/LinkedList.swift
@@ -129,7 +129,7 @@ public final class LinkedList<T> {
         if list.isEmpty { return }
         var (prev, next) = nodesBeforeAndAfter(index: index)
         var nodeToCopy = list.head
-        var newNode:Node?
+        var newNode: Node?
         while let node = nodeToCopy {
             newNode = Node(value: node.value)
             newNode?.previous = prev
diff --git a/Miller-Rabin Primality Test/MRPrimality.playground/Contents.swift b/Miller-Rabin Primality Test/MRPrimality.playground/Contents.swift
@@ -21,4 +21,4 @@ mrPrimalityTest(178426363)
 mrPrimalityTest(32415187747)
 
 // With iteration
-mrPrimalityTest(32416190071, iteration: 10)
+mrPrimalityTest(32416190071, iteration: 10)
diff --git a/QuadTree/QuadTree.playground/Contents.swift b/QuadTree/QuadTree.playground/Contents.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 let tree = QuadTree(rect: Rect(origin: Point(0, 0), size: Size(xLength: 10, yLength: 10)))
diff --git a/QuadTree/QuadTree.playground/Sources/QuadTree.swift b/QuadTree/QuadTree.playground/Sources/QuadTree.swift
@@ -1,4 +1,3 @@
-
 public struct Point {
   let x: Double
   let y: Double
diff --git a/Red-Black Tree/Red-Black Tree 2.playground/Sources/RBTree.swift b/Red-Black Tree/Red-Black Tree 2.playground/Sources/RBTree.swift
@@ -1,4 +1,3 @@
-
 private enum RBTColor {
     case red
     case black
@@ -8,9 +7,9 @@ private enum RBTColor {
 public class RBTNode<T: Comparable>: CustomStringConvertible {
     fileprivate var color: RBTColor = .red
     public var value: T! = nil
-    public var right:  RBTNode<T>!
-    public var left:  RBTNode<T>!
-    public var parent:  RBTNode<T>!
+    public var right: RBTNode<T>!
+    public var left: RBTNode<T>!
+    public var parent: RBTNode<T>!
     
     public var description: String {
         if self.value == nil {
@@ -23,7 +22,7 @@ public class RBTNode<T: Comparable>: CustomStringConvertible {
             // If the value is encapsulated by double pipes it is double black (This should not occur in a verified RBTree)
             if self.isRed {
                 nodeValue = "(\(self.value!))"
-            } else if self.isBlack{
+            } else if self.isBlack {
                 nodeValue = "|\(self.value!)|"
             } else {
                 nodeValue = "||\(self.value!)||"
@@ -436,7 +435,7 @@ public class RBTree<T: Comparable>: CustomStringConvertible {
     private func property3() {
         let bDepth = blackDepth(root: self.root)
         
-        let leaves:[RBTNode<T>] = getLeaves(n: self.root)
+        let leaves: [RBTNode<T>] = getLeaves(n: self.root)
         
         for leaflet in leaves {
             var leaf = leaflet
diff --git a/Rootish Array Stack/Tests/RootishArrayStackTests.swift b/Rootish Array Stack/Tests/RootishArrayStackTests.swift
@@ -1,10 +1,10 @@
 import XCTest
 
 fileprivate extension RootishArrayStack {
-	func equal(toArray array: Array<Int>) -> Bool{
+	func equal(toArray array: Array<Int>) -> Bool {
 		for index in 0..<count {
 			guard let integerElement = self[index] as? Int else { return false }
-			if (array[index] != integerElement) {
+			if array[index] != integerElement {
 				return false
 			}
 		}
diff --git a/Run-Length Encoding/RLE.playground/Contents.swift b/Run-Length Encoding/RLE.playground/Contents.swift
@@ -113,4 +113,4 @@ func runTests() -> Bool {
     return result
 }
 
-runTests()
+runTests()
diff --git a/Shell Sort/ShellSortExample.swift b/Shell Sort/ShellSortExample.swift
@@ -22,7 +22,7 @@ public func shellSort(_ list : inout [Int]) {
             
             guard sublistCount == 1 && index > 0 else { continue }
             
-            while list[index - 1] > list[index] && index - 1 > 0  {
+            while list[index - 1] > list[index] && index - 1 > 0 {
                 swap(&list[index - 1], &list[index])
                 index -= 1
             }
diff --git a/Shunting Yard/ShuntingYard.playground/Sources/Stack.swift b/Shunting Yard/ShuntingYard.playground/Sources/Stack.swift
@@ -31,8 +31,7 @@ public struct Stack<T> {
 extension Stack: Sequence {
     public func makeIterator() -> AnyIterator<T> {
         var curr = self
-        return AnyIterator {
-            _ -> T? in
+        return AnyIterator { _ -> T? in
             return curr.pop()
         }
     }
diff --git a/Single-Source Shortest Paths (Weighted)/SSSP/BellmanFord.swift b/Single-Source Shortest Paths (Weighted)/SSSP/BellmanFord.swift
@@ -41,7 +41,7 @@ extension BellmanFord: SSSPAlgorithm {
 
     for _ in 0 ..< vertices.count - 1 {
       var weightsUpdated = false
-      edges.forEach() { edge in
+      edges.forEach { edge in
         let weight = edge.weight!
         let relaxedDistance = weights[edge.from.index] + weight
         let nextVertexIdx = edge.to.index
@@ -116,7 +116,7 @@ extension BellmanFordResult: SSSPResult {
       return nil
     }
 
-    return path.map() { vertex in
+    return path.map { vertex in
       return vertex.data
     }
   }
diff --git a/Skip-List/SkipList.swift b/Skip-List/SkipList.swift
@@ -52,10 +52,9 @@ public struct Stack<T> {
 extension Stack: Sequence {
   public func makeIterator() -> AnyIterator<T> {
     var curr = self
-    return AnyIterator {
-             _ -> T? in
-             return curr.pop()
-      }
+    return AnyIterator { _ -> T? in
+      return curr.pop()
+    }
   }
 }
 
@@ -118,8 +117,7 @@ extension SkipList {
           if value.key == key {
             isFound = true
             break
-          }
-          else {
+          } else {
             if key < value.key! {
               currentNode = node.down
             } else {
@@ -285,7 +283,7 @@ extension SkipList {
 
 extension SkipList {
   
-  public func get(key:Key) -> Payload?{
+  public func get(key: Key) -> Payload? {
     return search(key: key)
   }
 }
diff --git a/Stack/Stack.swift b/Stack/Stack.swift
@@ -30,8 +30,7 @@ public struct Stack<T> {
 extension Stack: Sequence {
     public func makeIterator() -> AnyIterator<T> {
         var curr = self
-        return AnyIterator {
-            _ -> T? in
+        return AnyIterator { _ -> T? in
             return curr.pop()
         }
     }
diff --git a/Strassen Matrix Multiplication/StrassensMatrixMultiplication.playground/Sources/Number.swift b/Strassen Matrix Multiplication/StrassensMatrixMultiplication.playground/Sources/Number.swift
@@ -37,7 +37,7 @@ extension Array where Element: Number {
   public func dot(_ b: Array<Element>) -> Element {
     let a = self
     assert(a.count == b.count, "Can only take the dot product of arrays of the same length!")
-    let c = a.indices.map{ a[$0] * b[$0] }
+    let c = a.indices.map { a[$0] * b[$0] }
     return c.reduce(Element.zero, { $0 + $1 })
   }
 }
diff --git a/Topological Sort/Graph.swift b/Topological Sort/Graph.swift
diff --git a/Topological Sort/Topological Sort.playground/Sources/Graph.swift b/Topological Sort/Topological Sort.playground/Sources/Graph.swift
diff --git a/Topological Sort/Topological Sort.playground/Sources/TopologicalSort1.swift b/Topological Sort/Topological Sort.playground/Sources/TopologicalSort1.swift
diff --git a/Topological Sort/TopologicalSort1.swift b/Topological Sort/TopologicalSort1.swift
diff --git a/Trie/Trie/Trie/AppDelegate.swift b/Trie/Trie/Trie/AppDelegate.swift
diff --git a/Trie/Trie/Trie/ViewController.swift b/Trie/Trie/Trie/ViewController.swift
diff --git a/Trie/Trie/TrieTests/TrieTests.swift b/Trie/Trie/TrieTests/TrieTests.swift

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public struct FloydWarshallResult<T>: APSPResult where T: Hashable {`
`175`	`175`	`public func path(fromVertex from: Vertex<T>, toVertex to: Vertex<T>, inGraph graph: AbstractGraph<T>) -> [T]? {`
`176`	`176`
`177`	`177`	`if let path = recursePathFrom(fromVertex: from, toVertex: to, path: [ to ], inGraph: graph) {`
`178`		`- let pathValues = path.map() { vertex in`
	`178`	`+ let pathValues = path.map { vertex in`
`179`	`179`	`vertex.data`
`180`	`180`	`}`
`181`	`181`	`return pathValues`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@ bTree[3]`
`14`	`14`
`15`	`15`	`bTree.remove(2)`
`16`	`16`
`17`		`-bTree.traverseKeysInOrder {`
`18`		`- key in`
	`17`	`+bTree.traverseKeysInOrder { key in`
`19`	`18`	`print(key)`
`20`	`19`	`}`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,3 @@ class BTreeNodeTests: XCTestCase {`
`51`	`51`	`XCTAssertEqual(root.children!.count, 2)`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`-`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class BloomFilter<T> {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`private func computeHashes(_ value: T) -> [Int] {`
`13`		`- return hashFunctions.map() { hashFunc in abs(hashFunc(value) % array.count) }`
	`13`	`+ return hashFunctions.map { hashFunc in abs(hashFunc(value) % array.count) }`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public func insert(_ element: T) {`
`@@ -29,7 +29,7 @@ public class BloomFilter<T> {`
`29`	`29`	`let hashValues = computeHashes(value)`
`30`	`30`
`31`	`31`	`// Map hashes to indices in the Bloom Filter`
`32`		`- let results = hashValues.map() { hashValue in array[hashValue] }`
	`32`	`+ let results = hashValues.map { hashValue in array[hashValue] }`
`33`	`33`
`34`	`34`	`// All values must be 'true' for the query to return true`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class BloomFilter<T> {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`private func computeHashes(_ value: T) -> [Int] {`
`11`		`- return hashFunctions.map() { hashFunc in abs(hashFunc(value) % array.count) }`
	`11`	`+ return hashFunctions.map { hashFunc in abs(hashFunc(value) % array.count) }`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public func insert(_ element: T) {`
`@@ -27,7 +27,7 @@ public class BloomFilter<T> {`
`27`	`27`	`let hashValues = computeHashes(value)`
`28`	`28`
`29`	`29`	`// Map hashes to indices in the Bloom Filter`
`30`		`- let results = hashValues.map() { hashValue in array[hashValue] }`
	`30`	`+ let results = hashValues.map { hashValue in array[hashValue] }`
`31`	`31`
`32`	`32`	`// All values must be 'true' for the query to return true`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,3 @@ while i < 1000 {`
`16`	`16`	`i += 1`
`17`	`17`	`}`
`18`	`18`	`combSort(bigArray)`
`19`		`-`
`20`		`-`