Changeset 18698 for lang/ruby

Timestamp:

09/03/08 02:57:57 (3 months ago)

Author:

hajimehoshi

Message:

リファクタリング

Location:

lang/ruby/bokeshi/trunk/bokeshi

Files:

• cpu.rb (modified) (1 diff)
• test_cpu.rb (modified) (1 diff)

lang/ruby/bokeshi/trunk/bokeshi/cpu.rb

@@ -8 +8 @@
         seqs = stage_or_seqs
       end
-      case seqs.size
-      when 0
-        true
-      when 1
+      if seqs.size == 1
         1 < seqs.first.length
       else
-=begin
-        if seqs.all?{|seq| seq.length == 1}
-          seqs.size % 2 == 0 
-        else
-          seqs.inject(0) do |result, seq|
-            result ^ seq.length
-          end != 0
-        end
-=end
-        seqs.all?{|seq| seq.length == 1} ^ (seqs.inject(0) do |result, seq|
-                                              result ^ seq.length
-                                            end != 0)
+        seqs.all?{|seq| seq.length == 1} ^
+          (seqs.inject(0){|r, seq| r ^ seq.length} != 0)
       end
     end

lang/ruby/bokeshi/trunk/bokeshi/test_cpu.rb

@@ -21 +21 @@
       assert_equal true, cpu.winnable?([Seq.new(1, 0, 2)])
       assert_equal false, cpu.winnable?([Seq.new(1, 0, 1)])
+      assert_equal true, cpu.winnable?([])
       assert_equal false, cpu.winnable?([Seq.new(0, 0, 1)])
       assert_equal true, cpu.winnable?([Seq.new(0, 0, 1), Seq.new(1, 0, 1)])