Streamlined some graphign contorller methods and took out the 'voters_per_day' method...

[selectricity] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index bbd5cd79f9f4934d0e9f878046e8f88851a41155..442bb65db975b9e4b650bd18815b560561595277 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -1,6 +1,5 @@
 require 'date'
 require 'date'

-class GraphController < ApplicationController
-  
+class GraphController < ApplicationController  

   class GruffGraff
   
     def initialize(options)
   class GruffGraff
   
     def initialize(options)


@@ -14,9 +13,10 @@ class GraphController < ApplicationController
       
       # 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)}


@@ -76,12 +76,10 @@ 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 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
+    @election.results unless @election.borda_result

     data, labels = get_borda_points(@election.borda_result)
     
     graph = GruffGraff.new( :graph_type => Gruff::Bar,
     data, labels = get_borda_points(@election.borda_result)
     
     graph = GruffGraff.new( :graph_type => Gruff::Bar,


@@ -94,19 +92,24 @@ class GraphController < ApplicationController
     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?
   #as a table?

-  def choices_positions 
+  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

     
     

-    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 = @election.condorcet_result.ranked_candidates.flatten
+    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,


@@ -117,37 +120,42 @@ class GraphController < ApplicationController
   end
   
  private 
   end
   
  private 

- 

   def get_positions_info(election)
     buckets = Hash.new
     buckets2= Hash.new
     rank_labels = Hash.new
   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
+    #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
       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|
     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
     

+    #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
     
     election.votes.each do |vote|
       vote.rankings.size.times do |i|
         rank_labels[i] = (i+1).to_s
       end
     end
     

-    return buckets2.values, rank_labels
-    
+    return sorted_data, rank_labels   

   end
    
   # generate the data and labels for each graph
   end
    
   # generate the data and labels for each graph


@@ -169,7 +177,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!
     


@@ -215,6 +224,7 @@ class GraphController < ApplicationController
     # Will build a graph over time, as each successive interval will have more
     # vote objects  
     election.votes.each do |vote|
     # Will build a graph over time, as each successive interval will have more
     # 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


@@ -253,7 +263,7 @@ class GraphController < ApplicationController
 
     #Populate points with an sorted array from election.votes hash
     #biggest to smallest will go from left to right
 
     #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]}