Skip to content

Commit cafba43

Browse files
author
Aleph Retamal
committed
[Swift 4.2] Update K-Means
1 parent f08d5fc commit cafba43

File tree

5 files changed

+30
-13
lines changed

5 files changed

+30
-13
lines changed

K-Means/KMeans.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class KMeans<Label: Hashable> {
1212
}
1313

1414
private func indexOfNearestCenter(_ x: Vector, centers: [Vector]) -> Int {
15-
var nearestDist = DBL_MAX
15+
var nearestDist = Double.greatestFiniteMagnitude
1616
var minIndex = 0
1717

1818
for (idx, center) in centers.enumerated() {

K-Means/Tests/KMeansTests.swift

-7
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@ import Foundation
1010
import XCTest
1111

1212
class KMeansTests: XCTestCase {
13-
func testSwift4() {
14-
// last checked with Xcode 9.0b4
15-
#if swift(>=4.0)
16-
print("Hello, Swift 4!")
17-
#endif
18-
}
19-
2013
func genPoints(_ numPoints: Int, numDimensions: Int) -> [Vector] {
2114
var points = [Vector]()
2215
for _ in 0..<numPoints {

K-Means/Tests/Tests.xcodeproj/project.pbxproj

+20-4
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@
8585
isa = PBXProject;
8686
attributes = {
8787
LastSwiftUpdateCheck = 0720;
88-
LastUpgradeCheck = 0820;
88+
LastUpgradeCheck = 1000;
8989
TargetAttributes = {
9090
B80894DF1C852D100018730E = {
9191
CreatedOnToolsVersion = 7.2.1;
92-
LastSwiftMigration = 0820;
92+
LastSwiftMigration = 1000;
9393
};
9494
};
9595
};
@@ -137,12 +137,20 @@
137137
B80894D91C852CDC0018730E /* Debug */ = {
138138
isa = XCBuildConfiguration;
139139
buildSettings = {
140+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
140141
CLANG_WARN_BOOL_CONVERSION = YES;
142+
CLANG_WARN_COMMA = YES;
141143
CLANG_WARN_CONSTANT_CONVERSION = YES;
144+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
142145
CLANG_WARN_EMPTY_BODY = YES;
143146
CLANG_WARN_ENUM_CONVERSION = YES;
144147
CLANG_WARN_INFINITE_RECURSION = YES;
145148
CLANG_WARN_INT_CONVERSION = YES;
149+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
150+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
151+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
152+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
153+
CLANG_WARN_STRICT_PROTOTYPES = YES;
146154
CLANG_WARN_SUSPICIOUS_MOVE = YES;
147155
CLANG_WARN_UNREACHABLE_CODE = YES;
148156
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -162,12 +170,20 @@
162170
B80894DA1C852CDC0018730E /* Release */ = {
163171
isa = XCBuildConfiguration;
164172
buildSettings = {
173+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
165174
CLANG_WARN_BOOL_CONVERSION = YES;
175+
CLANG_WARN_COMMA = YES;
166176
CLANG_WARN_CONSTANT_CONVERSION = YES;
177+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
167178
CLANG_WARN_EMPTY_BODY = YES;
168179
CLANG_WARN_ENUM_CONVERSION = YES;
169180
CLANG_WARN_INFINITE_RECURSION = YES;
170181
CLANG_WARN_INT_CONVERSION = YES;
182+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
183+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
184+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
185+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
186+
CLANG_WARN_STRICT_PROTOTYPES = YES;
171187
CLANG_WARN_SUSPICIOUS_MOVE = YES;
172188
CLANG_WARN_UNREACHABLE_CODE = YES;
173189
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -229,7 +245,7 @@
229245
PRODUCT_NAME = "$(TARGET_NAME)";
230246
SDKROOT = macosx;
231247
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
232-
SWIFT_VERSION = 4.0;
248+
SWIFT_VERSION = 4.2;
233249
};
234250
name = Debug;
235251
};
@@ -271,7 +287,7 @@
271287
PRODUCT_BUNDLE_IDENTIFIER = com.alvahouse322.Tests;
272288
PRODUCT_NAME = "$(TARGET_NAME)";
273289
SDKROOT = macosx;
274-
SWIFT_VERSION = 4.0;
290+
SWIFT_VERSION = 4.2;
275291
};
276292
name = Release;
277293
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

K-Means/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)