enm study import fixed

1 files changed, 6 insertions, 9 deletions

diff --git a/lib/classification.rb b/lib/classification.rb
index 4cc9201..48ff8b3 100644
--- a/lib/classification.rb
+++ b/lib/classification.rb
@@ -3,17 +3,15 @@ module OpenTox
     
     class Classification
 
-      def self.weighted_majority_vote compound, params
-        neighbors = params[:neighbors]
-        feature_id = params[:prediction_feature_id].to_s
-        dataset_id = params[:training_dataset_id].to_s
+      def self.weighted_majority_vote substance, neighbors
         sims = {}
-        neighbors.each do |n|
-          sim = n["tanimoto"]
-          n["toxicities"][feature_id][dataset_id].each do |act|
+        neighbors.each do |neighbor|
+          sim = neighbor["similarity"]
+          activities = neighbor["toxicities"]
+          activities.each do |act|
             sims[act] ||= []
             sims[act] << sim
-          end if n["toxicities"][feature_id][dataset_id]
+          end if activities
         end
         sim_all = sims.collect{|a,s| s}.flatten
         sim_sum = sim_all.sum
@@ -26,7 +24,6 @@ module OpenTox
         p_max = probabilities.collect{|a,p| p}.max
         prediction = probabilities.key(p_max)
         {:value => prediction,:probabilities => probabilities}
-
       end
     end
   end