From: John Dong <jdong@mit.edu>
Date: Thu, 30 Aug 2007 23:13:09 +0000 (-0400)
Subject: Merge head
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/f2db874f06622e5b7422dabc8e17396708277c56?ds=inline

Merge head
---

f2db874f06622e5b7422dabc8e17396708277c56
diff --cc config/environment.rb
index 2a77009,5ea9f10..fcabdd8
--- a/config/environment.rb
+++ b/config/environment.rb
@@@ -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