Updated V2.3

Added Cosine Similarity method to do Multi-Dimensional clustering.

Author: Kalvar

KRKmeans.xcodeproj/project.xcworkspace/xcshareddata/KRKmeans.xccheckout

@@ -7,14 +7,14 @@
 	<key>IDESourceControlProjectIdentifier</key>
 	<string>E57A2907-A074-4106-B530-22DF2BC0D9E7</string>
 	<key>IDESourceControlProjectName</key>
-	<string>KRKmeans</string>
+	<string>project</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
 		<key>0FD47910F037E012AA6F179F93F7DFEC0BB80E7B</key>
 		<string>https://github.com/Kalvar/ios-KRKmeans-Algorithm.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>KRKmeans.xcodeproj</string>
+	<string>KRKmeans.xcodeproj/project.xcworkspace</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
 		<key>0FD47910F037E012AA6F179F93F7DFEC0BB80E7B</key>

KRKmeans.xcodeproj/project.xcworkspace/xcuserdata/Kalvar.xcuserdatad/UserInterfaceState.xcuserstate

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.h
-//  KRKmeans V2.1
+//  KRKmeans V2.3
 //
 //  Created by Kalvar on 2014/6/29.
 //  Copyright (c) 2014 - 2015年 Kalvar Lin, [email protected]. All rights reserved.

KRKmeans/AppDelegate.h

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.m
-//  KRKmeans V2.1
+//  KRKmeans V2.3
 //
 //  Created by Kalvar on 2014/6/29.
 //  Copyright (c) 2014 - 2015年 Kalvar Lin, [email protected]. All rights reserved.

KRKmeans/AppDelegate.m

@@ -1,6 +1,6 @@
 //
 //  ViewController.h
-//  KRKmeans V2.1
+//  KRKmeans V2.3
 //
 //  Created by Kalvar on 2014/6/29.
 //  Copyright (c) 2014 - 2015年 Kalvar Lin, [email protected]. All rights reserved.

KRKmeans/ViewController.h

@@ -1,6 +1,6 @@
 //
 //  ViewController.m
-//  KRKmeans V2.1
+//  KRKmeans V2.3
 //
 //  Created by Kalvar on 2014/6/29.
 //  Copyright (c) 2014 - 2015年 Kalvar Lin, [email protected]. All rights reserved.
@@ -51,14 +51,19 @@ - (void)viewDidLoad
     KRKmeans *_krKmeans = [KRKmeans sharedKmeans];
     //It means A sets. ( and the centers will be calculated here. )
     [_krKmeans addSets:@[@[@1, @1], @[@1, @2], @[@2, @2], @[@3, @2], @[@3, @1]]];
+    
     //It means B sets.
     [_krKmeans addSets:@[@[@6, @4], @[@7, @6], @[@5, @6], @[@6, @5]]];
+    
     //It means C sets and the center.
     //[_krKmeans addSets:@[@[@7, @8]]];
+    
     //It means D sets.
     //[_krKmeans addSets:@[@[@3, @12], @[@5, @20]]];
+    
     //It means X sets which wanna be clustered, if you don't setup this, the KRKmeans will cluster the original sets to be new groups.
     [_krKmeans addPatterns:@[@[@5, @4], @[@3, @4], @[@2, @5], @[@9, @8], @[@3, @20]]];
+    
     [_krKmeans clusteringWithCompletion:^(BOOL success, NSArray *clusters, NSArray *centers, NSInteger totalTimes)
     {
         NSLog(@"totalTimes : %li", totalTimes);
@@ -84,6 +89,26 @@ - (void)viewDidLoad
             A Sets : (1, 1) (1, 2) (2, 2) (3, 2) (3, 1) (3, 4) (2, 5) (6, 4) (7, 6) (5, 6) (6, 5) (5, 4)
             B Sets : (9, 8) (3, 20)
      */
+    
+    // Multi-Dimensional K-Means
+    KRKmeans *_multiKmeans = [[KRKmeans alloc] init];
+    [_multiKmeans addSets:@[@[@20, @9, @1, @3, @6, @2], @[@52, @32, @18, @7, @0, @1], @[@30, @18, @2, @27, @18, @5]]];
+    [_multiKmeans addSets:@[@[@2, @20, @15, @5, @9, @16], @[@7, @11, @2, @12, @1, @0]]];
+    
+    [_multiKmeans addPatterns:@[@[@20, @1, @10, @2, @12, @3], @[@20, @8, @3, @21, @8, @25], @[@2, @30, @8, @6, @33, @29]]];
+    [_multiKmeans addPatterns:@[@[@10, @3, @5, @12, @9, @8], @[@2, @1, @9, @30, @28, @13], @[@22, @50, @43, @22, @11, @2]]];
+    [_multiKmeans addPatterns:@[@[@18, @10, @20, @42, @32, @13], @[@5, @4, @28, @16, @3, @9]]];
+    
+    [_multiKmeans clusteringWithCompletion:^(BOOL success, NSArray *clusters, NSArray *centers, NSInteger totalTimes)
+    {
+        NSLog(@"totalTimes : %li", totalTimes);
+        NSLog(@"clusters : %@", clusters);
+        NSLog(@"centers : %@", centers);
+        NSLog(@"SSE : %lf", [_multiKmeans calculateSSE]);
+    } eachGeneration:^(NSInteger times, NSArray *clusters, NSArray *centers)
+    {
+        NSLog(@"times : %li", times);
+    }];
 }
 
 - (void)didReceiveMemoryWarning

KRKmeans/ViewController.m

@@ -1,6 +1,6 @@
 //
 //  main.m
-//  KRKmeans V2.1
+//  KRKmeans V2.3
 //
 //  Created by Kalvar on 2014/6/29.
 //  Copyright (c) 2014 - 2015年 Kalvar Lin, [email protected]. All rights reserved.

KRKmeans/main.m

@@ -1,6 +1,6 @@
 //
-//  KRKmeans V2.1Tests.m
-//  KRKmeans V2.1Tests
+//  KRKmeans V2.3Tests.m
+//  KRKmeans V2.3Tests
 //
 //  Created by Kalvar on 2014/6/29.
 //  Copyright (c) 2014 - 2015年 Kalvar Lin, [email protected]. All rights reserved.

KRKmeansTests/KRKmeansTests.m

@@ -1,6 +1,6 @@
 //
 //  KRKmeans.h
-//  KRKmeans V2.1
+//  KRKmeans V2.3
 //
 //  Created by Kalvar on 2014/6/30.
 //  Copyright (c) 2014 - 2015年 Kalvar Lin, [email protected]. All rights reserved.
@@ -49,15 +49,14 @@ typedef void(^KRKmeansClusteringCompletion)(BOOL success, NSArray *clusters, NSA
  */
 typedef void(^KRKmeansEachGeneration)(NSInteger times, NSArray *clusters, NSArray *centers);
 
-
 @interface KRKmeans : NSObject
 
 //要訓練分群用的集合樣本
 @property (nonatomic, strong) NSMutableArray *sets;
 //每一群的中心點
 @property (nonatomic, strong) NSMutableArray *centers;
 //要分群的集合數據
-@property (nonatomic, strong) NSArray *patterns;
+@property (nonatomic, strong) NSMutableArray *patterns;
 //分群結果
 @property (nonatomic, strong) NSMutableArray *results;
 //收斂誤差