summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2010-07-22 17:12:51 +0200
committerChristoph Helma <helma@in-silico.ch>2010-07-22 17:12:51 +0200
commitfffc9e0b2657e29eeb7ee73f5ff51dafa0b6acfb (patch)
tree79e66ac96c5a5653b6c4d457d83f9fd5af3a36d8
parent26aa9a42990a958f53f326f3ccaed3848d21fd97 (diff)
CONFIG reverted to @@config
-rw-r--r--application.rb1
-rw-r--r--[-rwxr-xr-x]lazar.rb10
2 files changed, 5 insertions, 6 deletions
diff --git a/application.rb b/application.rb
index b573314..1c94f24 100644
--- a/application.rb
+++ b/application.rb
@@ -1,7 +1,6 @@
require 'rubygems'
gem "opentox-ruby-api-wrapper", "= 1.6.0"
require 'opentox-ruby-api-wrapper'
-LOGGER.progname = File.expand_path(__FILE__)
class Model
include DataMapper::Resource
diff --git a/lazar.rb b/lazar.rb
index 7e0bb98..1377296 100755..100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -111,9 +111,9 @@ class Lazar < Model
tuple = {
File.join(@@config[:services]["opentox-model"],"lazar#regression") => regression,
File.join(@@config[:services]["opentox-model"],"lazar#confidence") => conf,
- #File.join(@@config[:services]["opentox-model"],"lazar#similarities") => similarities,
- #File.join(@@config[:services]["opentox-model"],"lazar#activities") => activities,
- #File.join(@@config[:services]["opentox-model"],"lazar#features") => fragments
+ File.join(@@config[:services]["opentox-model"],"lazar#similarities") => similarities,
+ File.join(@@config[:services]["opentox-model"],"lazar#activities") => activities,
+ File.join(@@config[:services]["opentox-model"],"lazar#features") => fragments
}
prediction.data[compound_uri] << {feature_uri => tuple}
end
@@ -183,8 +183,8 @@ class Lazar < Model
tuple = {
File.join(@@config[:services]["opentox-model"],"lazar#classification") => classification,
File.join(@@config[:services]["opentox-model"],"lazar#confidence") => conf,
- #File.join(@@config[:services]["opentox-model"],"lazar#neighbors") => neighbors,
- #File.join(@@config[:services]["opentox-model"],"lazar#features") => fragments
+ File.join(@@config[:services]["opentox-model"],"lazar#neighbors") => neighbors,
+ File.join(@@config[:services]["opentox-model"],"lazar#features") => fragments
}
prediction.data[compound_uri] << {feature_uri => tuple}
end