From 61475e273035cb1128033d57ff464a00585281f2 Mon Sep 17 00:00:00 2001 From: mguetlein Date: Fri, 14 May 2010 11:25:03 +0200 Subject: remove ambit hack, add accept-header for model prediction --- lib/model.rb | 8 +------- lib/owl.rb | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/model.rb b/lib/model.rb index 8c4614f..9573450 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -44,12 +44,6 @@ module OpenTox def self.build( algorithm_uri, algorithm_params ) - if algorithm_uri =~ /ambit2/ - LOGGER.warn "Ambit hack, replacing 'prediction_feature' with 'target'" - algorithm_params[:target] = algorithm_params[:prediction_feature] - algorithm_params.delete(:prediction_feature) - end - LOGGER.debug "Build model, algorithm_uri:"+algorithm_uri.to_s+", algorithm_parms: "+algorithm_params.inspect.to_s uri = OpenTox::RestClientWrapper.post(algorithm_uri,algorithm_params).to_s LOGGER.debug "Build model done: "+uri.to_s @@ -60,7 +54,7 @@ module OpenTox def predict_dataset( dataset_uri ) LOGGER.debug "Predict dataset: "+dataset_uri.to_s+" with model "+@uri.to_s - uri = RestClientWrapper.post(@uri, {:dataset_uri=>dataset_uri}) + uri = RestClientWrapper.post(@uri, {:accept => "text/uri-list", :dataset_uri=>dataset_uri}) RestClientWrapper.raise_uri_error("Prediciton result no dataset uri: "+uri.to_s, @uri, {:dataset_uri=>dataset_uri} ) unless Utils.dataset_uri?(uri) uri end diff --git a/lib/owl.rb b/lib/owl.rb index e9ddcbf..d58c8c3 100644 --- a/lib/owl.rb +++ b/lib/owl.rb @@ -362,7 +362,7 @@ module OpenTox "date" => DC["date"], "format" => DC["format"]} - # this method has to purposes: + # this method has two purposes: # * distinguishing ot-properties from dc- and rdf- properties # * caching nodes, as creating nodes is costly def node(name) -- cgit v1.2.3