From 13e7865f386603fb784e62feef2ee2a56c015b45 Mon Sep 17 00:00:00 2001 From: "helma@in-silico.ch" Date: Tue, 14 Aug 2018 12:02:03 +0000 Subject: classification min_sim=0.5, 5 repeated cvs --- lib/train-test-validation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/train-test-validation.rb') diff --git a/lib/train-test-validation.rb b/lib/train-test-validation.rb index 9a5532d..8231728 100644 --- a/lib/train-test-validation.rb +++ b/lib/train-test-validation.rb @@ -28,7 +28,7 @@ module OpenTox end predictions.select!{|cid,p| p[:value] and p[:measurements]} # hack to avoid mongos file size limit error on large datasets - #predictions.each{|cid,p| p[:neighbors] = []} if model.training_dataset.name.match(/mutagenicity/i) + predictions.each{|cid,p| p[:neighbors] = []} #if model.training_dataset.name.match(/mutagenicity/i) validation = self.new( :model_id => validation_model.id, :test_dataset_id => test_set.id, -- cgit v1.2.3 From d61f78093f4ddf03c27a2c8ae0bab9c1f10c80f5 Mon Sep 17 00:00:00 2001 From: "helma@in-silico.ch" Date: Tue, 30 Oct 2018 17:26:59 +0100 Subject: tests fixed --- lib/train-test-validation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/train-test-validation.rb') diff --git a/lib/train-test-validation.rb b/lib/train-test-validation.rb index 8231728..bffee8c 100644 --- a/lib/train-test-validation.rb +++ b/lib/train-test-validation.rb @@ -28,7 +28,7 @@ module OpenTox end predictions.select!{|cid,p| p[:value] and p[:measurements]} # hack to avoid mongos file size limit error on large datasets - predictions.each{|cid,p| p[:neighbors] = []} #if model.training_dataset.name.match(/mutagenicity/i) + predictions.each{|cid,p| p.delete(:neighbors)} #if model.training_dataset.name.match(/mutagenicity/i) validation = self.new( :model_id => validation_model.id, :test_dataset_id => test_set.id, -- cgit v1.2.3 From 3a9c9332b660d35720ad4fa1f55ee0883e53aecd Mon Sep 17 00:00:00 2001 From: "helma@in-silico.ch" Date: Fri, 2 Nov 2018 20:34:44 +0100 Subject: warnings fixed, cleanup --- lib/train-test-validation.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'lib/train-test-validation.rb') diff --git a/lib/train-test-validation.rb b/lib/train-test-validation.rb index bffee8c..d034cd1 100644 --- a/lib/train-test-validation.rb +++ b/lib/train-test-validation.rb @@ -18,22 +18,15 @@ module OpenTox validation_model = model.class.create prediction_feature: model.prediction_feature, training_dataset: training_set, algorithms: model.algorithms validation_model.save predictions = validation_model.predict test_set.substances - nr_unpredicted = 0 predictions.each do |cid,prediction| - if prediction[:value] - prediction[:measurements] = test_set.values(cid, prediction[:prediction_feature_id]) - else - nr_unpredicted += 1 - end + prediction[:measurements] = test_set.values(cid, prediction[:prediction_feature_id]) if prediction[:value] end predictions.select!{|cid,p| p[:value] and p[:measurements]} - # hack to avoid mongos file size limit error on large datasets + # remove neighbors to avoid mongos file size limit error on large datasets predictions.each{|cid,p| p.delete(:neighbors)} #if model.training_dataset.name.match(/mutagenicity/i) validation = self.new( :model_id => validation_model.id, :test_dataset_id => test_set.id, - :nr_instances => test_set.substances.size, - :nr_unpredicted => nr_unpredicted, :predictions => predictions ) validation.save -- cgit v1.2.3