Changeset 820 for trunk/yat/statistics

Timestamp:

Mar 17, 2007, 10:54:52 PM (17 years ago)

Author:

Peter

Message:

Changed name again. ROCScore is now called AUC. Also fixed several bugs and added test for these.

Location:

trunk/yat/statistics

Files:

• AUC.cc (moved) (moved from trunk/yat/statistics/ROCScore.cc) (5 diffs)
• AUC.h (moved) (moved from trunk/yat/statistics/ROCScore.h) (3 diffs)
• Makefile.am (modified) (2 diffs)

trunk/yat/statistics/AUC.cc

@@ -22 +22 @@
 */
 
-#include "ROCScore.h"
+#include "AUC.h"
 #include "yat/classifier/DataLookupWeighted1D.h"
 #include "yat/classifier/Target.h"
@@ -37 +37 @@
 namespace statistics {  
 
-  ROCScore::ROCScore(bool absolute)
+  AUC::AUC(bool absolute)
     : Score(absolute)
   {
   }
 
-  double ROCScore::score(const classifier::Target& target, 
-                         const utility::vector& value) const
+  double AUC::score(const classifier::Target& target, 
+                    const utility::vector& value) const
   {
     assert(target.size()==value.size());
@@ -57 +57 @@
 
 
-  double ROCScore::score(const classifier::Target& target, 
-                         const classifier::DataLookupWeighted1D& value) const
+  double AUC::score(const classifier::Target& target, 
+                    const classifier::DataLookupWeighted1D& value) const
   {
     assert(target.size()==value.size());
@@ -73 +73 @@
 
 
-  double ROCScore::score(const classifier::Target& target, 
-                         const utility::vector& value, 
-                         const utility::vector& weight) const
+  double AUC::score(const classifier::Target& target, 
+                    const utility::vector& value, 
+                    const utility::vector& weight) const
   {
     assert(target.size()==value.size());
@@ -90 +90 @@
 
 
-  double 
-  ROCScore::score(const MultiMap& m) const
+  double AUC::score(const MultiMap& m) const
   {
     double area=0;

trunk/yat/statistics/AUC.h

@@ -1 @@
-#ifndef _theplu_yat_statistics_roc_score_ 
-#define _theplu_yat_statistics_roc_score_ 
+#ifndef _theplu_yat_statistics_auc_ 
+#define _theplu_yat_statistics_auc_ 
 
 // $Id$
@@ -42 +42 @@
 
   ///
-  /// @brief Class for Reciever Operating Characteristic. 
+  /// @brief Class calculating Area Under ROC Curve
   ///   
-  class ROCScore : public Score
+  class AUC : public Score
   {
   
@@ -51 +51 @@
     ///
     ///
-    ROCScore(bool absolute=true);
+    AUC(bool absolute=true);
 
     /// Function taking \a value, \a target (+1 or -1) and vector

trunk/yat/statistics/Makefile.am

@@ -24 +24 @@
 
 noinst_LTLIBRARIES = libstatistics.la
-libstatistics_la_SOURCES = Averager.cc AveragerPair.cc      \
+libstatistics_la_SOURCES = AUC.cc Averager.cc AveragerPair.cc     \
   AveragerWeighted.cc AveragerPairWeighted.cc Distance.cc   \
   Euclidean.cc Fisher.cc FoldChange.cc Histogram.cc Pearson.cc      \
-  PearsonCorrelation.cc PearsonDistance.cc ROC.cc ROCScore.cc \
+  PearsonCorrelation.cc PearsonDistance.cc ROC.cc \
   SAMScore.cc Score.cc SNR.cc tScore.cc tTest.cc \
   utility.cc WilcoxonFoldChange.cc
@@ -33 +33 @@
 include_statisticsdir = $(includedir)/yat/statistics
 
-include_statistics_HEADERS = Averager.h AveragerPair.h      \
+include_statistics_HEADERS = AUC.h Averager.h AveragerPair.h      \
   AveragerWeighted.h AveragerPairWeighted.h Distance.h Euclidean.h \
   Fisher.h  \
   FoldChange.h Histogram.h Pearson.h PearsonCorrelation.h \
-  PearsonDistance.h ROC.h ROCScore.h \
+  PearsonDistance.h ROC.h \
   SAMScore.h Score.h SNR.h tScore.h tTest.h \
   utility.h WilcoxonFoldChange.h