changes

2 files changed, 12 insertions, 11 deletions

diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index 50ce359..092205b 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -330,8 +330,7 @@ module OpenTox
           prediction = mlr( {:n_prop => props[0], :q_prop => props[1], :sims => sims, :acts => acts} )
           transformer = eval("OpenTox::Algorithm::Transform::#{params[:transform]["class"]}.new ([#{prediction}], #{params[:transform]["offset"]})")
           prediction = transformer.values[0]
-          prediction = nil if prediction.infinite?
-          #prediction = nil if params[:prediction_min_max][1] < prediction || params[:prediction_min_max][0] > prediction  
+          prediction = nil if prediction.infinite? || params[:prediction_min_max][1] < prediction || params[:prediction_min_max][0] > prediction  
           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]})
@@ -443,8 +442,7 @@ module OpenTox
           prediction = props.nil? ? local_svm(acts, sims, "nu-svr", params) : local_svm_prop(props, acts, "nu-svr")
           transformer = eval("OpenTox::Algorithm::Transform::#{params[:transform]["class"]}.new ([#{prediction}], #{params[:transform]["offset"]})")
           prediction = transformer.values[0]
-          prediction = nil if prediction.infinite?
-          #prediction = nil if params[:prediction_min_max][1] < prediction || params[:prediction_min_max][0] > prediction  
+          prediction = nil if prediction.infinite? || params[:prediction_min_max][1] < prediction || params[:prediction_min_max][0] > prediction  
           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 e6fbe2f..652d071 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -224,16 +224,19 @@ module OpenTox
           } )
         end
 
-        #if OpenTox::Feature.find(metadata[OT.dependentVariables]).feature_type == "regression"
-        #  all_activities = [] 
-          #all_activities = @activities.values.flatten.collect! { |i| i.to_f }
+        if OpenTox::Feature.find(metadata[OT.dependentVariables]).feature_type == "regression"
+          #t1 = Time.now
+          #LOGGER.debug "dv ----------- start"
+          all_activities = [] 
+          all_activities = @activities.values.flatten.collect! { |i| i.to_f }
           #LOGGER.debug "dv ------------------ min_toscale: #{all_activities.to_scale.min}"  
           #LOGGER.debug "dv ------------------ max_toscale: #{all_activities.to_scale.max}"  
           #LOGGER.debug "dv ------------------ min: #{@activities.values.flatten.to_scale.min}"  
           #LOGGER.debug "dv ------------------ max: #{@activities.values.max}"  
-          #@prediction_min_max[0] = (all_activities.to_scale.min/2)
-          #@prediction_min_max[1] = (all_activities.to_scale.max*2)
-        #end
+          @prediction_min_max[0] = (all_activities.to_scale.min/2)
+          @prediction_min_max[1] = (all_activities.to_scale.max*2)
+          #LOGGER.debug "dv ----------- end. Duration: '#{Time.now - t1}'"
+        end
 
         unless database_activity(subjectid) # adds database activity to @prediction_dataset
 
@@ -261,7 +264,7 @@ module OpenTox
             @prediction_dataset.add @compound.uri, value_feature_uri, @value_map[prediction[:prediction]]
           else
             @prediction_dataset.add @compound.uri, value_feature_uri, prediction[:prediction]
-          end
+         end
           @prediction_dataset.add @compound.uri, confidence_feature_uri, prediction[:confidence]
           @prediction_dataset.features[value_feature_uri][DC.title] = @prediction_dataset.metadata[DC.title]
           @prediction_dataset.features[confidence_feature_uri][DC.title] = "Confidence"