Remove useless puts calls; fix gmap api key for selectricity.org

[selectricity] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 1bde09e1c4dae465b1221c1321e1ae8a5393db81..413ebb0c10617d9e5ac38e2cc1a3ed0e74933008 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -1,21 +1,42 @@
 require 'date'
 class GraphController < ApplicationController  
   class GruffGraff
 require 'date'
 class GraphController < ApplicationController  
   class GruffGraff

-  
+    
+    COLORS = ['#74CE00', '#005CD9', '#DC0D13', '#131313', '#990033']
+    BACKGROUND_COLORS = ['#74CE00', '#FFFFFF'] #for green and white background
+    

     def initialize(options)
     def initialize(options)

-      size = "700x400"
+      size = options[:size] ? options[:size] : "400x300" #allow custom sizing

       @graph = options[:graph_type].new(size)
       @graph = options[:graph_type].new(size)

-
-      @graph.theme = { :colors => ['#000000', '#00FFFF', '#FFCC00', '#990033'],
-                       :background_colors => ['#74ce00', '#ffffff'] }
+      
+      @graph.no_data_message = "No Voters"
+      
+      @graph.theme = { :colors => COLORS,
+                       :background_colors => ['#e5e5e5', '#FFFFFF']  }

       @graph.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf',
                                    RAILS_ROOT)
       
       @graph.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf',
                                    RAILS_ROOT)
       

+      if options[:legend_font_size]
+        @graph.legend_font_size = options[:legend_font_size] 
+      end
+      
+      if options[:title_font_size]  
+        @graph.title_font_size = options[:title_font_size]
+      end
+      
+      #marker count doesn't include minimum value line, default is 4
+      @graph.marker_count = options[:marker_count] if options[:marker_count]
+      
+      @graph.marker_font_size = options[:marker_font_size] if options[:marker_font_size]
+      
+      @graph.marker_color = options[:marker_color] if options[:marker_color]
+      

       # fill in the data with the optional data name
       #Check to see if multiple datasets, if so, fill them all!
       # fill in the data with the optional data name
       #Check to see if multiple datasets, if so, fill them all!

+      #Sort by biggest first piece of data.

       if options[:data].is_a?(Hash) 
       if options[:data].is_a?(Hash) 

-        options[:data].each_pair do |name, array|
-          @graph.data( name, array)
+        options[:data].sort {|a,b| b[1][0] <=> a[1][0]}.each do |dataset|
+          @graph.data(dataset[0], dataset[1])

         end
       #if each dataset nameless, will have only multiple arrays    
       elsif options[:data].size > 1 && options[:data].all?  {|i| i.is_a?(Array)}
         end
       #if each dataset nameless, will have only multiple arrays    
       elsif options[:data].size > 1 && options[:data].all?  {|i| i.is_a?(Array)}


@@ -71,40 +92,62 @@ class GraphController < ApplicationController
                             :data => data,
                             :interval_labels => labels,
                             :title => "Voters Over Time",
                             :data => data,
                             :interval_labels => labels,
                             :title => "Voters Over Time",

+                            :size => "330x232", 
+                            :legend_font_size => 40,
+                            :title_font_size => 50,
+                            :marker_count => 2,
+                            :marker_font_size => 30,
+                            :marker_color => '#999999',

                             :x_axis_label => scale,
                             :y_axis_label => "Number of Votes")
     send_data(*graph.output)
   end
                             :x_axis_label => scale,
                             :y_axis_label => "Number of Votes")
     send_data(*graph.output)
   end

-
+  

   def borda_bar
     @election = Election.find(params[:id])
     @election.results unless @election.borda_result
     data, labels = get_borda_points(@election.borda_result)
     
   def borda_bar
     @election = Election.find(params[:id])
     @election.results unless @election.borda_result
     data, labels = get_borda_points(@election.borda_result)
     

+    size = "400x300"
+    size = "580x300" if @election.candidates.size >= 5
+    
+   if @election.candidates.size >= 5
+     marker_font_size = 17
+   else
+     marker_font_size = 20
+   end
+    

     graph = GruffGraff.new( :graph_type => Gruff::Bar,
                             :data_name => @election.name,
                             :data => data,
                             :interval_labels => labels,
     graph = GruffGraff.new( :graph_type => Gruff::Bar,
                             :data_name => @election.name,
                             :data => data,
                             :interval_labels => labels,

+                            :size => size,

                             :title => "Points Per Candidate",
                             :title => "Points Per Candidate",

+                            :marker_color => '#999999',
+                            :marker_font_size => marker_font_size,

                             :y_axis_label => "Points",
                             :y_axis_label => "Points",

-                            :x_axis_label => "Candidate")
+                            :x_axis_label => "Candidates")

     send_data(*graph.output)
   end
   #Acording to Tufte, small, concomparitive, highly labeled data sets usually
     send_data(*graph.output)
   end
   #Acording to Tufte, small, concomparitive, highly labeled data sets usually

-  # belong in tables. The following is a bar graph...but would it be better
+  #belong in tables. The following is a bar graph...but would it be better

   #as a table?
   def choices_positions
   #as a table?
   def choices_positions

-    

     @election = Election.find(params[:id])
     @election = Election.find(params[:id])

-    pref_tally = make_preference_tally(@election)
+    legend = Hash.new   
+    alldata, labels = get_positions_info(@election)    
+    @election.results unless @election.condorcet_result || @election.ssd_result
+    ranked_candidates = @election.condorcet_result.ranked_candidates.flatten

     
     

-    fulldata, labels = get_positions_info(@election)
-    legend = Hash.new
-    
-    @election.candidates.each_with_index do |candidate, index|
-      legend[candidate.name] = fulldata[index]
+    names = Hash.new
+    candidates = @election.candidates.sort.collect {|candidate| candidate.id}
+    candidates.each do |candidate|
+      names[candidate]= (Candidate.find(candidate)).name

     end
     
     end
     

+    ranked_candidates.each_with_index \
+    {|candidate, index| legend[names[candidate]] = alldata[index]}
+    

     graph = GruffGraff.new( :graph_type => Gruff::Bar,
                             :data => legend,
                             :interval_labels => labels,
     graph = GruffGraff.new( :graph_type => Gruff::Bar,
                             :data => legend,
                             :interval_labels => labels,


@@ -114,27 +157,47 @@ class GraphController < ApplicationController
     send_data(*graph.output) 
   end
   
     send_data(*graph.output) 
   end
   

+  def plurality_pie
+    @election = Election.find(params[:id])
+    @election.results unless @election.plurality_result || @election.approval_result
+    votes = @election.votes.size
+    data = Hash.new
+    names = @election.names_by_id
+    
+    @election.plurality_result.points.each do |candidate, votes|
+      data[names[candidate]] = votes
+    end
+     
+    pie = GruffGraff.new( :graph_type => Gruff::Pie,
+                           :title => "Percentage of First Place Votes",
+                           :data => data)
+    send_data(*pie.output)
+                           
+  end
+  

  private 
   def get_positions_info(election)
     buckets = Hash.new
     buckets2= Hash.new
     rank_labels = Hash.new
     
  private 
   def get_positions_info(election)
     buckets = Hash.new
     buckets2= Hash.new
     rank_labels = Hash.new
     

-    election.candidates.each do |candidate|
-      buckets[candidate.id] = []
-      buckets2[candidate.id] = []
-    end
-    

     #attach the ranking to the candidate's array to which is belongs
     #attach the ranking to the candidate's array to which is belongs

+    #creating a key if necessary

     election.votes.each do |vote|
       vote.rankings.each do |ranking|
     election.votes.each do |vote|
       vote.rankings.each do |ranking|

+        
+         unless buckets.has_key?(ranking.candidate_id)
+           buckets[ranking.candidate_id] = []
+         end

         buckets[ranking.candidate_id] << ranking.rank
         buckets[ranking.candidate_id] << ranking.rank

+        

       end
     end
     
     #count how many times each candidate has been ranked at a certain level
     buckets.each_pair do |id, array|
       (1..election.candidates.size).each do |i|
       end
     end
     
     #count how many times each candidate has been ranked at a certain level
     buckets.each_pair do |id, array|
       (1..election.candidates.size).each do |i|

+        buckets2[id] = [] unless buckets2.has_key?(id)

         buckets2[id] << (array.find_all {|rank| rank == i}).size
       end
     end
         buckets2[id] << (array.find_all {|rank| rank == i}).size
       end
     end


@@ -230,15 +293,15 @@ class GraphController < ApplicationController
     # Create the hash for the labels. Each graph has ten columns, and three
     # will be labeled
     if timedelta < 2.hours #under two hours use minutes for labels
     # Create the hash for the labels. Each graph has ten columns, and three
     # will be labeled
     if timedelta < 2.hours #under two hours use minutes for labels

-      labels_hash[0] = starttime.min.to_s
-      labels_hash[(numcols/2)-1] = (starttime + (timedelta/2)).min.to_s
-      labels_hash[numcols-1] = Time.now.min.to_s
-      interval_type = "Minute of the Hour"
+      labels_hash[0] = "Start"
+      labels_hash[(numcols/2)-1] = fmt_decimal((timedelta/120)) #halfway
+      labels_hash[numcols-1] = fmt_decimal((timedelta/60))
+      interval_type = "Minutes After Start"

     elsif timedelta < 2.days #more than 2 hours means use hours for labels
     elsif timedelta < 2.days #more than 2 hours means use hours for labels

-      labels_hash[0] = starttime.hour.to_s
-      labels_hash[(numcols/2)-1] = (starttime + (timedelta/2)).hour.to_s
-      labels_hash[numcols-1] = Time.now.hour.to_s
-      interval_type = "Hour of the Day on 24 hour scale"
+      labels_hash[0] = "Start"
+      labels_hash[(numcols/2)-1] = fmt_decimal((timedelta/7200))
+      labels_hash[numcols-1] = fmt_decimal((timedelta/3600))
+      interval_type = "Hours After Start (Up to 48)"

     else #more than 2 days means use dates for labels
       labels_hash[0] = (Date.parse(starttime.to_s)).to_s
       labels_hash[(numcols/2)-1] = (Date.parse((starttime + (timedelta/2)).to_s)).to_s
     else #more than 2 days means use dates for labels
       labels_hash[0] = (Date.parse(starttime.to_s)).to_s
       labels_hash[(numcols/2)-1] = (Date.parse((starttime + (timedelta/2)).to_s)).to_s


@@ -250,6 +313,10 @@ class GraphController < ApplicationController
     return total_per_interval, labels_hash, interval_type   
   end
   
     return total_per_interval, labels_hash, interval_type   
   end
   

+  def fmt_decimal(number)
+    sprintf( "%0.1f", number)
+  end
+  

   def get_borda_points(result)
     points = Array.new
     labels = Hash.new
   def get_borda_points(result)
     points = Array.new
     labels = Hash.new


@@ -278,5 +345,4 @@ class GraphController < ApplicationController
     end
   return preference_tally
   end
     end
   return preference_tally
   end

-

 end
 end