carmenere 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c713abdf23594300b13fe5ea26f28f668256315
-  data.tar.gz: a2fea35a639d442ce30e881292ebadc320525f8e
+  metadata.gz: 02670cf89b4e3e98bbe7faa4475d63ca69307faa
+  data.tar.gz: a1e0bf72e95c5249d1cd361f83f6624a782fd4e4
 SHA512:
-  metadata.gz: 63fb5e4e6e823df504690f770a9c3c7b0f84899b1d6faec790d06052517b0ba9b358c45d6bb6953d1ea698b1fcaad7029c6087cadb484cab3286ab6829b895eb
-  data.tar.gz: 47a6dfbc4b553adaaf09febfefedad64ca19f5d5de9a89206f80bf1062bf369a5610be5d48ef229e5a548da8442dfc0446e2ff00763f7664c1eba75ccefd559b
+  metadata.gz: f472978df468b8b2dd5be7cace20c8f183406a48bfd1b8f965471c909e47790d4d8f54823a715e60c22aebb7110c5b02c7f8ec540b23c2e432c0a978c9a23043
+  data.tar.gz: 947929656f9cf8bef320540553568fb1438564732f6ade88cda44955d4af5bbc2e66c665dd0fd5f0fa712a0f4704721d139ac087a5afcf9ae6054fecb8e2c117

data/lib/carmenere/kmeans/algorithm.rb

@@ -4,9 +4,13 @@ module Carmenere::KMeans
 
   def self.centroids_eql? old_centroids, new_centroids
     [old_centroids, new_centroids].each do |i|
-      unless i.is_a?(Set) and i.all?{ |j| j.is_a?(Carmenere::Node) }
+      unless i.is_a?(Set)
         raise TypeError.new("#{i.class} is not Set of Node")
       end
+      unless i.all?{ |j| j.is_a?(Carmenere::Node) }
+        types = i.map{|j| j.class}
+        raise TypeError.new("Elements of Cluster are of types #{types}")
+      end
     end
     old_centroids.count == new_centroids.count and old_centroids.all? do |i|
       new_centroids.any? do |j|
@@ -45,9 +49,12 @@ module Carmenere::KMeans
           h[centroid] = Carmenere::KMeans::Cluster.new nodes
         end
         yield centroid_clusters if block_given?
-        centroids = Set.new centroid_clusters.values.map do |cluster|
+        centroids = centroid_clusters.values.reject do |cluster|
+          cluster.empty?
+        end.map do |cluster|
           @mean.call(cluster)
         end
+        centroids = Set.new centroids
       end
       centroid_clusters
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carmenere
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Johnny Lee Othon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies: []
 description: Cluster algorithms
 email: jleeothon@gmail.com