summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2019-08-19 15:28:44 +0200
committerChristoph Helma <helma@in-silico.ch>2019-08-19 15:28:44 +0200
commit15f093eee66597b0b4a4defa7d8645a3e13372a0 (patch)
tree19da2771f88bbb3c77d2c6905a0c4b1694bf5620 /lib
parenta43af9e1d26d564fdbcf089977908a19299acd5a (diff)
parent488ce9fe6d4b715680675861105b8c52a7535140 (diff)
Merge branch 'development' of ssh://git.in-silico.ch:2222/home/ist/public/lazar into developmentdevelopment
Diffstat (limited to 'lib')
-rw-r--r--lib/validation-statistics.rb14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/validation-statistics.rb b/lib/validation-statistics.rb
index d603294..5fd9985 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
@@ -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
@@ -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