diff options
author | Christoph Helma <helma@in-silico.ch> | 2010-12-16 17:01:57 +0100 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2010-12-16 17:01:57 +0100 |
commit | 0468af7ef5a0bc00c0fb83bd71e0d6287671d465 (patch) | |
tree | 648f807adf0f64ca13d6ca407b606acd54118c78 | |
parent | cce6c302185dff3289a69d0de41c858a541ce245 (diff) | |
parent | 709768fcda9e9090442f7cda4120e18e21cadc2e (diff) |
Merge branch 'development' of https://github.com/rautenberg/opentox-algorithm into development
-rw-r--r-- | fminer.rb | 16 | ||||
-rw-r--r-- | lazar.rb | 8 |
2 files changed, 12 insertions, 12 deletions
@@ -95,9 +95,9 @@ 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.save + subjectid = params[:subjectid] if params[:subjectid] + subjectid = CGI.unescape(request.env["HTTP_SUBJECTID"]) if !subjectid and request.env["HTTP_SUBJECTID"] + feature_dataset.save(subjectid) id = 1 # fminer start id is not 0 compounds = [] @@ -204,7 +204,7 @@ post '/fminer/bbrc/?' do ids.each { |id| feature_dataset.add(compounds[id], feature_uri, true)} end end - feature_dataset.save + feature_dataset.save(subjectid) feature_dataset.uri end response['Content-Type'] = 'text/uri-list' @@ -252,9 +252,9 @@ 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 + subjectid = params[:subjectid] if params[:subjectid] + subjectid = CGI.unescape(request.env["HTTP_SUBJECTID"]) if !subjectid and request.env["HTTP_SUBJECTID"] + feature_dataset.save(subjectid) id = 1 # fminer start id is not 0 compounds = [] @@ -350,7 +350,7 @@ post '/fminer/last/?' do end ids.each { |id| feature_dataset.add(compounds[id], feature_uri, true)} end - feature_dataset.save + feature_dataset.save(subjectid) feature_dataset.uri end response['Content-Type'] = 'text/uri-list' @@ -50,8 +50,8 @@ post '/lazar/?' do task = OpenTox::Task.create("Create lazar model",url_for('/lazar',:full)) do |task| lazar = OpenTox::Model::Lazar.new - lazar.token_id = params[:token_id] if params[:token_id] - lazar.token_id = request.env["HTTP_TOKEN_ID"] if !lazar.token_id and request.env["HTTP_TOKEN_ID"] + subjectid = params[:subjectid] if params[:subjectid] + subjectid = request.env["HTTP_SUBJECTID"] if !subjectid and request.env["HTTP_SUBJECTID"] lazar.min_sim = params[:min_sim] if params[:min_sim] if params[:feature_dataset_uri] @@ -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, lazar.token_id) + training_features = OpenTox::Dataset.new(feature_dataset_uri) end training_features.load_all @@ -140,7 +140,7 @@ post '/lazar/?' do {DC.title => "feature_generation_uri", OT.paramValue => feature_generation_uri} ] - model_uri = lazar.save + model_uri = lazar.save(subjectid) LOGGER.info model_uri + " created #{Time.now}" model_uri end |