kmeans 0.0.7 → 0.0.8

data/Rakefile

@@ -12,7 +12,7 @@ task :spec do
   end
 end
 
-if /^1\.9\./ =~ RUBY_VERSION
+unless /^1\.8\./ =~ RUBY_VERSION
   desc "Run RSpec code examples with simplecov"
   task :simplecov do
     ENV['COVERAGE'] = "on"

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/doc/ChangeLog

@@ -1,3 +1,8 @@
+=== 0.0.8 / 2013-03-19
+
+* Correspond to string or nil included hash.
+
+
 === 0.0.7 / 2012-11-05
 
 * Correspond to illegal hash value.

data/kmeans.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kmeans"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["id774"]
-  s.date = "2012-11-05"
+  s.date = "2013-03-19"
   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.7"
+  VERSION = "0.0.8"
   require File.dirname(__FILE__) +  "/kmeans/pair"
   require File.dirname(__FILE__) +  "/kmeans/pearson"
   require File.dirname(__FILE__) +  "/kmeans/cluster"

data/lib/kmeans/cluster.rb

@@ -39,7 +39,7 @@ module Kmeans
 
       @word_counts.each {|url, counts|
         counts.each {|word, count|
-          all_counts[word] << count
+          all_counts[word] << count.to_i
         }
       }
 

data/script/build

@@ -5,6 +5,8 @@
 #
 #  Maintainer: id774 <idnanashi@gmail.com>
 #
+#  v1.1 3/14,2013
+#       Show ruby version.
 #  v1.0 3/16,2012
 #       First.
 ########################################################################
@@ -12,6 +14,7 @@
 kickstart() {
     export RACK_ROOT="."
     export RACK_ENV="test"
+    ruby -v
 }
 
 run_tests() {

data/spec/lib/kmeans/cluster_spec.rb

@@ -69,6 +69,72 @@ describe Kmeans::Cluster do
          "piyo"=>1
         }
       }
+
+    @string_hash = {
+      "test01"=>
+        {"hoge"=>"0",
+         "fuga"=>"1",
+         "piyo"=>"0"
+        },
+      "test02"=>
+        {"hoge"=>"2",
+         "fuga"=>"1",
+         "piyo"=>"3"
+        },
+      "test03"=>
+        {"hoge"=>"3",
+         "fuga"=>"0",
+         "piyo"=>"1"
+        },
+      "test04"=>
+        {"hoge"=>"0",
+         "fuga"=>"2",
+         "piyo"=>"0"
+        },
+      "test05"=>
+        {"hoge"=>"4",
+         "fuga"=>"2",
+         "piyo"=>"3"
+        },
+      "test06"=>
+        {"hoge"=>"3",
+         "fuga"=>"1",
+         "piyo"=>"1"
+        }
+      }
+
+    @porous_hash = {
+      "test01"=>
+        {"hoge"=>"0",
+         "fuga"=>"1",
+         "piyo"=>nil
+        },
+      "test02"=>
+        {"hoge"=>"2",
+         "fuga"=>"1",
+         "piyo"=>"3"
+        },
+      "test03"=>
+        {"hoge"=>"3",
+         "fuga"=>nil,
+         "piyo"=>"1"
+        },
+      "test04"=>
+        {"hoge"=>nil,
+         "fuga"=>"2",
+         "piyo"=>nil
+        },
+      "test05"=>
+        {"hoge"=>"4",
+         "fuga"=>"2",
+         "piyo"=>"3"
+        },
+      nil=>
+        {"hoge"=>"3",
+         "fuga"=>"1",
+         nil=>"1"
+        },
+      }
   end
 
   context 'の Cluster クラスにおいて' do
@@ -111,5 +177,45 @@ describe Kmeans::Cluster do
         result.cluster.values.class.should be_equal Array
       end
     end
+
+    describe 'カウント部分が文字列な二次元ハッシュを渡しても' do
+      it "Kmeans::Cluster クラスが返却される" do
+        result = Kmeans::Cluster.new(@string_hash, {
+          :centroids => 5,
+          :loop_max => 10
+          })
+        result.class.should be_equal Kmeans::Cluster
+      end
+
+      it "ハッシュの配列が返却される (結果は実行ごとに異なる)" do
+        result = Kmeans::Cluster.new(@string_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 'nil を含む二次元ハッシュを渡しても' do
+      it "Kmeans::Cluster クラスが返却される" do
+        result = Kmeans::Cluster.new(@porous_hash, {
+          :centroids => 5,
+          :loop_max => 10
+          })
+        result.class.should be_equal Kmeans::Cluster
+      end
+
+      it "ハッシュの配列が返却される (結果は実行ごとに異なる)" do
+        result = Kmeans::Cluster.new(@porous_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
   end
 end

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.7'
+      expect = '0.0.8'
       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.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber