summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2010-11-23 16:45:21 +0100
committerChristoph Helma <helma@in-silico.ch>2010-11-23 16:45:21 +0100
commit40d607c935e27ab26a2f2dd1d641717c9d6a5e31 (patch)
tree7156e6d34861596ddff2e20e4d55a46babcf5491
parent2d0c76b7838f5f31552a09c54a81e621d1618d2d (diff)
dataset prediction fixed
-rw-r--r--lazar.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lazar.rb b/lazar.rb
index 8ad9fed..0a9dddf 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -59,9 +59,9 @@ post '/:id/?' do
response['Content-Type'] = 'text/uri-list'
if compound_uri
+ #cache = PredictionCache.first(:model_uri => @lazar.uri, :compound_uri => compound_uri)
+ #return cache.dataset_uri if cache
begin
- cache = PredictionCache.first(:model_uri => @lazar.uri, :compound_uri => compound_uri)
- return cache.dataset_uri if cache
prediction_uri = @lazar.predict(compound_uri,true).uri
PredictionCache.create(:model_uri => @lazar.uri, :compound_uri => compound_uri, :dataset_uri => prediction_uri)
prediction_uri
@@ -71,10 +71,10 @@ post '/:id/?' do
end
elsif dataset_uri
- task_uri = OpenTox::Task.as_task("Predict dataset",url_for("/#{lazar.id}", :full)) do
- @lazar.predict(dataset_uri).uri
+ task = OpenTox::Task.create("Predict dataset",url_for("/#{@lazar.id}", :full)) do
+ @lazar.predict_dataset(dataset_uri).uri
end
- halt 202,task_uri
+ halt 202,task.uri
end
end