Merge pull request kodecocodes#218 from raywenderlich/Swift3BoundedPriorityQueue

Swift3 bounded priority queue

Author: kelvinlauKL

Bounded Priority Queue/BoundedPriorityQueue.playground/Sources/BoundedPriorityQueue.swift

@@ -12,7 +12,7 @@ public class BoundedPriorityQueue<T: Comparable> {
   private typealias Node = LinkedListNode<T>
 
   private(set) public var count = 0
-  private var head: Node?
+  fileprivate var head: Node?
   private var tail: Node?
   private var maxElements: Int
 
@@ -28,7 +28,7 @@ public class BoundedPriorityQueue<T: Comparable> {
     return head?.value
   }
 
-  public func enqueue(value: T) {
+  public func enqueue(_ value: T) {
     if let node = insert(value, after: findInsertionPoint(value)) {
       // If the newly inserted node is the last one in the list, then update
       // the tail pointer.
@@ -44,7 +44,7 @@ public class BoundedPriorityQueue<T: Comparable> {
     }
   }
 
-  private func insert(value: T, after: Node?) -> Node? {
+  private func insert(_ value: T, after: Node?) -> Node? {
     if let previous = after {
 
       // If the queue is full and we have to insert at the end of the list,
@@ -78,11 +78,11 @@ public class BoundedPriorityQueue<T: Comparable> {
 
   /* Find the node after which to insert the new value. If this returns nil,
      the new value should be inserted at the head of the list. */
-  private func findInsertionPoint(value: T) -> Node? {
+  private func findInsertionPoint(_ value: T) -> Node? {
     var node = head
     var prev: Node? = nil
 
-    while let current = node where value < current.value {
+    while let current = node, value < current.value {
       prev = node
       node = current.next
     }

Bounded Priority Queue/README.markdown

@@ -35,7 +35,7 @@ public class BoundedPriorityQueue<T: Comparable> {
   private typealias Node = LinkedListNode<T>
 
   private(set) public var count = 0
-  private var head: Node?
+  fileprivate var head: Node?
   private var tail: Node?
   private var maxElements: Int
 
@@ -55,7 +55,7 @@ public class BoundedPriorityQueue<T: Comparable> {
 The `BoundedPriorityQueue` class contains a doubly linked list of `LinkedListNode` objects. Nothing special here yet. The fun stuff happens in the `enqueue()` method:
 
 ```swift
-public func enqueue(value: T) {
+public func enqueue(_ value: T) {
   if let node = insert(value, after: findInsertionPoint(value)) {
     // If the newly inserted node is the last one in the list, then update
     // the tail pointer.
@@ -71,7 +71,7 @@ public func enqueue(value: T) {
   }
 }
 
-private func insert(value: T, after: Node?) -> Node? {
+private func insert(_ value: T, after: Node?) -> Node? {
   if let previous = after {
 
     // If the queue is full and we have to insert at the end of the list,
@@ -105,7 +105,7 @@ private func insert(value: T, after: Node?) -> Node? {
 
 /* Find the node after which to insert the new value. If this returns nil,
    the new value should be inserted at the head of the list. */
-private func findInsertionPoint(value: T) -> Node? {
+private func findInsertionPoint(_ value: T) -> Node? {
   var node = head
   var prev: Node? = nil