summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.de>2010-03-16 19:42:55 +0100
committerChristoph Helma <helma@in-silico.de>2010-03-16 19:42:55 +0100
commit3d4e14e6dc69f88b5b37e6469355d93852d0d208 (patch)
treee63c9565c1b0fa6dc4f28eb19264070e8baacc91
parent537aea2020a7b75d5b669642c7c3d9a715316a31 (diff)
initial test for dataset prediction added
-rw-r--r--lib/dataset.rb1
-rw-r--r--lib/task.rb21
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