summaryrefslogtreecommitdiff
path: root/application.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-08-22 11:12:47 +0000
committerChristoph Helma <helma@in-silico.ch>2011-08-22 11:12:47 +0000
commit28da7a09067ee75b07f7c11ab83b6d4d54048384 (patch)
tree7678aac801aa6b73723ba05c7bcc097546a91788 /application.rb
parent3b7a80f1af7e8b68f2f8bc9fd137ec9be5658c20 (diff)
parenta4b6e68acf76949a1765177b6d5b8c454990cb8a (diff)
Merge branch 'development' of github.com:opentox/toxcreate into development
Conflicts: application.rb
Diffstat (limited to 'application.rb')
-rw-r--r--application.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/application.rb b/application.rb
index 9eafcbe..eb86916 100644
--- a/application.rb
+++ b/application.rb
@@ -9,8 +9,9 @@ require 'ftools'
require File.join(File.dirname(__FILE__),'model.rb')
require File.join(File.dirname(__FILE__),'helper.rb')
-use Rack::Session::Cookie, :expire_after => 28800,
- :secret => "ui6vaiNi-change_me"
+#moved to wrapper->environment
+#use Rack::Session::Cookie, :expire_after => 28800,
+# :secret => "ui6vaiNi-change_me"
use Rack::Flash
set :lock, true
@@ -319,8 +320,7 @@ post '/models' do # create a new model
if validation.metadata[OT.classificationStatistics]
@model.update(:correct_predictions => validation.metadata[OT.classificationStatistics][OT.percentCorrect].to_f)
@model.update(:confusion_matrix => validation.confusion_matrix.to_yaml)
- #@model.update(:weighted_area_under_roc => validation.metadata[OT.classificationStatistics][OT.weightedAreaUnderRoc].to_f)
- @model.update(:weighted_area_under_roc => validation.metadata[OT.classificationStatistics][OT.averageAreaUnderRoc].to_f)
+ @model.update(:average_area_under_roc => validation.metadata[OT.classificationStatistics][OT.averageAreaUnderRoc].to_f)
validation.metadata[OT.classificationStatistics][OT.classValueStatistics].each do |m|
if m[OT.classValue] =~ TRUE_REGEXP
#HACK: estimate true feature value correctly