o Fix PureCondorcetVote to return all results, not just the winner

[rubyvote] / test / condorcet_test.rb

diff --git a/test/condorcet_test.rb b/test/condorcet_test.rb
index 7b49bc66eda4f79f3cb6d2e623e88f145280b488..aebc8f02027e59f1984a2a44000cde66fb85619e 100644 (file)
--- a/test/condorcet_test.rb
+++ b/test/condorcet_test.rb
@@ -1,10 +1,10 @@
-#!/usr/bin/ruby
+#!/usr/bin/ruby -Ilib
 
 require 'test/unit'
-require 'election_test_helper'
+require 'rubyvote/election'
+require 'rubyvote/condorcet'
 
 class TestCondorcetVote < Test::Unit::TestCase
-  include ElectionTestHelper
 
   def test_condorcet
     vote_array = Array.new
@@ -12,7 +12,19 @@ class TestCondorcetVote < Test::Unit::TestCase
     3.times {vote_array << "CBA".split("")}
     2.times {vote_array << "BAC".split("")}
 
-    test_winner( ["B"], PureCondorcetVote.new(vote_array).result )
+    assert_equal "B", PureCondorcetVote.new(vote_array).result.winners[0]
+    assert_equal [['B'], ['A'], ['C']], PureCondorcetVote.new(vote_array).results
+  end
+
+  def test_condorcet_2
+    vote_array = Array.new
+    3.times {vote_array << "678".split("")}
+    3.times {vote_array << "768".split("")}
+    2.times {vote_array << "8".split("")}
+
+    v = PureCondorcetVote.new(vote_array)
+    assert_equal ["6", "7"], v.result.winners
+    assert_equal [['6', '7'], ['8']], v.results
   end
 
   def test_ssd
@@ -26,7 +38,9 @@ class TestCondorcetVote < Test::Unit::TestCase
     7.times {vote_array << "DCEBA".split("")}
     8.times {vote_array << "EBADC".split("")}
 
-    test_winner( "E", CloneproofSSDVote.new(vote_array).result )
+    assert_equal "E", CloneproofSSDVote.new(vote_array).result.winners[0]
+    assert_equal [['E'], ['A'], ['C'], ['B'], ['D']], 
+                 CloneproofSSDVote.new(vote_array).results
   end
 
   def test_ssd2
@@ -41,7 +55,9 @@ class TestCondorcetVote < Test::Unit::TestCase
     5.times {vote_array << "DBAC".split("")}
     4.times {vote_array << "DCBA".split("")}
 
-    test_winner( "D", CloneproofSSDVote.new(vote_array).result )
+    assert_equal "D", CloneproofSSDVote.new(vote_array).result.winners[0] 
+    assert_equal [['D'], ['A'], ['C'], ['B']], 
+                 CloneproofSSDVote.new(vote_array).results
   end
 
   def test_ssd3
@@ -51,6 +67,65 @@ class TestCondorcetVote < Test::Unit::TestCase
     2.times {vote_array << "DBCA".split("")}
     2.times {vote_array << "CBDA".split("")}
 
-    test_winner("B", CloneproofSSDVote.new(vote_array).result )
+    assert_equal "B", CloneproofSSDVote.new(vote_array).result.winners[0]
+    assert_equal [['B'], ['C'], ['D'], ['A']], 
+                 CloneproofSSDVote.new(vote_array).results
+  end
+
+  def test_ssd_incomplete_votes
+    vote_array = Array.new
+    3.times {vote_array << "ABCD".split("")}
+    2.times {vote_array << "DABC".split("")}
+    2.times {vote_array << "DBCA".split("")}
+    4.times {vote_array << ["C"]}
+    2.times {vote_array << "DBC".split("")}
+
+    vote = CloneproofSSDVote.new(vote_array)
+    assert_equal "B", vote.result.winners[0]
+    assert_equal [['B'], ['C'], ['D'], ['A']], vote.results
   end
+
+  def test_ssd_incomplete_votes_2
+    vote_array = Array.new
+    4.times {vote_array << ["C"]}
+    3.times {vote_array << "ABCD".split("")}
+    2.times {vote_array << "DABC".split("")}
+    2.times {vote_array << "DBCA".split("")}
+    2.times {vote_array << "DBC".split("")}
+
+    vote = CloneproofSSDVote.new(vote_array)
+    assert_equal "B", vote.result.winners[0]
+    assert_equal [['B'], ['C'], ['D'], ['A']], vote.results
+  end
+
+  # 
+  # At one point, we happened to be getting correct results due to the
+  # happy accident that, for example, 'B'.each returns 'B'. The
+  # following election with a single integer vote catches that
+  # condition.
+  #
+  def test_ssd_single_vote
+    vote = CloneproofSSDVote.new([[78]])
+    assert_equal 78, vote.result.winners[0]
+    assert_equal [[78]], vote.results
+  end
+
+  def test_ssd_sparse
+    vote_array = Array.new
+    vote_array << ['B', 'D']
+    vote_array << ['A', 'C']
+    vote_array << ['E', 'C']
+    results = CloneproofSSDVote.new(vote_array).results
+    assert_equal 5, results.flatten.size
+  end
+
+  def test_ssd_sparse_2
+    vote_array = Array.new
+    vote_array << [65, 63, 64]
+    vote_array << [64, 65, 66, 63]
+    vote = CloneproofSSDVote.new(vote_array)
+    assert_equal 65, vote.result.winners[0]
+    assert_equal [[65, 64], [63, 66]], vote.results
+  end
+
 end