Refactored code to move it to a more object oriented mode and slimmed

[selectricity-live] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 4f33ac3a3f7b02d212a7362ca9b26f10d0e22f3a..0d024468eaebe8ccef25938b4fc3e57404a6bc2f 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -1,50 +1,91 @@
 require 'date'
 class GraphController < ApplicationController
 require 'date'
 class GraphController < ApplicationController

+
+  class GruffGraff
+  
+    def initialize(options)
+      size = "700x400"
+      @graph = options[:graph_type].new(size)
+
+      @graph.theme = { :background_colors => ['#73BF26', '#ffffff'] }
+      @graph.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf',
+                                   RAILS_ROOT)
+      
+      # fill in the data with the optional data name
+      @graph.data( options.fetch(:data_name, nil), options[:data] )
+
+      # set the labels or create an empty hash
+      @graph.labels = options[:interval_labels] \
+        if options.has_key?(:labels) and options[:labels].class = Hash
+      @graph.x_axis_label = options[:x_axis_label] \
+        if options.has_key?(:x_axis_label)
+      @graph.y_axis_label = options[:y_axis_label] \
+        if options.has_key?(:y_axis_label)
+      @graph.title = options[:title] if options.has_key?(:title)
+      
+      @graph.minimum_value = 0.0
+
+    end
+
+    def output
+      return([@graph.to_blob, {:disposition => 'inline', :type => 'image/png'}])
+    end
+
+  end
+

   # produce a graph of votes per day during an election
   def votes_per_day
     @election = Election.find(params[:id])
     data, labels = get_votes_per_day_data(@election)
     
   # produce a graph of votes per day during an election
   def votes_per_day
     @election = Election.find(params[:id])
     data, labels = get_votes_per_day_data(@election)
     

-    line = Gruff::Line.new("700x400")
-    line.theme = { :background_colors => ['#73BF26', '#ffffff'] }
-    line.title = "Voters Per Day"
-    line.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf',
-                                 RAILS_ROOT)
-
-    line.data("#{@election.name}", data )
-    line.labels = labels
-
-    line.x_axis_label = "Date"
-    line.y_axis_label = "Number of Votes"
-    line.minimum_value = 0.0
-
-    line.draw
-    send_data(line.to_blob, :disposition => 'inline', :type => 'image/png')
+    graph = GruffGraff.new( :graph_type => Gruff::Line,
+                            :data_name => @election.name,
+                            :data => data,
+                            :interval_labels => labels,
+                            :title => "Voters Per Day",
+                            :x_axis_label => "Data",
+                            :y_axis_label =>"Number of Votes")
+    send_data(*graph.output)

   end
   end

- 
+  
+  #will place votes in a fixed number of intervals, and shows votes over time

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

-    data, labels = get_votes_per_interval_data(@election)
+    data, labels, scale = get_votes_per_interval_data(@election)

     
     

-    line = Gruff::Line.new("700x400")
-    line.theme = { :background_colors => ['#73BF26', '#ffffff'] }
-    line.title = "Voters Over Time"
-    line.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf',
-                               RAILS_ROOT)
+    graph = GruffGraff.new( :graph_type => Gruff::Line,
+                            :data_name => @election.name,
+                            :data => data,
+                            :interval_labels => labels,
+                            :title => "Voters Over Time",
+                            :x_axis_label => scale,
+                            :y_axis_label => "Number of Votes")
+    send_data(*graph.output)
+  end
+ 
+  def quickvote_bar
+    @election = Election.find(params[:id])
+  end
+  
+  def borda_bar
+    @election = Election.find(params[:id])
+    pref_tally = make_preference_tally(@election)

     
     

-    line.data("#{@election.name}", data )
-    line.labels = labels
+    @borda_result = BordaVote.new(pref_tally).result
+    data, labels = get_borda_points(@borda_result)

     
     

-    line.x_axis_label = "Intervals"
-    line.y_axis_label = "Number of Votes"
-    line.minimum_value = 0.0
-                               
-    line.draw
-    send_data(line.to_blob, :disposition => 'inline', :type => 'image/png')  
+    graph = GruffGraff.new( :graph_type => Gruff::Bar,
+                            :data_name => @election.name,
+                            :data => data,
+                            :interval_labels => labels,
+                            :title => "Points Per Candidate",
+                            :y_axis_label => "Points",
+                            :x_axis_label => "Candidate")
+    send_data(*graph.output)

   end
  
  private 
   end
  
  private 

- 
+   

   # generate the data and labels for each graph
   def get_votes_per_day_data(election)
     voter_days = Array.new
   # generate the data and labels for each graph
   def get_votes_per_day_data(election)
     voter_days = Array.new


@@ -93,6 +134,7 @@ class GraphController < ApplicationController
     labels_hash = Hash.new
     buckets = Hash.new
     total_per_interval = Array.new
     labels_hash = Hash.new
     buckets = Hash.new
     total_per_interval = Array.new

+    interval_type = ""

     
     starttime = election.startdate
     timedelta = Time.now - starttime
     
     starttime = election.startdate
     timedelta = Time.now - starttime


@@ -124,18 +166,52 @@ class GraphController < ApplicationController
       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
       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"

     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
     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"

     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
       labels_hash[numcols-1] = (Date.today).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
       labels_hash[numcols-1] = (Date.today).to_s

+      interval_type = "The Date"

     end
     
     # Make sure to return an array for data and hash for labels
     end
     
     # Make sure to return an array for data and hash for labels

-    return total_per_interval, labels_hash   
+    return total_per_interval, labels_hash, interval_type   
+  end
+  
+  def get_borda_points(result)
+    #points holds how mnay points each candidate has received in array form
+    #becasue Gruff::Bar#data takes only an array
+    points = Array.new
+    labels = Hash.new
+
+    #Populate points with an sorted array from election.votes hash
+    #biggest to smallest will go from left to right
+    points = result.election.votes.sort do |a, b|
+      b[1] <=> a[1]
+    end.collect {|i| i[1]}
+
+    #make the labels  
+    result.ranked_candidates.each_with_index do |candidate, index|
+      labels[index] = Candidate.find(candidate).name
+    end
+
+    return points, labels
+  end
+
+  #most vote result objects require an array of vote arrays, which this will make
+  def make_preference_tally(election)
+    preference_tally = Array.new
+    @election.voters.each do |voter|
+      next unless voter.voted?
+      preference_tally << voter.vote.rankings.sort.collect \
+        { |ranking| ranking.candidate.id }
+    end
+  return preference_tally

   end
 
 end
   end
 
 end