From 7f99548d0044b57556a7ec8727c19d878bbe9cd7 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Fri, 20 Aug 2010 10:35:46 +0200 Subject: api wrapper bumped to 1.6.4 --- application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application.rb') diff --git a/application.rb b/application.rb index 195dcaf..b892201 100644 --- a/application.rb +++ b/application.rb @@ -1,5 +1,5 @@ require 'rubygems' -gem "opentox-ruby-api-wrapper", "= 1.6.3" +gem "opentox-ruby-api-wrapper", "= 1.6.4" require 'opentox-ruby-api-wrapper' class Model -- cgit v1.2.3 From c499e94395f91aeb52ee36d755a4958a9b7942ae Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 25 Aug 2010 12:27:32 +0200 Subject: initial version for quantitative features --- application.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'application.rb') diff --git a/application.rb b/application.rb index b892201..0cec82a 100644 --- a/application.rb +++ b/application.rb @@ -23,6 +23,7 @@ end DataMapper.auto_upgrade! require 'lazar.rb' +require 'property_lazar.rb' helpers do -- cgit v1.2.3 From f4b6fcf2b50de0d11e3bcf7986ab9fba4e16208e Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 25 Aug 2010 12:56:05 +0200 Subject: opentox-api-wrapper bumped to 1.6.5 --- application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application.rb') diff --git a/application.rb b/application.rb index 0cec82a..3e80e8b 100644 --- a/application.rb +++ b/application.rb @@ -1,5 +1,5 @@ require 'rubygems' -gem "opentox-ruby-api-wrapper", "= 1.6.4" +gem "opentox-ruby-api-wrapper", "= 1.6.5" require 'opentox-ruby-api-wrapper' class Model -- cgit v1.2.3 From aa9fdad000d45e6ad0fb126704c51fb00c032ea4 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 25 Aug 2010 14:49:33 +0200 Subject: opentox-api-wrapper bumped to 1.6.6 --- application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application.rb') diff --git a/application.rb b/application.rb index 3e80e8b..d0d12af 100644 --- a/application.rb +++ b/application.rb @@ -1,5 +1,5 @@ require 'rubygems' -gem "opentox-ruby-api-wrapper", "= 1.6.5" +gem "opentox-ruby-api-wrapper", "= 1.6.6" require 'opentox-ruby-api-wrapper' class Model -- cgit v1.2.3 From 6d9653546115e73b732eaadfcb3d1dbe9ab7d99a Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Fri, 19 Nov 2010 14:42:29 +0100 Subject: lazar predictions and toxcreate are working --- application.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'application.rb') diff --git a/application.rb b/application.rb index d0d12af..94c6039 100644 --- a/application.rb +++ b/application.rb @@ -2,28 +2,28 @@ require 'rubygems' gem "opentox-ruby-api-wrapper", "= 1.6.6" require 'opentox-ruby-api-wrapper' -class Model +class ModelStore include DataMapper::Resource + attr_accessor :prediction_dataset property :id, Serial property :uri, String, :length => 255 - property :owl, Text, :length => 2**32-1 property :yaml, Text, :length => 2**32-1 property :created_at, DateTime end -class Prediction +class PredictionCache # cache predictions include DataMapper::Resource property :id, Serial property :compound_uri, String, :length => 255 property :model_uri, String, :length => 255 - property :yaml, Text, :length => 2**32-1 + property :dataset_uri, String, :length => 255 end DataMapper.auto_upgrade! require 'lazar.rb' -require 'property_lazar.rb' +#require 'property_lazar.rb' helpers do @@ -42,12 +42,12 @@ end get '/?' do # get index of models response['Content-Type'] = 'text/uri-list' - Model.all(params).collect{|m| m.uri}.join("\n") + "\n" + ModelStore.all(params).collect{|m| m.uri}.join("\n") + "\n" end delete '/:id/?' do begin - Model.get(params[:id]).destroy! + ModelStore.get(params[:id]).destroy! "Model #{params[:id]} deleted." rescue halt 404, "Model #{params[:id]} does not exist." @@ -57,8 +57,8 @@ end delete '/?' do # TODO delete datasets - Model.auto_migrate! - Prediction.auto_migrate! + ModelStore.auto_migrate! + #Prediction.auto_migrate! response['Content-Type'] = 'text/plain' "All models and cached predictions deleted." end -- cgit v1.2.3 From 61ba09a60cd00c8e8f54ba6766cabe56e658051e Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 24 Nov 2010 13:10:52 +0100 Subject: opentox-ruby-api-wrapper renamed to opentox-ruby --- application.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application.rb') diff --git a/application.rb b/application.rb index 94c6039..eb7db12 100644 --- a/application.rb +++ b/application.rb @@ -1,6 +1,6 @@ require 'rubygems' -gem "opentox-ruby-api-wrapper", "= 1.6.6" -require 'opentox-ruby-api-wrapper' +gem "opentox-ruby", "~> 0" +require 'opentox-ruby' class ModelStore include DataMapper::Resource -- cgit v1.2.3