From db38c345fdc119edd8a892a5b0ba2c2a4b1cbe1f Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Fri, 31 Mar 2017 15:07:28 +0000
Subject: set default min sim to 0.1 for classification and 0.5 for regression

---
 lib/model.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/model.rb b/lib/model.rb
index 7cc6765..80affd5 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -68,10 +68,6 @@ module OpenTox
               :method => "fingerprint",
               :type => "MP2D",
             },
-            :similarity => {
-              :method => "Algorithm::Similarity.tanimoto",
-              :min => 0.5,
-            },
             :feature_selection => nil
           }
 
@@ -79,10 +75,18 @@ module OpenTox
             model.algorithms[:prediction] = {
                 :method => "Algorithm::Classification.weighted_majority_vote",
             }
+            model.algorithms[:similarity] = {
+              :method => "Algorithm::Similarity.tanimoto",
+              :min => 0.1,
+            }
           elsif model.class == LazarRegression
             model.algorithms[:prediction] = {
               :method => "Algorithm::Caret.rf",
             }
+            model.algorithms[:similarity] = {
+              :method => "Algorithm::Similarity.tanimoto",
+              :min => 0.5,
+            }
           end
 
         elsif substance_classes.first == "OpenTox::Nanoparticle"
-- 
cgit v1.2.3