kmeans-crystal 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d58aa8e75aff1be703afe7ad5c3d89ff09d17512
-  data.tar.gz: 51c94d22cee9f8c7f46b5a29d60b324b656bd5ae
+  metadata.gz: 57707a16da2fbc32a0b01dbb8d38abfc85e244d9
+  data.tar.gz: 33f7ee2bd5e1f41c09bcd69c5dec2bccfd8eb90a
 SHA512:
-  metadata.gz: 6aa29a139ed0aff295ea7f17d78f22b40b1130137415cbfa6963bd20f14777df4eec21b960565988bb606b06c29a9695afc341411a4e8019e7ffd4c531ac7271
-  data.tar.gz: b1be6bc5b49282eb210d7d39c6ccc8f66f8dd113f644fe46ebbe2dc98a3d0b07506635fa0cc99c55cd2e5b4b0ab5ded7c2a19c62d1d07dadfc94067a8e3beb11
+  metadata.gz: 1bbce8b354288a43713a77ea5acb5bdd243420af6c93fd4b9e2d73a08a2a69f9212b36c02aaeefc4586288dbe6c632d20668cf347aead59468783b84ac4e6554
+  data.tar.gz: 3dc11beedb1fb2e4d9d6716fadbba1af09b43f1895395173ffb964c1f24634dd57144621bef29dcc769cc9ad6d5ca2e424ec33e80c1bfc4478120fb10ed3d7b7

data/lib/kmeans-crystal.rb

@@ -2,7 +2,7 @@ module KMeansCrystal
 class Cluster
     attr_reader :centroid
     attr_reader :entries
-    attr_reader :name
+    attr_accessor :name
 
     def initialize(name, centroid, vector_name)
         @name = name
@@ -40,11 +40,12 @@ class Model
         @cluster_num = cluster_num
         @entries = entries
         @vector_name = vector_name
-    end
 
-    def train
         init_centroids = @entries.sample(@cluster_num).map{|x| x[@vector_name]}
         @clusters = new_clusters(init_centroids)
+    end
+
+    def train
         i = 0
         while true do
             @entries.each do |entry|
@@ -54,8 +55,7 @@ class Model
 
             yield(i+=1, @clusters.map{|x| x.output} )
 
-            new_centroids = get_new_centroids(@clusters)
-            @clusters = new_clusters(new_centroids)
+            @clusters = new_clusters_from_old(@clusters)
         end
     end
 
@@ -69,15 +69,16 @@ class Model
         return predicted_cluster.name
     end
 
-    private
-    def get_new_centroids(clusters)
-        centroids = Array.new
-        clusters.each do |cluster|
-            centroids << cluster.update_centroid
+    def rename_clusters
+        named_map = Hash.new
+        @clusters.each{|x| named_map[x.name] = x.name }
+        yield(named_map)
+        @clusters.each do |cluster|
+            cluster.name = named_map[cluster.name]
         end
-        return centroids
     end
 
+    private
     def get_min(centroids, entry)
         min_cluster = centroids[0]
         last_distance = centroids[0].distance(entry)
@@ -97,5 +98,13 @@ class Model
         end
         return clusters
     end
+
+    def new_clusters_from_old(clusters)
+        arr = Array.new
+        clusters.each do |cluster|
+            arr << Cluster.new(cluster.name, cluster.update_centroid, @vector_name)
+        end
+        return arr
+    end
 end
 end

metadata

@@ -1,21 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: kmeans-crystal
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - ireullin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies: []
 description: |-
   The library for data clustering is implemented by k-means algorithm.With the library, you can monitor the model’s training processand end the training if the result is converged.
-
-  這是一個分群用的library。他實作了k-means演算法。透過這個library你可以監看整個model訓練的過程，並且在結果收斂的時候結束訓練。
-
-  https://github.com/ireullin/kmeans-crystal
+  <br>這是一個分群用的library。他實作了k-means演算法。透過這個library你可以監看整個model訓練的過程，並且在結果收斂的時候結束訓練。
+  <br>https://github.com/ireullin/kmeans-crystal
 email:
 - ireullin@gmail.com
 executables: []
@@ -47,6 +45,6 @@ rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: With this library, you can monitor the model’s training process and end the
-  training if the result is converged.  https://github.com/ireullin/kmeans-crystal
+  training if the result is converged. <br>https://github.com/ireullin/kmeans-crystal
 test_files: []
 has_rdoc: