From 8356a94a668936467a042dbadae3528a94231456 Mon Sep 17 00:00:00 2001
From: Dhruv Kapadia <git@dkapadia.com>
Date: Tue, 6 Apr 2010 14:42:30 -0400
Subject: [PATCH] Change densities to use appearances not votes for calculations

---
 app/models/appearance.rb | 1 -
 app/models/prompt.rb     | 1 +
 app/models/question.rb   | 8 ++++----
 app/models/visitor.rb    | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/models/appearance.rb b/app/models/appearance.rb
index 3f18b04..7e88166 100644
--- a/app/models/appearance.rb
+++ b/app/models/appearance.rb
@@ -3,5 +3,4 @@ class Appearance < ActiveRecord::Base
       belongs_to :prompt
       belongs_to :question
       has_one :vote
-
 end
diff --git a/app/models/prompt.rb b/app/models/prompt.rb
index de6e4f8..041a73d 100644
--- a/app/models/prompt.rb
+++ b/app/models/prompt.rb
@@ -3,6 +3,7 @@ class Prompt < ActiveRecord::Base
 
   has_many :skips
   has_many :votes
+  has_many :appearances
   
   
   belongs_to :question, :counter_cache => true
diff --git a/app/models/question.rb b/app/models/question.rb
index 729dabb..57869dc 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -255,16 +255,16 @@ class Question < ActiveRecord::Base
 
       the_prompts.each do |p|
 	      if p.left_choice.user_created == false && p.right_choice.user_created == false
-		      seed_seed_sum += p.votes.size
+		      seed_seed_sum += p.appearances.size
 		      seed_seed_total +=1
 	      elsif p.left_choice.user_created == false && p.right_choice.user_created == true
-		      seed_nonseed_sum += p.votes.size
+		      seed_nonseed_sum += p.appearances.size
 		      seed_nonseed_total +=1
 	      elsif p.left_choice.user_created == true && p.right_choice.user_created == false
-		      nonseed_seed_sum += p.votes.size
+		      nonseed_seed_sum += p.appearances.size
 		      nonseed_seed_total +=1
 	      elsif p.left_choice.user_created == true && p.right_choice.user_created == true
-		      nonseed_nonseed_sum += p.votes.size
+		      nonseed_nonseed_sum += p.appearances.size
 		      nonseed_nonseed_total +=1
 	      end
       end
diff --git a/app/models/visitor.rb b/app/models/visitor.rb
index 5d2b4a2..4c21b88 100644
--- a/app/models/visitor.rb
+++ b/app/models/visitor.rb
@@ -5,6 +5,7 @@ class Visitor < ActiveRecord::Base
   has_many :skips, :class_name => "Skip", :foreign_key => "skipper_id"
   has_many :items, :class_name => "Item", :foreign_key => "creator_id"
   has_many :clicks
+  has_many :appearances
   
   validates_presence_of :site, :on => :create, :message => "can't be blank"
 # validates_uniqueness_of :identifier, :on => :create, :message => "must be unique", :scope => :site_id
--
libgit2 0.21.2