Merge pull request kodecocodes#189 from nemanjavlahovic/master

Array 2D

Author: Chris Pilcher

.travis.yml

@@ -9,7 +9,7 @@ install:
 script:
 
 # - xcodebuild test -project ./All-Pairs\ Shortest\ Paths/APSP/APSP.xcodeproj -scheme APSPTests
-# - xcodebuild test -project ./Array2D/Tests/Tests.xcodeproj -scheme Tests
+ - xcodebuild test -project ./Array2D/Tests/Tests.xcodeproj -scheme Tests
  - xcodebuild test -project ./AVL\ Tree/Tests/Tests.xcodeproj -scheme Tests
  - xcodebuild test -project ./Binary\ Search/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Binary\ Search\ Tree/Solution\ 1/Tests/Tests.xcodeproj -scheme Tests

Array2D/Array2D.playground/Contents.swift

@@ -6,12 +6,12 @@
 public struct Array2D<T> {
   public let columns: Int
   public let rows: Int
-  private var array: [T]
+  fileprivate var array: [T]
 
   public init(columns: Int, rows: Int, initialValue: T) {
     self.columns = columns
     self.rows = rows
-    array = .init(count: rows*columns, repeatedValue: initialValue)
+    array = .init(repeatElement(initialValue, count: rows*columns))
   }
 
   public subscript(column: Int, row: Int) -> T {

Array2D/Array2D.swift

@@ -6,12 +6,12 @@
 public struct Array2D<T> {
   public let columns: Int
   public let rows: Int
-  private var array: [T]
+  fileprivate var array: [T]
 
   public init(columns: Int, rows: Int, initialValue: T) {
     self.columns = columns
     self.rows = rows
-    array = .init(count: rows*columns, repeatedValue: initialValue)
+    array = .init(repeating: initialValue, count: rows*columns)
   }
 
   public subscript(column: Int, row: Int) -> T {

Array2D/Tests/Array2DTests.swift

@@ -43,7 +43,7 @@ class Array2DTest: XCTestCase {
   }
 
   func testPerformanceOnSmallArray() {
-    self.measureBlock {
+    self.measure {
       self.printArrayWith(columns: 2, rows: 2, inititalValue: 1)
     }
   }
@@ -54,7 +54,7 @@ class Array2DTest: XCTestCase {
   //        }
   //    }
 
-  private func printArrayWith(columns columns: Int, rows: Int, inititalValue: Int) {
+  fileprivate func printArrayWith(columns: Int, rows: Int, inititalValue: Int) {
     let array = Array2D(columns: columns, rows: rows, initialValue: 4)
     for r in 0..<array.rows {
       for c in 0..<array.columns {

Array2D/Tests/Tests.xcodeproj/project.pbxproj

@@ -88,6 +88,7 @@
 				TargetAttributes = {
 					7B2BBC7F1C779D720067B71D = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -220,6 +221,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;
 		};
@@ -231,6 +233,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;
 		};