summaryrefslogtreecommitdiff
path: root/lib/algorithm.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2010-07-22 10:23:53 +0200
committerChristoph Helma <helma@in-silico.ch>2010-07-22 10:23:53 +0200
commit05084b1127f0d2498240472cca8a475f48f1fcc4 (patch)
treeb88fcae0617a5acacf5cc17db83665688c0f2078 /lib/algorithm.rb
parentef22b5b8581a535aa14c977c124f590e9a76bac5 (diff)
modifications from first code review meeting
Diffstat (limited to 'lib/algorithm.rb')
-rw-r--r--lib/algorithm.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index cc06032..de5902b 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -12,7 +12,7 @@ module OpenTox
end
def self.uri
- File.join(@@config[:services]["opentox-algorithm"], "fminer")
+ File.join(CONFIG[:services]["opentox-algorithm"], "fminer")
end
end
@@ -21,15 +21,15 @@ module OpenTox
def self.create_model(params)
LOGGER.debug params
LOGGER.debug File.basename(__FILE__) + ": creating model"
- LOGGER.debug File.join(@@config[:services]["opentox-algorithm"], "lazar")
- #resource = RestClient::Resource.new(File.join(@@config[:services]["opentox-algorithm"], "lazar"), :user => @@users[:users].keys[0], :password => @@users[:users].values[0], :content_type => "application/x-yaml")
- resource = RestClient::Resource.new(File.join(@@config[:services]["opentox-algorithm"], "lazar"), :user => @@users[:users].keys[0], :password => @@users[:users].values[0], :content_type => "application/x-yaml")
- #@uri = resource.post(:dataset_uri => params[:dataset_uri], :feature_uri => params[:feature_uri], :feature_generation_uri => File.join(@@config[:services]["opentox-algorithm"], "fminer")).chomp
- @uri = resource.post(:dataset_uri => params[:dataset_uri], :prediction_feature => params[:prediction_feature], :feature_generation_uri => File.join(@@config[:services]["opentox-algorithm"], "fminer")).body.chomp
+ LOGGER.debug File.join(CONFIG[:services]["opentox-algorithm"], "lazar")
+ #resource = RestClient::Resource.new(File.join(CONFIG[:services]["opentox-algorithm"], "lazar"), :user => @@users[:users].keys[0], :password => @@users[:users].values[0], :content_type => "application/x-yaml")
+ resource = RestClient::Resource.new(File.join(CONFIG[:services]["opentox-algorithm"], "lazar"), :user => @@users[:users].keys[0], :password => @@users[:users].values[0], :content_type => "application/x-yaml")
+ #@uri = resource.post(:dataset_uri => params[:dataset_uri], :feature_uri => params[:feature_uri], :feature_generation_uri => File.join(CONFIG[:services]["opentox-algorithm"], "fminer")).chomp
+ @uri = resource.post(:dataset_uri => params[:dataset_uri], :prediction_feature => params[:prediction_feature], :feature_generation_uri => File.join(CONFIG[:services]["opentox-algorithm"], "fminer")).body.chomp
end
def self.uri
- File.join(@@config[:services]["opentox-algorithm"], "lazar")
+ File.join(CONFIG[:services]["opentox-algorithm"], "lazar")
end
end