diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-05-26 08:38:21 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-05-26 08:38:21 +0200 |
| commit | 77c885b7394aa11ba5e59eb60884205332efa31a (patch) | |
| tree | 1993a7fdfffc85adc16910667b36f9f5eaf1aca8 /lib/model.rb | |
| parent | 2b12d07bec101df8c10b7ab5aff1491b0997a6c7 (diff) | |
7th v
Diffstat (limited to 'lib/model.rb')
| -rw-r--r-- | lib/model.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/model.rb b/lib/model.rb index 1a5aa37..921335c 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -214,7 +214,7 @@ module OpenTox (i == modulo[0]) && (slack>0) ? lr_size = s.size + slack : lr_size = s.size + addon # determine fraction LOGGER.info "BLAZAR: Neighbors round #{i}: #{position} + #{lr_size}." neighbors_balanced(s, l, position, lr_size) # get ratio fraction of larger part - props = get_props + (@prediction_algorithm.include? "svm" and params[:prop_kernel] == "true") ? props = get_props : props = nil prediction = eval("#{@prediction_algorithm}(@neighbors,{:similarity_algorithm => @similarity_algorithm, :p_values => @p_values}, props)") if prediction_best.nil? || prediction[:confidence].abs > prediction_best[:confidence].abs prediction_best=prediction @@ -232,7 +232,7 @@ module OpenTox else # no balancing as before neighbors - props = get_props + (@prediction_algorithm.include? "svm" and params[:prop_kernel] == "true") ? props = get_props : props = nil prediction = eval("#{@prediction_algorithm}(@neighbors,{:similarity_algorithm => @similarity_algorithm, :p_values => @p_values}, props)") end |