From 3d4e14e6dc69f88b5b37e6469355d93852d0d208 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Tue, 16 Mar 2010 19:42:55 +0100 Subject: initial test for dataset prediction added --- lib/dataset.rb | 1 - lib/task.rb | 21 ++------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/lib/dataset.rb b/lib/dataset.rb index ab363a9..dad6403 100644 --- a/lib/dataset.rb +++ b/lib/dataset.rb @@ -18,7 +18,6 @@ module OpenTox def save - LOGGER.debug "Saving dataset" @features.uniq! @compounds.uniq! RestClient::Resource.new(@@config[:services]["opentox-dataset"], :user => @@users[:users].keys[0], :password => @@users[:users].values[0]).post(self.to_yaml, :content_type => "application/x-yaml").chomp.to_s diff --git a/lib/task.rb b/lib/task.rb index 87bad21..5591a34 100644 --- a/lib/task.rb +++ b/lib/task.rb @@ -11,9 +11,7 @@ module OpenTox end def self.create - #uri = RestClient.post @@config[:services]["opentox-task"], {} resource = RestClient::Resource.new(@@config[:services]["opentox-task"], :user => @@users[:users].keys[0], :password => @@users[:users].values[0]) - #uri = resource.post(nil) uri = resource.post({}).chomp Task.new(uri.chomp) end @@ -63,22 +61,7 @@ module OpenTox resource.put :resource => uri end -=begin - def started - RestClient.put File.join(@uri,'started'), {} - end - - def cancel - RestClient.put File.join(@uri,'cancelled'), {} - end - - def completed(uri) - RestClient.put File.join(@uri,'completed'), :resource => uri - end - -=end def failed - #RestClient.put File.join(@uri,'failed'), {} resource = RestClient::Resource.new(File.join(@uri,'failed'), :user => @@users[:users].keys[0], :password => @@users[:users].values[0]) resource.put({}) end @@ -103,9 +86,9 @@ module OpenTox self.status.to_s == 'failed' end - def wait_for_completion + def wait_for_completion(dur=0.1) until self.completed? or self.failed? - sleep 0.1 + sleep dur end end -- cgit v1.2.3