kmeans 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/doc/ChangeLog

@@ -1,3 +1,8 @@
+=== 0.0.6 / 2012-11-02
+
+* Correspond to unequal hash.
+
+
 === 0.0.5 / 2012-10-30
 
 * Eliminate the dependency for RMagick.

data/kmeans.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kmeans"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["id774"]
-  s.date = "2012-10-30"
+  s.date = "2012-11-02"
   s.description = "K-means clustering"
   s.email = "idnanashi@gmail.com"
   s.extra_rdoc_files = [

data/lib/kmeans.rb

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 module Kmeans
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
   require File.dirname(__FILE__) +  "/kmeans/pair"
   require File.dirname(__FILE__) +  "/kmeans/pearson"
   require File.dirname(__FILE__) +  "/kmeans/cluster"

data/lib/kmeans/cluster.rb

@@ -88,7 +88,10 @@ module Kmeans
       average_word_counts = @cluster[centroid].map {|url|
         @centroids[centroid].keys.map {|word| @word_counts[url][word]}
       }.transpose.map {|all_counts|
-        all_counts.inject(0) {|sum, count|sum + count}.quo(all_counts.size)
+        all_counts.inject(0) {|sum, count|
+          count = 0 unless count.class == Fixnum
+          sum + count
+        }.quo(all_counts.size)
       }
       Hash[*@centroids[centroid].keys.zip(average_word_counts).flatten]
     end

data/spec/lib/kmeans/cluster_spec.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Kmeans::Cluster do
   before :all do
-    @testdata = {
+    @uniform_hash = {
       "test01"=>
         {"hoge"=>0,
          "fuga"=>1,
@@ -36,23 +36,74 @@ describe Kmeans::Cluster do
          "piyo"=>1
         }
       }
+
+    @unequal_hash = {
+      "test01"=>
+        {"hoge"=>0,
+         "fuga"=>1,
+         "piyo"=>0
+        },
+      "test02"=>
+        {"hoge"=>2,
+         "fuga"=>1,
+         "piyo"=>3
+        },
+      "test03"=>
+        {"hoge"=>3,
+         "fuga"=>0,
+         "poyo"=>1
+        },
+      "test04"=>
+        {"puyo"=>0,
+         "fuga"=>2,
+         "piyo"=>0
+        },
+      "test05"=>
+        {"hoge"=>4,
+         "fuga"=>2,
+         "poyo"=>3
+        },
+      "test06"=>
+        {"hoge"=>3,
+         "hohe"=>1,
+         "piyo"=>1
+        }
+      }
   end
 
   context 'の Cluster クラスにおいて' do
-    describe '二次元ハッシュを渡すと' do
+    describe 'キーの均一な二次元ハッシュを渡すと' do
       it "Kmeans::Cluster クラスが返却される" do
-        result = Kmeans::Cluster.new(@testdata, {
-          :centroids => 4,
+        result = Kmeans::Cluster.new(@uniform_hash, {
+          :centroids => 5,
           :loop_max => 10
           })
         result.class.should be_equal Kmeans::Cluster
       end
+
+      it "ハッシュの配列が返却される (結果は実行ごとに異なる)" do
+        result = Kmeans::Cluster.new(@uniform_hash, {
+          :centroids => 5,
+          :loop_max => 10
+          })
+        result.make_cluster
+        result.cluster.class.should be_equal Hash
+        result.cluster.values.class.should be_equal Array
+      end
     end
 
-    describe 'make_cluster メソッドを呼ぶと' do
+    describe 'キーの不均一な二次元ハッシュを渡すと' do
+      it "Kmeans::Cluster クラスが返却される" do
+        result = Kmeans::Cluster.new(@unequal_hash, {
+          :centroids => 5,
+          :loop_max => 10
+          })
+        result.class.should be_equal Kmeans::Cluster
+      end
+
       it "ハッシュの配列が返却される (結果は実行ごとに異なる)" do
-        result = Kmeans::Cluster.new(@testdata, {
-          :centroids => 4,
+        result = Kmeans::Cluster.new(@unequal_hash, {
+          :centroids => 5,
           :loop_max => 10
           })
         result.make_cluster

data/spec/lib/kmeans_spec.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Kmeans do
   context 'のバージョンを参照した場合' do
     it "バージョンが正しく表示される" do
-      expect = '0.0.5'
+      expect = '0.0.6'
       Kmeans.const_get(:VERSION).should be_true
       Kmeans.const_get(:VERSION).should == expect
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kmeans
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber