Merge from jdong

[selectricity] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 8b617da9c19e163db72d3b84b362840d14a370c4..1bde09e1c4dae465b1221c1321e1ae8a5393db81 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)


@@ -79,9 +78,6 @@ class GraphController < ApplicationController
 
   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)
     
     @election.results unless @election.borda_result
     data, labels = get_borda_points(@election.borda_result)
     


@@ -97,7 +93,8 @@ class GraphController < ApplicationController
   #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?
   #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 
+  def choices_positions
+    

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


@@ -118,37 +115,40 @@ 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
     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
     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
     
     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
     
     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


@@ -256,7 +256,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]}