Skip to content

Commit d5f70bb

Browse files
committed
Updated Xcode.
1 parent d3a8912 commit d5f70bb

File tree

6 files changed

+24
-11
lines changed

6 files changed

+24
-11
lines changed

KRKmeans.xcodeproj/project.pbxproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
8EE975261960257100335EB2 /* Project object */ = {
218218
isa = PBXProject;
219219
attributes = {
220-
LastUpgradeCheck = 0510;
220+
LastUpgradeCheck = 0700;
221221
ORGANIZATIONNAME = Kalvar;
222222
TargetAttributes = {
223223
8EE9754E1960257200335EB2 = {
@@ -342,6 +342,7 @@
342342
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
343343
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
344344
COPY_PHASE_STRIP = NO;
345+
ENABLE_TESTABILITY = YES;
345346
GCC_C_LANGUAGE_STANDARD = gnu99;
346347
GCC_DYNAMIC_NO_PIC = NO;
347348
GCC_OPTIMIZATION_LEVEL = 0;
@@ -402,6 +403,7 @@
402403
GCC_PRECOMPILE_PREFIX_HEADER = YES;
403404
GCC_PREFIX_HEADER = "KRKmeans/KRKmeans-Prefix.pch";
404405
INFOPLIST_FILE = "KRKmeans/KRKmeans-Info.plist";
406+
PRODUCT_BUNDLE_IDENTIFIER = "com.kalvar.kmeans.${PRODUCT_NAME:rfc1034identifier}";
405407
PRODUCT_NAME = "$(TARGET_NAME)";
406408
WRAPPER_EXTENSION = app;
407409
};
@@ -415,6 +417,7 @@
415417
GCC_PRECOMPILE_PREFIX_HEADER = YES;
416418
GCC_PREFIX_HEADER = "KRKmeans/KRKmeans-Prefix.pch";
417419
INFOPLIST_FILE = "KRKmeans/KRKmeans-Info.plist";
420+
PRODUCT_BUNDLE_IDENTIFIER = "com.kalvar.kmeans.${PRODUCT_NAME:rfc1034identifier}";
418421
PRODUCT_NAME = "$(TARGET_NAME)";
419422
WRAPPER_EXTENSION = app;
420423
};
@@ -436,6 +439,7 @@
436439
"$(inherited)",
437440
);
438441
INFOPLIST_FILE = "KRKmeansTests/KRKmeansTests-Info.plist";
442+
PRODUCT_BUNDLE_IDENTIFIER = "com.kalvar.kmeans.${PRODUCT_NAME:rfc1034identifier}";
439443
PRODUCT_NAME = "$(TARGET_NAME)";
440444
TEST_HOST = "$(BUNDLE_LOADER)";
441445
WRAPPER_EXTENSION = xctest;
@@ -454,6 +458,7 @@
454458
GCC_PRECOMPILE_PREFIX_HEADER = YES;
455459
GCC_PREFIX_HEADER = "KRKmeans/KRKmeans-Prefix.pch";
456460
INFOPLIST_FILE = "KRKmeansTests/KRKmeansTests-Info.plist";
461+
PRODUCT_BUNDLE_IDENTIFIER = "com.kalvar.kmeans.${PRODUCT_NAME:rfc1034identifier}";
457462
PRODUCT_NAME = "$(TARGET_NAME)";
458463
TEST_HOST = "$(BUNDLE_LOADER)";
459464
WRAPPER_EXTENSION = xctest;
Binary file not shown.

KRKmeans.xcodeproj/xcuserdata/Kalvar.xcuserdatad/xcschemes/KRKmeans.xcscheme

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0510"
3+
LastUpgradeVersion = "0700"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
3232
skipped = "NO">
@@ -48,17 +48,21 @@
4848
ReferencedContainer = "container:KRKmeans.xcodeproj">
4949
</BuildableReference>
5050
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
5153
</TestAction>
5254
<LaunchAction
55+
buildConfiguration = "Debug"
5356
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5457
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5558
launchStyle = "0"
5659
useCustomWorkingDirectory = "NO"
57-
buildConfiguration = "Debug"
5860
ignoresPersistentStateOnLaunch = "NO"
5961
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
6063
allowLocationSimulation = "YES">
61-
<BuildableProductRunnable>
64+
<BuildableProductRunnable
65+
runnableDebuggingMode = "0">
6266
<BuildableReference
6367
BuildableIdentifier = "primary"
6468
BlueprintIdentifier = "8EE9752D1960257200335EB2"
@@ -71,12 +75,13 @@
7175
</AdditionalOptions>
7276
</LaunchAction>
7377
<ProfileAction
78+
buildConfiguration = "Release"
7479
shouldUseLaunchSchemeArgsEnv = "YES"
7580
savedToolIdentifier = ""
7681
useCustomWorkingDirectory = "NO"
77-
buildConfiguration = "Release"
7882
debugDocumentVersioning = "YES">
79-
<BuildableProductRunnable>
83+
<BuildableProductRunnable
84+
runnableDebuggingMode = "0">
8085
<BuildableReference
8186
BuildableIdentifier = "primary"
8287
BlueprintIdentifier = "8EE9752D1960257200335EB2"

KRKmeans/KRKmeans-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.kalvar.kmeans.${PRODUCT_NAME:rfc1034identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

KRKmeansTests/KRKmeansTests-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.kalvar.kmeans.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>

ML/KRKmeans.m

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ -(NSArray *)_useAverageVectorCalculateCenters:(NSArray *)_clusteredSets
7575

7676
@end
7777

78-
@implementation KRKmeans (fixClusters)
78+
@implementation KRKmeans (fixDistances)
7979

8080
// Euclidean distance, 歐基里德 2 點距離公式
8181
-(float)_distanceEuclidean2PointsX1:(NSArray *)_x1 x2:(NSArray *)_x2
@@ -138,6 +138,9 @@ -(float)_distanceX1:(NSArray *)_x1 x2:(NSArray *)_x2
138138
return _distance;
139139
}
140140

141+
@end
142+
143+
@implementation KRKmeans (fixClusters)
141144
/*
142145
* @ 依照群聚中心點 _centers 進行 _sources 群聚分類
143146
*/

0 commit comments

Comments
 (0)