summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.de>2009-11-27 18:18:31 +0100
committerChristoph Helma <helma@in-silico.de>2009-11-27 18:18:31 +0100
commit45802e0a9b7ef6a918c4b7a539261bdba8217d38 (patch)
treec5668eefed20c1c06e5a138f003d42acdfe1425b
parent5dfa70ed7ee259a75bea0f54b83ccfce79e591e0 (diff)
model creation steps fixed
-rw-r--r--features/step_definitions/common_steps.rb1
-rw-r--r--features/step_definitions/dataset_steps.rb0
-rw-r--r--features/step_definitions/lazar_steps.rb5
3 files changed, 4 insertions, 2 deletions
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 41985b3..e2d9f09 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -15,6 +15,7 @@ end
Then /^I should receive a valid URI$/ do
@response = RestClient.get @uri
+ #puts @response
end
Then /^the URI should contain (.+)$/ do |result|
diff --git a/features/step_definitions/dataset_steps.rb b/features/step_definitions/dataset_steps.rb
deleted file mode 100644
index e69de29..0000000
--- a/features/step_definitions/dataset_steps.rb
+++ /dev/null
diff --git a/features/step_definitions/lazar_steps.rb b/features/step_definitions/lazar_steps.rb
index bc84159..3992bf9 100644
--- a/features/step_definitions/lazar_steps.rb
+++ b/features/step_definitions/lazar_steps.rb
@@ -2,8 +2,10 @@ When /^I create a lazar model for (.*)$/ do |feature_uri|
training_uri = @uri
feature_uri = RestClient.post File.join(@@config[:services]["opentox-algorithm"], "fminer"), :dataset_uri => training_uri, :feature_uri => feature_uri
@resources << feature_uri
- @uri = RestClient.post File.join(@@config[:services]["opentox-model"], "lazar"), :activity_dataset_uri => training_uri, :feature_dataset_uri => feature_uri
+ #puts File.join(@@config[:services]["opentox-algorithm"], "lazar")+ ":activity_dataset_uri => #{training_uri}, :feature_dataset_uri => #{feature_uri}"
+ @uri = RestClient.post File.join(@@config[:services]["opentox-algorithm"], "lazar"), :activity_dataset_uri => training_uri, :feature_dataset_uri => feature_uri
@resources << @uri
+ #puts @uri.to_yaml
end
Then /^the model should predict (.*) for (.*)$/ do |activity,smiles|
@@ -11,7 +13,6 @@ Then /^the model should predict (.*) for (.*)$/ do |activity,smiles|
puts @uri
prediction = RestClient.post @uri, :compound_uri => compound_uri
puts prediction
- #prediction = RestClient.get prediction_uri
#assert_equal activity.to_s, YAML.load(prediction)[:values]['classification'].to_s
end