From 3e160e2e0537e2bfc0f8c89570349aa2718e34c2 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Wed, 8 Feb 2012 14:40:09 +0100 Subject: Fixed minor bugs --- application.rb | 3 ++- feature_selection.rb | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/application.rb b/application.rb index b62f6f5..f5b331f 100644 --- a/application.rb +++ b/application.rb @@ -11,6 +11,7 @@ require 'opentox-ruby' require 'openbabel.rb' require 'fminer.rb' require 'lazar.rb' +require 'feature_selection.rb' set :lock, true @@ -22,7 +23,7 @@ end # # @return [text/uri-list] algorithm URIs get '/?' do - list = [ url_for('/lazar', :full), url_for('/fminer/bbrc', :full), url_for('/fminer/last', :full) ].join("\n") + "\n" + list = [ url_for('/lazar', :full), url_for('/fminer/bbrc', :full), url_for('/fminer/last', :full), url_for('/feature_selection/rfe', :full) ].join("\n") + "\n" case request.env['HTTP_ACCEPT'] when /text\/html/ content_type "text/html" diff --git a/feature_selection.rb b/feature_selection.rb index c5bc4fa..efda812 100644 --- a/feature_selection.rb +++ b/feature_selection.rb @@ -71,11 +71,9 @@ post '/feature_selection/rfe/?' do task = OpenTox::Task.create("Recursive Feature Elimination", url_for('/feature_selection',:full)) do |task| r_result_file = OpenTox::Algorithm::FeatureSelection.rfe( { :ds_csv_file => tf_ds.path, :prediction_feature => prediction_feature, :fds_csv_file => tf_fds.path, :del_missing => del_missing } ) r_result_uri = OpenTox::Dataset.create_from_csv_file(r_result_file).uri - tf_ds.close! - tf_fds.close! + tf_ds.close!; tf_fds.close! + tf_ds.delete; tf_fds.delete File.unlink(r_result_file) - File.unlink(tf_ds.path) - File.unlink(tf_fds.path) r_result_uri end response['Content-Type'] = 'text/uri-list' -- cgit v1.2.3