diff options
Diffstat (limited to 'lib/model.rb')
| -rw-r--r-- | lib/model.rb | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/lib/model.rb b/lib/model.rb index 7a2fb47..52553fa 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -6,7 +6,7 @@ get "/model/?" do models = Model::Validation.all case @accept when "text/uri-list" - uri_list = models.collect{|model| uri("/model/#{model.model_id}")} + uri_list = models.collect{|model| uri("/model/#{model.id}")} return uri_list.join("\n") + "\n" when "application/json" models = JSON.parse models.to_json @@ -19,26 +19,16 @@ get "/model/?" do end get "/model/:id/?" do - model = Model::Lazar.find params[:id] + model = Model::Validation.find params[:id] not_found_error "Model with id: #{params[:id]} not found." unless model - model[:URI] = uri("/model/#{model.id}") - # model[:neighbor_algorithm_parameters][:feature_dataset_uri] = uri("/dataset/#{model[:neighbor_algorithm_parameters][:feature_dataset_id]}") if model[:neighbor_algorithm_parameters][:feature_dataset_id] - model[:training_dataset_uri] = uri("/dataset/#{model.training_dataset_id}") if model.training_dataset_id - model[:prediction_feature_uri] = uri("/dataset/#{model.prediction_feature_id}") if model.prediction_feature_id return model.to_json end post "/model/:id/?" do identifier = params[:identifier].split(",") - begin - # get compound from SMILES - compounds = identifier.collect{ |i| Compound.from_smiles i.strip } - rescue - @error_report = "Attention, '#{params[:identifier]}' is not a valid SMILES string." - return @error_report - end - model = Model::Lazar.find params[:id] + compounds = identifier.collect{ |i| Compound.from_smiles i.strip } + model = Model::Validation.find params[:id] batch = {} compounds.each do |compound| prediction = model.predict(compound) |