From 90bb583f30f346bf8033ae8fc06b2875b5965ea5 Mon Sep 17 00:00:00 2001 From: Luke Baker Date: Wed, 8 Dec 2010 13:01:34 -0500 Subject: [PATCH] more whitespace fixes --- app/models/question.rb | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/app/models/question.rb b/app/models/question.rb index 8a964d6..902e5eb 100644 --- a/app/models/question.rb +++ b/app/models/question.rb @@ -227,27 +227,26 @@ class Question < ActiveRecord::Base return result end - #passing precomputed sum saves us a traversal through the array - def normalize!(weighted, sum=nil) - if weighted.instance_of?(Hash) - if sum.nil? - sum = weighted.inject(0) do |sum, item_and_weight| + #passing precomputed sum saves us a traversal through the array + def normalize!(weighted, sum=nil) + if weighted.instance_of?(Hash) + if sum.nil? + sum = weighted.inject(0) do |sum, item_and_weight| sum += item_and_weight[1] - end - sum = sum.to_f - end - weighted.each do |item, weight| - weighted[item] = weight/sum - weighted[item] = 0.0 unless weighted[item].finite? - end - elsif weighted.instance_of?(Array) - sum = weighted.inject(0) {|sum, item| sum += item} if sum.nil? - weighted.each_with_index do |item, i| - weighted[i] = item/sum - weighted[i] = 0.0 unless weighted[i].finite? - end - - end + end + sum = sum.to_f + end + weighted.each do |item, weight| + weighted[item] = weight/sum + weighted[item] = 0.0 unless weighted[item].finite? + end + elsif weighted.instance_of?(Array) + sum = weighted.inject(0) {|sum, item| sum += item} if sum.nil? + weighted.each_with_index do |item, i| + weighted[i] = item/sum + weighted[i] = 0.0 unless weighted[i].finite? + end + end end def bradley_terry_probs -- libgit2 0.21.2