X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/82e34dc91e6c198a2fb46991f66ce81520100862..73f1c8f028bb366d3d8d982084fa777181bce5b5:/app/controllers/graph_controller.rb?ds=sidebyside

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 8256884..8b617da 100644
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -7,13 +7,19 @@ class GraphController < ApplicationController
       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
-      #Check to see if multiple datasets, if so, fill them all!     
-      if options[:data].size > 1 && options[:data].all?  {|i| i.is_a?(Array)}
+      #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
@@ -73,10 +79,11 @@ class GraphController < ApplicationController
 
   def borda_bar
     @election = Election.find(params[:id])
-    pref_tally = make_preference_tally(@election)
+    #pref_tally = make_preference_tally(@election)
     
-    @borda_result = BordaVote.new(pref_tally).result
-    data, labels = get_borda_points(@borda_result)
+    #@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_name => @election.name,
@@ -87,16 +94,22 @@ class GraphController < ApplicationController
                             :x_axis_label => "Candidate")
     send_data(*graph.output)
   end
- 
-  def choices_positions
+  #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)
-    labels = @candidates
+    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_name => @election.name,
-                            :data => fulldata,
+                            :data => legend,
                             :interval_labels => labels,
                             :title => "Times Voted in Each Position",
                             :y_axis_label => "Number of Times Ranked",
@@ -133,7 +146,7 @@ class GraphController < ApplicationController
         rank_labels[i] = (i+1).to_s
       end
     end
-   
+    
     return buckets2.values, rank_labels
     
   end
@@ -157,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|
-        voter_days << Date.parse(vote.time.to_s)
+      next unless vote.time
+      voter_days << Date.parse(vote.time.to_s)
     end
     voter_days.sort!
     
@@ -203,6 +217,7 @@ class GraphController < ApplicationController
     # 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
@@ -236,8 +251,6 @@ class GraphController < ApplicationController
   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