Merge pull request #233 from JaapWijnen/update-priority-queue

Updated priority queue to swift 3

Author: kelvinlauKL

Priority Queue/PriorityQueue.swift

@@ -11,13 +11,13 @@
   queue (largest element first) or a min-priority queue (smallest element first).
 */
 public struct PriorityQueue<T> {
-  private var heap: Heap<T>
+  fileprivate var heap: Heap<T>
 
   /*
     To create a max-priority queue, supply a > sort function. For a min-priority
     queue, use <.
   */
-  public init(sort: (T, T) -> Bool) {
+  public init(sort: @escaping (T, T) -> Bool) {
     heap = Heap(sort: sort)
   }
 
@@ -33,7 +33,7 @@ public struct PriorityQueue<T> {
     return heap.peek()
   }
 
-  public mutating func enqueue(element: T) {
+  public mutating func enqueue(_ element: T) {
     heap.insert(element)
   }
 
@@ -52,7 +52,7 @@ public struct PriorityQueue<T> {
 }
 
 extension PriorityQueue where T: Equatable {
-  public func indexOf(element: T) -> Int? {
-    return heap.indexOf(element)
+  public func index(of element: T) -> Int? {
+    return heap.index(of: element)
   }
 }

Priority Queue/README.markdown

@@ -8,7 +8,7 @@ The queue can be a *max-priority* queue (largest element first) or a *min-priori
 
 Priority queues are useful for algorithms that need to process a (large) number of items and where you repeatedly need to identify which one is now the biggest or smallest -- or however you define "most important".
 
-Examples of algorithms that can benefit from a priority queue: 
+Examples of algorithms that can benefit from a priority queue:
 
 - Event-driven simulations. Each event is given a timestamp and you want events to be performed in order of their timestamps. The priority queue makes it easy to find the next event that needs to be simulated.
 - Dijkstra's algorithm for graph searching uses a priority queue to calculate the minimum cost.
@@ -39,7 +39,7 @@ Here's a Swift priority queue based on a heap:
 
 ```swift
 public struct PriorityQueue<T> {
-  private var heap: Heap<T>
+  fileprivate var heap: Heap<T>
 
   public init(sort: (T, T) -> Bool) {
     heap = Heap(sort: sort)

Priority Queue/Tests/Tests.xcodeproj/project.pbxproj

@@ -86,11 +86,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Swift Algorithm Club";
 				TargetAttributes = {
 					7B2BBC7F1C779D720067B71D = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -149,8 +150,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -193,8 +196,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -213,6 +218,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -224,6 +230,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -235,6 +242,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

Priority Queue/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"