]> projects.mako.cc - selectricity-live/commitdiff
Merge head
authorJohn Dong <jdong@mit.edu>
Thu, 30 Aug 2007 23:13:09 +0000 (19:13 -0400)
committerJohn Dong <jdong@mit.edu>
Thu, 30 Aug 2007 23:13:09 +0000 (19:13 -0400)
1  2 
app/models/election.rb
config/environment.rb

Simple merge
index 2a7700951185f8eb71204f1210948ed156ec81a3,5ea9f103de256e61f44349285a358559b2b3a11c..fcabdd87aa6279b6003532259625536ac62e3fb3
@@@ -63,10 -63,15 +63,14 @@@ MAIL_CONFIG = { :from => 'Selectricity 
  
  require 'uniq_token'
  require 'randarray'
- require 'gruff'
+ require 'gruff-0.2.8/lib/gruff'
  require 'sparklines'
 -
  require 'rubyvote'
- ELECTION_TYPES = %w(ssd plurality approval condorcet borda)
+ ELECTION_TYPES = {'ssd' => "Schulze Sequential Dropping",
+                   'plurality' => "Plurality/First Past the Post",
+                   'approval' => "Approval (Top Two)",
+                   'condorcet' => "Simple Condorcet",
+                   'borda' => "Borda Count"}
  
  class String
    # alternate capitalization method that does not lowercase the rest of

Benjamin Mako Hill || Want to submit a patch?