Changeset 18694

Timestamp:

09/03/08 02:04:11 (4 months ago)

Author:

hajimehoshi

Message:

Refactored

Location:

lang/ruby/bokeshi/trunk/bokeshi

Files:

• cpu.rb (modified) (2 diffs)
• stage.rb (modified) (1 diff)
• test_cpu.rb (modified) (1 diff)

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

@@ -15 +15 @@
       else
         if seqs.all?{|seq| seq.length == 1}
-          seqs.size % 2 == 0
+          seqs.size % 2 == 0 
         else
           seqs.inject(0) do |result, seq|
@@ -30 +30 @@
         seqs = stage_or_seqs
       end
-      removings = []
-      now_winnable = winnable?(seqs)
-      seqs.each do |seq|
-        next_seqs = seqs.select{|s| s != seq}
-        seq.splits.each do |removing, result|
-          if !now_winnable or !winnable?(next_seqs + result)
-            removings << removing
+      if winnable?(seqs)
+        seqs.map do |seq|
+          seq.splits.select do |removing, result|
+            !winnable?(seqs + result - [seq])
+          end.map do |removing, result|
+            removing
           end
-        end
+        end.flatten
+      else
+        seqs.map{|seq| seq.splits.keys}.flatten
       end
-      removings
     end
 

lang/ruby/bokeshi/trunk/bokeshi/stage.rb

@@ -28 +28 @@
         d
       else
-        length - length
+        length - other.length
       end
     end

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

@@ -38 +38 @@
       assert_equal([Seq.new(0, 0, 1)],
                    cpu.next_removings([Seq.new(0, 0, 1)]).sort)
+      assert_equal([Seq.new(0, 0, 1), Seq.new(0, 0, 2), Seq.new(0, 1, 1),
+                    Seq.new(1, 0, 1), Seq.new(1, 0, 2), Seq.new(1, 1, 1)].sort,
+                   cpu.next_removings([Seq.new(0, 0, 2), Seq.new(1, 0, 2)]).sort)
+      assert_equal([],
+                   cpu.next_removings([]).sort)
     end