diff options
| -rw-r--r-- | report/report_persistance.rb | 2 | ||||
| -rw-r--r-- | test/test_examples.rb | 19 | ||||
| -rw-r--r-- | validation/validation_service.rb | 20 | ||||
| -rw-r--r-- | validation/validation_test.rb | 4 |
4 files changed, 34 insertions, 11 deletions
diff --git a/report/report_persistance.rb b/report/report_persistance.rb index 1dc5029..1d9d7ff 100644 --- a/report/report_persistance.rb +++ b/report/report_persistance.rb @@ -230,7 +230,7 @@ module Reports end def list_reports(type, filter_params=nil) - #QMRF-STUP + #QMRF-STUB return "1" if type == ReportFactory::RT_QMRF filter_params = {} unless filter_params diff --git a/test/test_examples.rb b/test/test_examples.rb index a23ce0f..bbe6ddd 100644 --- a/test/test_examples.rb +++ b/test/test_examples.rb @@ -180,6 +180,23 @@ module ValidationExamples end end + ######################################################################################################## + + class ISTEpaCrossvalidation < CrossValidation + def initialize + @dataset_uri = "http://ot-dev.in-silico.ch/dataset/69" + @prediction_feature = "http://ot-dev.in-silico.ch/toxcreate/feature#EPA%20FHM" + end + end + + class ISTLazarISTEpaCrossvalidation < ISTEpaCrossvalidation + def initialize + @algorithm_uri = "http://ot-dev.in-silico.ch/algorithm/lazar" + @algorithm_params = "feature_generation_uri=http://ot-dev.in-silico.ch/algorithm/fminer" + super + end + end + ######################################################################################################## class LR_AmbitCacoModel < ModelValidation @@ -262,6 +279,8 @@ module ValidationExamples "8b" => [ MajorityIrisCrossvalidation ], "9a" => [ ISTLazarISTIrisCrossvalidation ], + + "10a" => [ ISTLazarISTEpaCrossvalidation ], } def self.list diff --git a/validation/validation_service.rb b/validation/validation_service.rb index 40d8f58..cfbb681 100644 --- a/validation/validation_service.rb +++ b/validation/validation_service.rb @@ -191,8 +191,9 @@ module Validation def perform_cv ( algorithm_params=nil ) LOGGER.debug "perform cv validations" - Validation.find( :all, :conditions => { :crossvalidation_id => id } ).each do |v| - v.validate_algorithm( algorithm_params ) + @tmp_validations.each do | val | + validation = Validation.new val + validation.validate_algorithm( algorithm_params ) #break end end @@ -280,6 +281,8 @@ module Validation test_features = orig_dataset.features.dclone - [prediction_feature] + @tmp_validations = [] + (1..self.num_folds).each do |n| datasetname = 'cv'+self.id.to_s + @@ -311,12 +314,13 @@ module Validation LOGGER.debug "test set: "+datasetname+"_test, compounds: "+test_compounds.size.to_s test_dataset_uri = orig_dataset.create_new_dataset( test_compounds, test_features, datasetname + '_test', source ) - validation = Validation.new :training_dataset_uri => train_dataset_uri, - :test_dataset_uri => test_dataset_uri, - :test_target_dataset_uri => self.dataset_uri, - :crossvalidation_id => self.id, :crossvalidation_fold => n, - :prediction_feature => prediction_feature, - :algorithm_uri => self.algorithm_uri + tmp_validation = { :training_dataset_uri => train_dataset_uri, + :test_dataset_uri => test_dataset_uri, + :test_target_dataset_uri => self.dataset_uri, + :crossvalidation_id => self.id, :crossvalidation_fold => n, + :prediction_feature => prediction_feature, + :algorithm_uri => self.algorithm_uri } + @tmp_validations << tmp_validation end end end diff --git a/validation/validation_test.rb b/validation/validation_test.rb index 97fff4b..cbaa84b 100644 --- a/validation/validation_test.rb +++ b/validation/validation_test.rb @@ -39,7 +39,7 @@ class ValidationTest < Test::Unit::TestCase # #:classification=>"true"} # puts last_response.body - #run_test("1b" ) #, "http://localhost/validation/826") #,"http://localhost/validation/report/validation/36") #, "http://localhost/validation/321") + run_test("3b" ) #, "http://localhost/validation/826") #,"http://localhost/validation/report/validation/36") #, "http://localhost/validation/321") #run_test("7a") #,"http://localhost/validation/crossvalidation/10") #, "http://localhost/validation/321") @@ -48,7 +48,7 @@ class ValidationTest < Test::Unit::TestCase #puts Nightly.build_nightly("1") #prepare_examples - do_test_examples # USES CURL, DO NOT FORGET TO RESTART VALIDATION SERVICE + #do_test_examples # USES CURL, DO NOT FORGET TO RESTART VALIDATION SERVICE end def app |