Boy2Man 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 651da5542ce090d2e04c3155ebf6234c46783a03
-  data.tar.gz: 94de98d13d2ab16b04bb788fbe004e77d09567d6
+  metadata.gz: e619834818cb5beb69ef5e5fe999842e5ee3a7d0
+  data.tar.gz: db9183e75ac76101c2ee1cd2664923d60d7c5084
 SHA512:
-  metadata.gz: b6ae8ec94576ec9bfaee57900aadef62a67e664ca56d30bc86408fe7934749b38c6ffa05de8c34e4227091c83bf25dd5d0b66864b1aeb256211faacf31681b33
-  data.tar.gz: d9c0ac812a9933a375bef24ccc6921cf10afe1f97f70a3f239f59892902e1e090c069e31c736344bfad884cd7af847b57401b5619ebf5800cdff43f8b730bf7d
+  metadata.gz: 18bcb84577326abdf20a0b569d1d031ae920b1fea230d46fbc4ab5488c0422c294ffae4575465ea1a6f6459b7087511cfa1d49a6e3d5c665d1ce09771bc19c8b
+  data.tar.gz: f0b3dc27e735b88ac4ed511ff908973308532162c883a12ebd070c70ca81f73e6bcba1ff1ef44743035d3f4721f43f9d1c02fa69c9c8e3499db4f53911d96d91

data/lib/Boy2Man/janken.rb

@@ -71,18 +71,27 @@ module Boy2Man
 
     private
     def predict
-      if @history.length < 2
-        %w(グー チョキ パー).sample
-      else
-        possible_hands = Array.new
+      possible_hands = Array.new
+
+      if @history.length >= 3
+        @history.each_with_index do |hand, i|
+          # 最後に出されたと、その前の手から、次の手を予想する
+          if hand == @history.last(2)[0] && @history[i+1] == @history.last
+            possible_hands.push @history[i+2] if @history[i+2] != nil
+          end
+        end        
+      end
+
+      if possible_hands.empty? || (1 < @history.length && @history.length < 3)
         @history.each_with_index do |hand, i|
+          # 最後に出された手から、次の手を予想する
           if hand == @history.last
-            possible_hands.push @history[i+1]
+            possible_hands.push @history[i+1] if @history[i+1] != nil
           end
-        end
-        possible_hands.compact!
-        possible_hands.empty? ? %w(グー チョキ パー).sample : possible_hands.sample
+        end        
       end
+
+      possible_hands.empty? ? %w(グー チョキ パー).sample : possible_hands.sample
     end
 
   end

data/lib/Boy2Man/version.rb

@@ -1,3 +1,3 @@
 module Boy2Man
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/test_janken.rb

@@ -69,5 +69,18 @@ class TestBoy2Man < MiniTest::Unit::TestCase
     100.times do
       assert_includes ["グー", "チョキ", "パー"], @janken.send(:predict)
     end
+    @janken.reset
+    @janken.pon("グー")
+    @janken.pon("グー")
+    assert_equal "パー", @janken.pon("グー")
+
+    @janken.reset
+    @janken.pon("グー")
+    @janken.pon("チョキ")
+    @janken.pon("パー")
+    @janken.pon("グー")
+    @janken.pon("チョキ")    
+    assert_equal "チョキ", @janken.pon("パー")
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Boy2Man
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler