summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2013-07-12 18:13:40 +0200
committerChristoph Helma <helma@in-silico.ch>2013-07-12 18:13:40 +0200
commit4c848ed19705f7474e7081499ccf88b717242561 (patch)
treee3b07472ee062987f5745882e5cb1ebd620b7232
parentb63793f1729eb16465801b144cc26c9ee57a89e1 (diff)
value type identification/conversion fixed
-rwxr-xr-xvalidation/validation_service.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/validation/validation_service.rb b/validation/validation_service.rb
index f044b1e..80a7b6b 100755
--- a/validation/validation_service.rb
+++ b/validation/validation_service.rb
@@ -169,7 +169,6 @@ module Validation
#model = OpenTox::Model::PredictionModel.find(self.model_uri)
#resource_not_found_error "model not found: "+self.model_uri.to_s unless model
model = OpenTox::Model::Generic.new(self.model_uri, self.subjectid)
- #model.get
unless self.algorithm_uri
self.algorithm_uri = model.metadata[RDF::OT.algorithm]
@@ -183,7 +182,9 @@ module Validation
prediction_dataset_uri = ""
benchmark = Benchmark.measure do
#prediction_dataset_uri = model.predict_dataset(self.test_dataset_uri, OpenTox::SubTask.create(task, 0, 50))
- puts self.test_dataset_uri
+ #puts self.test_dataset_uri
+ #puts "MODEL"
+ #puts model.uri
prediction_dataset_uri = model.run({:dataset_uri => self.test_dataset_uri, :subjectid => self.subjectid})
#"text/uri-list",OpenTox::SubTask.create(task, 0, 50))
end
@@ -649,7 +650,7 @@ module Validation
meta[RDF::DC.title] = "Training dataset split of "+orig_dataset.uri
result = {}
- train_data = orig_dataset.split( training_compound_indices, orig_dataset.features, meta, subjectid )
+ train_data = orig_dataset.split( training_compound_indices, orig_dataset.features, meta )
est_num_train_compounds = (orig_dataset.compounds.size*split_ratio).round
internal_server_error "Train dataset num coumpounds != #{est_num_train_compounds}, instead: "+train_data.compounds.size.to_s unless
train_data.compounds.size==est_num_train_compounds
@@ -657,7 +658,7 @@ module Validation
task.progress(66) if task
meta[RDF::DC.title] = "Test dataset split of "+orig_dataset.uri
- test_data = orig_dataset.split( test_compound_indices, orig_dataset.features, meta, subjectid )
+ test_data = orig_dataset.split( test_compound_indices, orig_dataset.features, meta )
est_num_test_compounds = orig_dataset.compounds.size-est_num_train_compounds
internal_server_error "Test dataset num coumpounds != #{est_num_test_compounds}, instead: "+test_data.compounds.size.to_s unless
test_data.compounds.size==est_num_test_compounds