minor optimization

[rubyvote] / test / condorcet_test.rb

diff --git a/test/condorcet_test.rb b/test/condorcet_test.rb
index ea1b19c75c2630c04c10297815923d2bbdbd12d8..67d544e4f51d41e7136623a72c86d47c88d45fb4 100644 (file)
--- a/test/condorcet_test.rb
+++ b/test/condorcet_test.rb
@@ -28,7 +28,7 @@ class TestCondorcetVote < Test::Unit::TestCase
 
     assert_equal "E", CloneproofSSDVote.new(vote_array).result.winners[0]
     assert_equal [['E'], ['A'], ['C'], ['B'], ['D']], 
 
     assert_equal "E", CloneproofSSDVote.new(vote_array).result.winners[0]
     assert_equal [['E'], ['A'], ['C'], ['B'], ['D']], 

-                 CloneproofSSDVote.new(vote_array).result.get_full_results
+                 CloneproofSSDVote.new(vote_array).results

   end
 
   def test_ssd2
   end
 
   def test_ssd2


@@ -45,7 +45,7 @@ class TestCondorcetVote < Test::Unit::TestCase
 
     assert_equal "D", CloneproofSSDVote.new(vote_array).result.winners[0] 
     assert_equal [['D'], ['A'], ['C'], ['B']], 
 
     assert_equal "D", CloneproofSSDVote.new(vote_array).result.winners[0] 
     assert_equal [['D'], ['A'], ['C'], ['B']], 

-                 CloneproofSSDVote.new(vote_array).result.get_full_results
+                 CloneproofSSDVote.new(vote_array).results

   end
 
   def test_ssd3
   end
 
   def test_ssd3


@@ -57,7 +57,7 @@ class TestCondorcetVote < Test::Unit::TestCase
 
     assert_equal "B", CloneproofSSDVote.new(vote_array).result.winners[0]
     assert_equal [['B'], ['C'], ['D'], ['A']], 
 
     assert_equal "B", CloneproofSSDVote.new(vote_array).result.winners[0]
     assert_equal [['B'], ['C'], ['D'], ['A']], 

-                 CloneproofSSDVote.new(vote_array).result.get_full_results
+                 CloneproofSSDVote.new(vote_array).results

   end
 
   def test_ssd_incomplete_votes
   end
 
   def test_ssd_incomplete_votes


@@ -68,9 +68,9 @@ class TestCondorcetVote < Test::Unit::TestCase
     4.times {vote_array << ["C"]}
     2.times {vote_array << "DBC".split("")}
 
     4.times {vote_array << ["C"]}
     2.times {vote_array << "DBC".split("")}
 

-    result = CloneproofSSDVote.new(vote_array).result
-    assert_equal "B", result.winners[0]
-    assert_equal [['B'], ['C'], ['D'], ['A']], result.get_full_results
+    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
   end
 
   def test_ssd_incomplete_votes_2


@@ -81,9 +81,39 @@ class TestCondorcetVote < Test::Unit::TestCase
     2.times {vote_array << "DBCA".split("")}
     2.times {vote_array << "DBC".split("")}
 
     2.times {vote_array << "DBCA".split("")}
     2.times {vote_array << "DBC".split("")}
 

-    result = CloneproofSSDVote.new(vote_array).result
-    assert_equal "B", result.winners[0]
-    assert_equal [['B'], ['C'], ['D'], ['A']], result.get_full_results
+    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
   end
 
 end