From 55fb7587400f706d983170c7f56ab741a6a302b0 Mon Sep 17 00:00:00 2001 From: mguetlein Date: Mon, 18 Jun 2012 17:37:55 +0200 Subject: remove pics in reports --- lib/ot_predictions.rb | 6 ++++-- validation/validation_test.rb | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/ot_predictions.rb b/lib/ot_predictions.rb index 2752fcc..47a4b44 100755 --- a/lib/ot_predictions.rb +++ b/lib/ot_predictions.rb @@ -36,7 +36,9 @@ module Lib end def self.to_array( predictions, add_pic=false, format=false, validation_uris=nil ) - + + add_pic = false #predictions.size<=250 + confidence_available = false predictions.each do |p| confidence_available |= p.confidence_values_available? @@ -54,7 +56,7 @@ module Lib begin #a.push( "http://ambit.uni-plovdiv.bg:8080/ambit2/depict/cdk?search="+ # URI.encode(OpenTox::Compound.new(:uri=>p.identifier(i)).smiles) ) if add_pic - a << p.identifier(i)+"?media=image/png" + a << p.identifier(i)+"?media=image/png" if add_pic rescue => ex raise ex #a.push("Could not add pic: "+ex.message) diff --git a/validation/validation_test.rb b/validation/validation_test.rb index 78f35d2..5d09b8c 100755 --- a/validation/validation_test.rb +++ b/validation/validation_test.rb @@ -85,16 +85,16 @@ class ValidationTest < Test::Unit::TestCase # {:validation_uris=>"http://local-ot/validation/389,http://local-ot/validation/390,http://local-ot/validation/391,http://local-ot/validation/392", # :identifier=>"split1,split1,split2,split2"} - post "/training_test_validation",{:prediction_feature=>"http://opentox.informatik.uni-freiburg.de/dataset/2/feature/MTP", - :training_dataset_uri=>"http://opentox.informatik.uni-freiburg.de/dataset/4755", - :algorithm_uri=>"http://opentox.informatik.uni-freiburg.de/superservice", - :test_dataset_uri=>"http://opentox.informatik.uni-freiburg.de/dataset/3556", - :algorithm_params=>"prediction_algorithm=http://opentox.informatik.uni-freiburg.de/weka/M5P;create_bbrc_features=false;ad_algorithm=http://opentox.informatik.uni-freiburg.de/appdomain/EuclideanDistance"} - exit - - #post "/report/validation",{:validation_uris=>"http://local-ot/validation/22849",:min_confidence=>0.5} - get "/22849",{:min_confidence=>0.5} - exit +# post "/training_test_validation",{:prediction_feature=>"http://opentox.informatik.uni-freiburg.de/dataset/2/feature/MTP", +# :training_dataset_uri=>"http://opentox.informatik.uni-freiburg.de/dataset/4755", +# :algorithm_uri=>"http://opentox.informatik.uni-freiburg.de/superservice", +# :test_dataset_uri=>"http://opentox.informatik.uni-freiburg.de/dataset/3556", +# :algorithm_params=>"prediction_algorithm=http://opentox.informatik.uni-freiburg.de/weka/M5P;create_bbrc_features=false;ad_algorithm=http://opentox.informatik.uni-freiburg.de/appdomain/EuclideanDistance"} +# exit +# +# #post "/report/validation",{:validation_uris=>"http://local-ot/validation/22849",:min_confidence=>0.5} +# get "/22849",{:min_confidence=>0.5} +# exit #post "/report/validation",{:validation_uris=>"http://local-ot/validation/389"} @@ -105,7 +105,7 @@ class ValidationTest < Test::Unit::TestCase # #dataset_uri = "http://apps.ideaconsult.net:8080/ambit2/dataset/603204" dataset_uri = "http://local-ot/dataset/9264" - post "/plain_training_test_split",{:dataset_uri=>dataset_uri, :stratified=>"false", :split_ratio=>0.5} + post "/plain_training_test_split",{:dataset_uri=>dataset_uri, :stratified=>"super", :split_ratio=>0.25} puts last_response.body uri = last_response.body exit -- cgit v1.2.3