Fix more DeprecationWarnings

[selectricity] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 38025effe8ee15ef907353f244a93e08c62b6ccf..1bde09e1c4dae465b1221c1321e1ae8a5393db81 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -1,19 +1,31 @@
 require 'date'
 require 'date'

-class GraphController < ApplicationController
-
+class GraphController < ApplicationController  

   class GruffGraff
   
     def initialize(options)
       size = "700x400"
       @graph = options[:graph_type].new(size)
 
   class GruffGraff
   
     def initialize(options)
       size = "700x400"
       @graph = options[:graph_type].new(size)
 

-      @graph.theme = { :background_colors => ['#73BF26', '#ffffff'] }
+      @graph.theme = { :colors => ['#000000', '#00FFFF', '#FFCC00', '#990033'],
+                       :background_colors => ['#74ce00', '#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.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf',
                                    RAILS_ROOT)
       
       # fill in the data with the optional data name

+      #Check to see if multiple datasets, if so, fill them all!
+      if options[:data].is_a?(Hash) 
+        options[:data].each_pair do |name, array|
+          @graph.data( name, array)
+        end
+      #if each dataset nameless, will have only multiple arrays    
+      elsif options[:data].size > 1 && options[:data].all?  {|i| i.is_a?(Array)}
+        options[:data].each do |array|
+          @graph.data( options.fetch(:data_name, "Data"), array)
+        end
+      else #one dimensional array, just pass it in

       @graph.data( options.fetch(:data_name, "Data"), options[:data] )
       @graph.data( options.fetch(:data_name, "Data"), options[:data] )

-
+      end
+      

       # set the labels or create an empty hash
       @graph.labels = options[:interval_labels] \
         if options.has_key?(:interval_labels) and \
       # set the labels or create an empty hash
       @graph.labels = options[:interval_labels] \
         if options.has_key?(:interval_labels) and \


@@ -63,17 +75,11 @@ class GraphController < ApplicationController
                             :y_axis_label => "Number of Votes")
     send_data(*graph.output)
   end
                             :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])
   def borda_bar
     @election = Election.find(params[:id])

-    pref_tally = make_preference_tally(@election)
-    
-    @borda_result = BordaVote.new(pref_tally).result
-    data, labels = get_borda_points(@borda_result)
+    @election.results unless @election.borda_result
+    data, labels = get_borda_points(@election.borda_result)

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


@@ -84,8 +90,66 @@ class GraphController < ApplicationController
                             :x_axis_label => "Candidate")
     send_data(*graph.output)
   end
                             :x_axis_label => "Candidate")
     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
+  #as a table?
+  def choices_positions
+    
+    @election = Election.find(params[:id])
+    pref_tally = make_preference_tally(@election)
+    
+    fulldata, labels = get_positions_info(@election)
+    legend = Hash.new
+    
+    @election.candidates.each_with_index do |candidate, index|
+      legend[candidate.name] = fulldata[index]
+    end
+    
+    graph = GruffGraff.new( :graph_type => Gruff::Bar,
+                            :data => legend,
+                            :interval_labels => labels,
+                            :title => "Times Voted in Each Position",
+                            :y_axis_label => "Number of Times Ranked",
+                            :x_axis_label => "Rank")
+    send_data(*graph.output) 
+  end
+  

  private 
  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
+    election.votes.each do |vote|
+      vote.rankings.each do |ranking|
+        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|
+        buckets2[id] << (array.find_all {|rank| rank == i}).size
+      end
+    end
+    
+    #sort by amount of 1st place votes
+    sorted_data = buckets2.values.sort {|a,b| b[0] <=> a[0]}
+    
+    election.votes.each do |vote|
+      vote.rankings.size.times do |i|
+        rank_labels[i] = (i+1).to_s
+      end
+    end
+    
+    return sorted_data, rank_labels   
+  end

    
   # generate the data and labels for each graph
   def get_votes_per_day_data(election)
    
   # generate the data and labels for each graph
   def get_votes_per_day_data(election)


@@ -106,7 +170,8 @@ class GraphController < ApplicationController
     
     # Now I need to create an array with all the times votes were made
     election.votes.each do |vote|
     
     # Now I need to create an array with all the times votes were made
     election.votes.each do |vote|

-        voter_days << Date.parse(vote.time.to_s)
+      next unless vote.time
+      voter_days << Date.parse(vote.time.to_s)

     end
     voter_days.sort!
     
     end
     voter_days.sort!
     


@@ -144,14 +209,15 @@ class GraphController < ApplicationController
     
     # Make a hash, buckets, indexed by time intervals and containing empty arrays
     # The time object must come first in addition! 
     
     # Make a hash, buckets, indexed by time intervals and containing empty arrays
     # The time object must come first in addition! 

-    # i would start at 0, i+1 goes from 0 up till numcols
+    # i would start at 0, i+1 goes from 1 up till numcols

     numcols.times {|i| buckets[starttime + ((i+1)*interval_length)] = []}
      
     # Put votes into bucket according to the time interval to which they belong,
     # referenced by their key
     numcols.times {|i| buckets[starttime + ((i+1)*interval_length)] = []}
      
     # Put votes into bucket according to the time interval to which they belong,
     # referenced by their key

-    # Will build a graph over time, as each successive interval wil lhave more
+    # Will build a graph over time, as each successive interval will have more

     # vote objects  
     election.votes.each do |vote|
     # vote objects  
     election.votes.each do |vote|

+      next unless vote.time

       buckets.keys.sort.each do |inter|
         if vote.time < inter
           buckets[inter] << vote
       buckets.keys.sort.each do |inter|
         if vote.time < inter
           buckets[inter] << vote


@@ -175,7 +241,7 @@ class GraphController < ApplicationController
       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
       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/2)-1] = (Date.parse((starttime + (timedelta/2)).to_s)).to_s

       labels_hash[numcols-1] = (Date.today).to_s
       interval_type = "The Date"
     end
       labels_hash[numcols-1] = (Date.today).to_s
       interval_type = "The Date"
     end


@@ -185,14 +251,12 @@ class GraphController < ApplicationController
   end
   
   def get_borda_points(result)
   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 = 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|
+    points = result.points.sort do |a, b|

       b[1] <=> a[1]
     end.collect {|i| i[1]}
 
       b[1] <=> a[1]
     end.collect {|i| i[1]}