numeron 1.1.0 → 1.2.0

data/lib/numeron/calculator.rb

@@ -2,18 +2,38 @@
 
 module Numeron
   class Calculator
-    attr_accessor :histories, :possibilities, :mays
+    # コール履歴
+    attr_accessor :histories
+    # 解として可能性があるデータリスト
+    attr_accessor :possibilities
+    # 各桁における解の可能性として考えられる数値
+    attr_accessor :mays
+    # 解の桁数(未実装)
+    attr_accessor :answer_size
+    # Slash Number
+    attr_accessor :slash_number
 
-    def initialize(card_size = 3)
+    def initialize(answer_size = 3)
       @histories = []
-      @mays = [(0..9).to_a, (0..9).to_a, (0..9).to_a]
       @possibilities = nil
+      @mays = [(0..9).to_a, (0..9).to_a, (0..9).to_a]
+      @answer_size = answer_size
     end
 
+    # コールした数値とその結果を設定
+    # @param [String] attack コールした数値
+    # @param [Integer] eat Eatの数
+    # @param [Integer] bite Biteの数
+    # @return [Boolean] 
     def input(attack, eat, bite)
       attack = attack.split(//).map(&:to_i)
       eat = eat.to_i
       bite = bite.to_i
+
+      if attack.size != @answer_size || eat > @answer_size || bite > @answer_size && eat + bite > @answer_size
+        raise ArgumentError, 'Invalid argument. '
+      end
+
       @histories << {attack: attack, eat: eat, bite: bite}
 
       if eat == 0 && bite == 0
@@ -32,12 +52,15 @@ module Numeron
         one_eat_zero_bite(attack)
       elsif eat == 2 && bite == 0
         two_eat_zero_bite(attack)
+      elsif eat == 3 && bite == 0
+        @possibilities = []
       else
         return false
       end
       return true
     end
 
+    # 0 Eat 0 Bite の時の可能性計算
     def zero_eat_zero_bite(attack)
       @mays[0] = @mays[0] - attack
       @mays[1] = @mays[1] - attack
@@ -56,6 +79,7 @@ module Numeron
       update_possibilities(list)
     end
 
+    # 0 Eat 1 Bite の時の可能性計算
     def zero_eat_one_bite(attack)
       # 各桁のeatの可能性がなくなる
       @mays[0] = @mays[0] - [attack[0]]
@@ -89,6 +113,7 @@ module Numeron
       update_possibilities(list)
     end
 
+    # 0 Eat 2 Bite の時の可能性計算
     def zero_eat_two_bite(attack)
       @mays[0] = @mays[0] - [attack[0]]
       @mays[1] = @mays[1] - [attack[1]]
@@ -118,6 +143,7 @@ module Numeron
       update_possibilities(list)
     end
 
+    # 0 Eat 3 Bite の時の可能性計算
     def zero_eat_three_bite(attack)
       # 各桁の可能性が2つに絞られる
       @mays[0] = @mays[0] & [attack[1], attack[2]]
@@ -130,6 +156,7 @@ module Numeron
       update_possibilities(list)
     end
 
+    # 1 Eat 0 Bite の時の可能性計算
     def one_eat_zero_bite(attack)
       list = []
       # 先頭eat
@@ -158,6 +185,7 @@ module Numeron
       update_possibilities(list)
     end
 
+    # 1 Eat 1 Bite の時の可能性計算
     def one_eat_one_bite(attack)
       list = []
       (@mays[2] - attack).each do |f|
@@ -183,6 +211,7 @@ module Numeron
       update_possibilities(list)
     end
 
+    # 1 Eat 2 Bite の時の可能性計算
     def one_eat_two_bite(attack)
       # attack以外の可能性がなくなるので、積
       @mays[0] = @mays[0] & attack
@@ -196,6 +225,7 @@ module Numeron
       update_possibilities(list)
     end
 
+    # 2 Eat 0 Bite の時の可能性計算
     def two_eat_zero_bite(attack)
       # 先頭2つがeat
       list = []
@@ -213,6 +243,9 @@ module Numeron
       update_possibilities(list)
     end
 
+    # 各桁が可能性としてありえるかのチェック
+    # @maysに含まれていること、重複がなければ正常と判定する
+    # @return [String, nil] 正常な場合はString, 異常値の場合は nil
     def validation(i, j, k)
       return nil if i == j || i == k || j == k
       if @mays[0].include?(i) && @mays[1].include?(j) && @mays[2].include?(k)
@@ -248,6 +281,8 @@ module Numeron
       end
     end
 
+    # シャッフル時の再計算
+    # 1 Eat 0 Bite または 0 Eat 1 Biteの場合
     def one_eat_or_one_bite(attack)
       list = []
       # attack[0] - attack[3]が一桁目に含まれている
@@ -278,6 +313,8 @@ module Numeron
       update_possibilities(list)
     end
 
+    # シャッフル時の再計算
+    # 2 eat 0 Bite, or 1 Eat 1 Bite or 0 Eat 0 Biteの場合
     def two_eat_or_two_bite(attack)
       list = []
       # 末尾が不明
@@ -312,6 +349,31 @@ module Numeron
       update_possibilities(list)
     end
 
+    def slash(slash_number)
+      @slash_number = slash_number
+
+      # 9
+      # [0, 9]
+      list = []
+      slash_number.upto(9){|i|
+        min = i - slash_number
+        from = min + 1
+        to = i - 1
+        (from..to).to_a.each do |f|
+          list << validation(i, min, f)
+          list << validation(min, i, f)
+          list << validation(i, f, min)
+          list << validation(min, f, i)
+          list << validation(f, min, i)
+          list << validation(f, i, min)
+        end
+      }
+      update_possibilities(list)
+    end
+
+    # 可能性リストの更新
+    # 現在設定されている可能性リストと引数で渡された可能性リストの論理積をとる
+    # @param [Array] possibilities 可能性としてありえる数値リスト
     def update_possibilities(possibilities)
       possibilities.compact!
       @possibilities = @possibilities.nil? ? possibilities : possibilities & @possibilities

data/lib/numeron/solver.rb

@@ -2,20 +2,52 @@
 
 module Numeron
   class Solver
-    attr_accessor :calc, :card_size
+    attr_accessor :calc, :card_size, :used_items
     def initialize
       @calc = Numeron::Calculator.new
       @card_size = 3
+      @used_items = {slash: false, shuffle: false}
     end
 
     def run
       while 1
+        item
         next unless question
         think
         finish
       end
     end
 
+    # アイテムの使用
+    def item
+      shuffle unless @used_items[:shuffle]
+      slash unless @used_items[:slash]
+    end
+
+    def slash
+      print "\nUsing slash? [yes]"
+      f = STDIN.gets.chomp
+      return if f != 'yes' && f != 'y'
+      while 1
+        print "Input slash number: "
+        f =STDIN.gets.chomp.to_i
+        break if f >= 2 && f <= 9
+        puts "Invalid slash number."
+      end
+      @calc.slash(f)
+      @used_items[:slash] = true
+      think
+    end
+
+    def shuffle
+      print "\nUsing shuffle? [yes]"
+      f = STDIN.gets.chomp
+      return if f != 'yes' && f != 'y'
+      @calc.shuffle
+      @used_items[:shuffle] = true
+      think
+    end
+
     def question
       attack_number = nil
       eat = 0

data/lib/numeron/version.rb

@@ -1,3 +1,3 @@
 module Numeron
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/numeron.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.version       = Numeron::VERSION
   gem.authors       = ["kengos"]
   gem.email         = ["kengo@kengos.jp"]
-  gem.description   = %q{numer0nの解を計算します。(Shuffle対応,シミュレーター付き,Analyzer未完成)}
+  gem.description   = %q{numer0nの解を計算します。(Shuffle, Slash対応, シミュレーター付き, Analyzer未完成)}
   gem.summary       = %q{numer0n solver}
   gem.homepage      = "https://github.com/kengos/numeron"
 

data/spec/lib/numeron/calculator_spec.rb

@@ -78,6 +78,50 @@ describe Numeron::Calculator do
     end
   end
 
+  describe '#slash' do
+    # slashを使った場合は、解の可能性は 6 * (10 - n) * (n - 1)に絞られる
+    # 正しくは、 s! * (10 - n) * (n - s + 2) (sはカードの枚数、 nはslash number, s!はsの階乗)
+    it 'slash 2' do
+      calc.slash(2)
+      calc.possibilities.should have(48).items
+    end
+
+    it 'slash 3' do
+      calc.slash(3)
+      calc.possibilities.should have(84).items
+    end
+
+    it 'slash 4' do
+      calc.slash(4)
+      calc.possibilities.should have(108).items
+    end
+
+    it 'slash 5' do
+      calc.slash(5)
+      calc.possibilities.should have(120).items
+    end
+
+    it 'slash 6' do
+      calc.slash(6)
+      calc.possibilities.should have(120).items
+    end
+
+    it 'slash 7' do
+      calc.slash(7)
+      calc.possibilities.should have(108).items
+    end
+
+    it 'slash 8' do
+      calc.slash(8)
+      calc.possibilities.should have(84).items
+    end
+
+    it 'slash 9' do
+      calc.slash(9)
+      calc.possibilities.should have(48).items
+    end
+  end
+
   describe "scenario" do
     it "1e0b, 1e2b" do
       calc.input('348', 1, 0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numeron
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies: []
-description: numer0nの解を計算します。(Shuffle対応,シミュレーター付き,Analyzer未完成)
+description: numer0nの解を計算します。(Shuffle, Slash対応, シミュレーター付き, Analyzer未完成)
 email:
 - kengo@kengos.jp
 executables: []