add ppv and npv to bar plot, remove debug output

2 files changed, 10 insertions, 4 deletions

diff --git a/lib/predictions.rb b/lib/predictions.rb
index 2e90885..6c0e996 100755
--- a/lib/predictions.rb
+++ b/lib/predictions.rb
@@ -276,7 +276,7 @@ module Lib
           end
         end
       end
-      puts tp_conf.inspect+"\n"+fp_conf.inspect+"\n\n"
+      #puts tp_conf.inspect+"\n"+fp_conf.inspect+"\n\n"
       
       return 0.0 if tp_conf.size == 0
       return 1.0 if fp_conf.size == 0
diff --git a/report/report_factory.rb b/report/report_factory.rb
index f6f76bd..9995b42 100755
--- a/report/report_factory.rb
+++ b/report/report_factory.rb
@@ -13,11 +13,11 @@ VAL_ATTR_REGR = [ :num_instances, :num_unpredicted, :root_mean_squared_error,
 
 #VAL_ATTR_BAR_PLOT_CLASS = [ :accuracy, :average_area_under_roc, 
 #  :area_under_roc, :f_measure, :true_positive_rate, :true_negative_rate ]
-VAL_ATTR_BAR_PLOT_CLASS = [ :accuracy, :f_measure, :true_positive_rate, :true_negative_rate ]
+VAL_ATTR_BAR_PLOT_CLASS = [ :accuracy, :f_measure, :true_positive_rate, :true_negative_rate, :positive_predictive_value, :negative_predictive_value ]
 VAL_ATTR_BAR_PLOT_REGR = [ :root_mean_squared_error, :mean_absolute_error, :r_square ]
 
-VAL_ATTR_TTEST_REGR = [:r_square, :root_mean_squared_error]
-VAL_ATTR_TTEST_CLASS = [:percent_correct, :average_area_under_roc]
+VAL_ATTR_TTEST_REGR = [ :r_square, :root_mean_squared_error ]
+VAL_ATTR_TTEST_CLASS = [ :accuracy, :average_area_under_roc ]
 
 
 # = Reports::ReportFactory 
@@ -240,6 +240,12 @@ module Reports::ReportFactory
     if params[:ttest_significance]
       ttest_significance = params[:ttest_significance].to_f
     end
+    
+    bar_plot_attributes += ttest_attributes
+    bar_plot_attributes.uniq!
+    
+    result_attributes += ttest_attributes
+    result_attributes.uniq!
       
     dataset_grouping.each do |validations|