Changeset 820 for trunk/yat/statistics


Ignore:
Timestamp:
Mar 17, 2007, 10:54:52 PM (15 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:
1 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/yat/statistics/AUC.cc

    r810 r820  
    2222*/
    2323
    24 #include "ROCScore.h"
     24#include "AUC.h"
    2525#include "yat/classifier/DataLookupWeighted1D.h"
    2626#include "yat/classifier/Target.h"
     
    3737namespace statistics { 
    3838
    39   ROCScore::ROCScore(bool absolute)
     39  AUC::AUC(bool absolute)
    4040    : Score(absolute)
    4141  {
    4242  }
    4343
    44   double ROCScore::score(const classifier::Target& target,
    45                          const utility::vector& value) const
     44  double AUC::score(const classifier::Target& target,
     45                    const utility::vector& value) const
    4646  {
    4747    assert(target.size()==value.size());
     
    5757
    5858
    59   double ROCScore::score(const classifier::Target& target,
    60                          const classifier::DataLookupWeighted1D& value) const
     59  double AUC::score(const classifier::Target& target,
     60                    const classifier::DataLookupWeighted1D& value) const
    6161  {
    6262    assert(target.size()==value.size());
     
    7373
    7474
    75   double ROCScore::score(const classifier::Target& target,
    76                          const utility::vector& value,
    77                          const utility::vector& weight) const
     75  double AUC::score(const classifier::Target& target,
     76                    const utility::vector& value,
     77                    const utility::vector& weight) const
    7878  {
    7979    assert(target.size()==value.size());
     
    9090
    9191
    92   double
    93   ROCScore::score(const MultiMap& m) const
     92  double AUC::score(const MultiMap& m) const
    9493  {
    9594    double area=0;
  • trunk/yat/statistics/AUC.h

    r810 r820  
    1 #ifndef _theplu_yat_statistics_roc_score_
    2 #define _theplu_yat_statistics_roc_score_
     1#ifndef _theplu_yat_statistics_auc_
     2#define _theplu_yat_statistics_auc_
    33
    44// $Id$
     
    4242
    4343  ///
    44   /// @brief Class for Reciever Operating Characteristic.
     44  /// @brief Class calculating Area Under ROC Curve
    4545  ///   
    46   class ROCScore : public Score
     46  class AUC : public Score
    4747  {
    4848 
     
    5151    ///
    5252    ///
    53     ROCScore(bool absolute=true);
     53    AUC(bool absolute=true);
    5454
    5555    /// Function taking \a value, \a target (+1 or -1) and vector
  • trunk/yat/statistics/Makefile.am

    r781 r820  
    2424
    2525noinst_LTLIBRARIES = libstatistics.la
    26 libstatistics_la_SOURCES = Averager.cc AveragerPair.cc      \
     26libstatistics_la_SOURCES = AUC.cc Averager.cc AveragerPair.cc     \
    2727  AveragerWeighted.cc AveragerPairWeighted.cc Distance.cc   \
    2828  Euclidean.cc Fisher.cc FoldChange.cc Histogram.cc Pearson.cc      \
    29   PearsonCorrelation.cc PearsonDistance.cc ROC.cc ROCScore.cc \
     29  PearsonCorrelation.cc PearsonDistance.cc ROC.cc \
    3030  SAMScore.cc Score.cc SNR.cc tScore.cc tTest.cc \
    3131  utility.cc WilcoxonFoldChange.cc
     
    3333include_statisticsdir = $(includedir)/yat/statistics
    3434
    35 include_statistics_HEADERS = Averager.h AveragerPair.h      \
     35include_statistics_HEADERS = AUC.h Averager.h AveragerPair.h      \
    3636  AveragerWeighted.h AveragerPairWeighted.h Distance.h Euclidean.h \
    3737  Fisher.h  \
    3838  FoldChange.h Histogram.h Pearson.h PearsonCorrelation.h \
    39   PearsonDistance.h ROC.h ROCScore.h \
     39  PearsonDistance.h ROC.h \
    4040  SAMScore.h Score.h SNR.h tScore.h tTest.h \
    4141  utility.h WilcoxonFoldChange.h
Note: See TracChangeset for help on using the changeset viewer.