Removed censoring based on all values (min_max)

2 files changed, 4 insertions, 9 deletions

diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index d62369e..3efb961 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -704,7 +704,7 @@ module OpenTox
 
             # Restore
             prediction = acts_autoscaler.restore( [ prediction ].to_gv )[0]
-            prediction = nil if prediction.infinite? || params[:prediction_min_max][1] < prediction || params[:prediction_min_max][0] > prediction  
+            prediction = nil if prediction.infinite? 
             LOGGER.debug "Prediction is: '" + prediction.to_s + "'."
             params[:conf_stdev] = false if params[:conf_stdev].nil?
             confidence = get_confidence({:sims => sims, :acts => acts, :neighbors => params[:neighbors], :conf_stdev => params[:conf_stdev]})
diff --git a/lib/model.rb b/lib/model.rb
index 8beba6f..01b9278 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -102,7 +102,7 @@ module OpenTox
       include Algorithm
       include Model
 
-      attr_accessor :compound, :prediction_dataset, :features, :effects, :activities, :p_values, :fingerprints, :feature_calculation_algorithm, :similarity_algorithm, :prediction_algorithm, :min_sim, :subjectid, :prop_kernel, :value_map, :nr_hits, :conf_stdev, :prediction_min_max, :max_perc_neighbors
+      attr_accessor :compound, :prediction_dataset, :features, :effects, :activities, :p_values, :fingerprints, :feature_calculation_algorithm, :similarity_algorithm, :prediction_algorithm, :min_sim, :subjectid, :prop_kernel, :value_map, :nr_hits, :conf_stdev, :max_perc_neighbors
 
       def initialize(uri=nil)
 
@@ -120,7 +120,6 @@ module OpenTox
         @p_values = {}
         @fingerprints = {}
         @value_map = {}
-        @prediction_min_max = [] 
 
         @feature_calculation_algorithm = "Substructure.match"
         @similarity_algorithm = "Similarity.tanimoto"
@@ -180,14 +179,13 @@ module OpenTox
         lazar.value_map = hash["value_map"] if hash["value_map"]
         lazar.nr_hits = hash["nr_hits"] if hash["nr_hits"]
         lazar.conf_stdev = hash["conf_stdev"] if hash["conf_stdev"]
-        lazar.prediction_min_max = hash["prediction_min_max"] if hash["prediction_min_max"]
         lazar.max_perc_neighbors = hash["max_perc_neighbors"] if hash["max_perc_neighbors"]
 
         lazar
       end
 
       def to_json
-        Yajl::Encoder.encode({:uri => @uri,:metadata => @metadata, :compound => @compound, :prediction_dataset => @prediction_dataset, :features => @features, :effects => @effects, :activities => @activities, :p_values => @p_values, :fingerprints => @fingerprints, :feature_calculation_algorithm => @feature_calculation_algorithm, :similarity_algorithm => @similarity_algorithm, :prediction_algorithm => @prediction_algorithm, :min_sim => @min_sim, :subjectid => @subjectid, :prop_kernel => @prop_kernel, :value_map => @value_map, :nr_hits => @nr_hits, :conf_stdev => @conf_stdev, :prediction_min_max => @prediction_min_max, :max_perc_neighbors => @max_perc_neighbors})
+        Yajl::Encoder.encode({:uri => @uri,:metadata => @metadata, :compound => @compound, :prediction_dataset => @prediction_dataset, :features => @features, :effects => @effects, :activities => @activities, :p_values => @p_values, :fingerprints => @fingerprints, :feature_calculation_algorithm => @feature_calculation_algorithm, :similarity_algorithm => @similarity_algorithm, :prediction_algorithm => @prediction_algorithm, :min_sim => @min_sim, :subjectid => @subjectid, :prop_kernel => @prop_kernel, :value_map => @value_map, :nr_hits => @nr_hits, :conf_stdev => @conf_stdev, :max_perc_neighbors => @max_perc_neighbors})
       end
 
       def run( params, accept_header=nil, waiting_task=nil )
@@ -262,8 +260,6 @@ module OpenTox
         if OpenTox::Feature.find(metadata[OT.dependentVariables], subjectid).feature_type == "regression"
           all_activities = [] 
           all_activities = @activities.values.flatten.collect! { |i| i.to_f }
-          @prediction_min_max[0] = (all_activities.to_scale.min/2)
-          @prediction_min_max[1] = (all_activities.to_scale.max*2)
         end
 
         unless database_activity(subjectid) # adds database activity to @prediction_dataset
@@ -279,8 +275,7 @@ module OpenTox
                                                           :prop_kernel => @prop_kernel,
                                                           :value_map => @value_map,
                                                           :nr_hits => @nr_hits,
-                                                          :conf_stdev => @conf_stdev,
-                                                          :prediction_min_max => @prediction_min_max
+                                                          :conf_stdev => @conf_stdev
                                                          } ) ")
 
           value_feature_uri = File.join( @uri, "predicted", "value")