adding weighted_accuracy, change accuracy computation, some minor changes

2 files changed, 1 insertions, 2 deletions

diff --git a/report/report_factory.rb b/report/report_factory.rb
index a5234a3..8fa185e 100755
--- a/report/report_factory.rb
+++ b/report/report_factory.rb
@@ -5,7 +5,7 @@ VAL_ATTR_TRAIN_TEST = [ :model_uri, :training_dataset_uri, :test_dataset_uri, :p
 VAL_ATTR_CV = [ :algorithm_uri, :dataset_uri, :num_folds, :crossvalidation_fold ]
 
 # selected attributes of interest when performing classification
-VAL_ATTR_CLASS = [ :percent_correct, :weighted_area_under_roc, 
+VAL_ATTR_CLASS = [ :accuracy, :weighted_accuracy, :weighted_area_under_roc, 
   :area_under_roc, :f_measure, :true_positive_rate, :true_negative_rate ]
 VAL_ATTR_REGR = [ :root_mean_squared_error, :mean_absolute_error, :r_square ]
 
diff --git a/report/validation_access.rb b/report/validation_access.rb
index 9c45165..03ec0e5 100755
--- a/report/validation_access.rb
+++ b/report/validation_access.rb
@@ -125,7 +125,6 @@ class Reports::ValidationDB < Reports::ValidationAccess
   end
   
   def feature_type( validation, subjectid=nil )
-    raise "subjectid is nil" unless subjectid
     OpenTox::Model::Generic.new(validation.model_uri).feature_type(subjectid)
     #get_model(validation).classification?
   end