summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.de>2010-03-01 10:21:43 +0100
committerChristoph Helma <helma@in-silico.de>2010-03-01 10:21:43 +0100
commita11d6ddbde79e82888bec072748b1b9dd9e8af60 (patch)
tree04ad819d5790bedd6a4bb2ddf917d05ca8bf1ab2
parent771e8acd790d7c2d5c54c7395ae650a6f4bd3bf0 (diff)
wrapper version bumped to 1.3.0
-rw-r--r--lib/algorithm.rb8
-rw-r--r--lib/model.rb2
-rw-r--r--lib/opentox-ruby-api-wrapper.rb2
3 files changed, 10 insertions, 2 deletions
diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index 179a4a2..817340f 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -22,6 +22,10 @@ module OpenTox
resource = RestClient::Resource.new(params[:feature_generation_uri], :user => @@users[:users].keys[0], :password => @@users[:users].values[0])
resource.post :dataset_uri => params[:dataset_uri], :feature_uri => params[:feature_uri]
end
+
+ def self.uri
+ File.join(@@config[:services]["opentox-algorithm"], "fminer")
+ end
end
class Lazar
@@ -50,6 +54,10 @@ module OpenTox
@uri = resource.post :dataset_uri => params[:dataset_uri], :feature_uri => params[:feature_uri], :feature_generation_uri => File.join(@@config[:services]["opentox-algorithm"], "fminer")
end
+ def self.uri
+ File.join(@@config[:services]["opentox-algorithm"], "lazar")
+ end
+
end
class Similarity
diff --git a/lib/model.rb b/lib/model.rb
index 6c48734..b5129d7 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -45,7 +45,7 @@ module OpenTox
end
def self.base_uri
- @@config[:services]["opentox-model"]
+ File.join @@config[:services]["opentox-model"],'lazar'
end
def self.create(data)
diff --git a/lib/opentox-ruby-api-wrapper.rb b/lib/opentox-ruby-api-wrapper.rb
index 03838e8..849043c 100644
--- a/lib/opentox-ruby-api-wrapper.rb
+++ b/lib/opentox-ruby-api-wrapper.rb
@@ -8,6 +8,6 @@ rescue LoadError
puts "Please install Openbabel with 'rake openbabel:install' in the compound component"
end
-['owl', 'compound','dataset','algorithm','model','task','utils','authorization'].each do |lib|
+['owl', 'compound','dataset','algorithm','model','task','validation','utils','authorization'].each do |lib|
require lib
end