From b536a45cf18b070cec3f9cb8a44fdac0bfa3c58e Mon Sep 17 00:00:00 2001 From: gebele Date: Thu, 27 Jun 2019 14:08:57 +0000 Subject: fixed confidence value for cv stats; added tests --- lib/validation-statistics.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/validation-statistics.rb b/lib/validation-statistics.rb index d603294..2dd9c7a 100644 --- a/lib/validation-statistics.rb +++ b/lib/validation-statistics.rb @@ -129,7 +129,7 @@ module OpenTox predictions.each do |cid,pred| !if pred[:value] and pred[:measurements] and !pred[:measurements].empty? insert_prediction pred, :all - if pred[:confidence].match(/High/i) + if pred[:confidence].match(/Similar/i) insert_prediction pred, :confidence_high elsif pred[:confidence].match(/Low/i) insert_prediction pred, :confidence_low -- cgit v1.2.3 From 29c3cb2e8a8bbfb12178785f81d1cb324dc328e7 Mon Sep 17 00:00:00 2001 From: gebele Date: Fri, 12 Jul 2019 12:20:20 +0000 Subject: fixed, probability plot format was not taken from params for filename --- lib/validation-statistics.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/validation-statistics.rb b/lib/validation-statistics.rb index 2dd9c7a..4910573 100644 --- a/lib/validation-statistics.rb +++ b/lib/validation-statistics.rb @@ -101,7 +101,7 @@ module OpenTox R.assign "probability", probabilities R.eval "image = qplot(probability,accuracy)+ylab('Accumulated accuracy')+xlab('Prediction probability')+ylim(c(0,1))+scale_x_reverse()+geom_line()" R.eval "ggsave(file='#{tmpfile}', plot=image)" - file = Mongo::Grid::File.new(File.read(tmpfile), :filename => "#{self.id.to_s}_probability_plot.svg") + file = Mongo::Grid::File.new(File.read(tmpfile), :filename => "#{self.id.to_s}_probability_plot.#{format}") plot_id = $gridfs.insert_one(file) update(:probability_plot_id => plot_id) #end -- cgit v1.2.3 From 581707afa48711cfd2f929a91a96e4f5041b9ba2 Mon Sep 17 00:00:00 2001 From: gebele Date: Tue, 16 Jul 2019 14:03:03 +0000 Subject: always render new correlation plot; keep same handling as for probability plot --- lib/validation-statistics.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/validation-statistics.rb b/lib/validation-statistics.rb index 4910573..5fd9985 100644 --- a/lib/validation-statistics.rb +++ b/lib/validation-statistics.rb @@ -178,8 +178,12 @@ module OpenTox # @param [String,nil] format # @return [Blob] def correlation_plot format: "png" - unless correlation_plot_id - tmpfile = "/tmp/#{id.to_s}_correlation.#{format}" + #unless correlation_plot_id + #tmpfile = "/tmp/#{id.to_s}_correlation.#{format}" + tmpdir = "/tmp" + #p tmpdir + FileUtils.mkdir_p tmpdir + tmpfile = File.join(tmpdir,"#{id.to_s}_correlation.#{format}") x = [] y = [] feature = Feature.find(predictions.first.last["prediction_feature_id"]) @@ -203,7 +207,7 @@ module OpenTox file = Mongo::Grid::File.new(File.read(tmpfile), :filename => "#{id.to_s}_correlation_plot.#{format}") plot_id = $gridfs.insert_one(file) update(:correlation_plot_id => plot_id) - end + #end $gridfs.find_one(_id: correlation_plot_id).data end -- cgit v1.2.3