From fffc9e0b2657e29eeb7ee73f5ff51dafa0b6acfb Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Thu, 22 Jul 2010 17:12:51 +0200 Subject: CONFIG reverted to @@config --- application.rb | 1 - lazar.rb | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) mode change 100755 => 100644 lazar.rb 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 old mode 100755 new mode 100644 index 7e0bb98..1377296 --- 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 -- cgit v1.2.3