X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/4ab69ea7afaeff96714961139e7c696e7c7141ab..500f98b7b7c16d3b75ee85ef1cd7bc9180f3a533:/app/controllers/graph_controller.rb?ds=inline

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 1bde09e..b80b5d3 100644
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -3,19 +3,22 @@ class GraphController < ApplicationController
   class GruffGraff
   
     def initialize(options)
-      size = "700x400"
+      size = options[:size] ? options[:size] : "400x300" #allow custom sizing
       @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 => ['#005CD9', '#DC0D13', '#131313', '#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
       #Check to see if multiple datasets, if so, fill them all!
+      #Sort by biggest first piece of data.
       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)}
@@ -71,11 +74,12 @@ class GraphController < ApplicationController
                             :data => data,
                             :interval_labels => labels,
                             :title => "Voters Over Time",
+                            :size => "270x230",
                             :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
@@ -91,20 +95,24 @@ class GraphController < ApplicationController
     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
-    
     @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
     
+    ranked_candidates.each_with_index \
+    {|candidate, index| legend[names[candidate]] = alldata[index]}
+    
     graph = GruffGraff.new( :graph_type => Gruff::Bar,
                             :data => legend,
                             :interval_labels => labels,
@@ -114,27 +122,47 @@ class GraphController < ApplicationController
     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
     
-    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|
+        
+         unless buckets.has_key?(ranking.candidate_id)
+           buckets[ranking.candidate_id] = []
+         end
         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] = [] unless buckets2.has_key?(id)
         buckets2[id] << (array.find_all {|rank| rank == i}).size
       end
     end