diff options
author | mr <mr@mrautenberg.de> | 2010-12-09 11:02:49 +0100 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2010-12-09 11:02:49 +0100 |
commit | 0ff6a589e691b88a46566fafadee5e4ff4c53bb6 (patch) | |
tree | db72aba5ad35419d2b1dc6d4192b3dad68964426 | |
parent | e8b3984c34a193c0106d8e787c1bef0d3245cd43 (diff) |
A&A implementation
-rw-r--r-- | fminer.rb | 11 | ||||
-rw-r--r-- | lazar.rb | 2 |
2 files changed, 8 insertions, 5 deletions
@@ -9,8 +9,8 @@ ENV['FMINER_PVALUES'] = 'true' # # @return [text/uri-list] URIs of fminer algorithms get '/fminer/?' do - response['Content-Type'] = 'text/uri-list' - [ url_for('/fminer/bbrc', :full), url_for('/fminer/last', :full) ].join("\n") + "\n" + response['Content-Type'] = 'text/uri-list' + [ url_for('/fminer/bbrc', :full), url_for('/fminer/last', :full) ].join("\n") + "\n" end # Get RDF/XML representation of fminer bbrc algorithm @@ -95,8 +95,8 @@ post '/fminer/bbrc/?' do { DC.title => "prediction_feature", OT.paramValue => params[:prediction_feature] } ] }) - feature_dataset.token_id = params[:token_id] if params[:token_id] - feature_dataset.token_id = CGI.unescape(request.env["HTTP_TOKEN_ID"]) if !feature_dataset.token_id and request.env["HTTP_TOKEN_ID"] + feature_dataset.token_id = params[:token_id] if params[:token_id] + feature_dataset.token_id = CGI.unescape(request.env["HTTP_TOKEN_ID"]) if !feature_dataset.token_id and request.env["HTTP_TOKEN_ID"] feature_dataset.save id = 1 # fminer start id is not 0 @@ -236,6 +236,7 @@ post '/fminer/last/?' do prediction_feature = params[:prediction_feature] training_dataset = OpenTox::Dataset.new "#{params[:dataset_uri]}" + training_dataset.load_all halt 404, "No feature #{params[:prediction_feature]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:prediction_feature]) @@ -251,6 +252,8 @@ post '/fminer/last/?' do { DC.title => "prediction_feature", OT.paramValue => params[:prediction_feature] } ] }) + feature_dataset.token_id = params[:token_id] if params[:token_id] + feature_dataset.token_id = CGI.unescape(request.env["HTTP_TOKEN_ID"]) if !feature_dataset.token_id and request.env["HTTP_TOKEN_ID"] feature_dataset.save id = 1 # fminer start id is not 0 @@ -71,7 +71,7 @@ post '/lazar/?' do halt 404, "External feature generation services not yet supported" end feature_dataset_uri = OpenTox::Algorithm::Generic.new(feature_generation_uri).run(params).to_s - training_features = OpenTox::Dataset.new(feature_dataset_uri) + training_features = OpenTox::Dataset.new(feature_dataset_uri, lazar.token_id) end training_features.load_all |