Changeset 781 for trunk


Ignore:
Timestamp:
Mar 5, 2007, 8:44:03 PM (16 years ago)
Author:
Peter
Message:

changing name to ROCScore and also added some cassert includes

Location:
trunk
Files:
18 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/test/consensus_inputranker_test.cc

    r779 r781  
    2323
    2424#include "yat/classifier/ConsensusInputRanker.h"
    25 #include "yat/statistics/ROCscore.h"
     25#include "yat/statistics/ROCScore.h"
    2626#include "yat/utility/matrix.h"
    2727#include "yat/classifier/MatrixLookup.h"
    … …  
    5959
    6060 
    61   theplu::yat::statistics::ROCscore roc;
     61  theplu::yat::statistics::ROCScore roc;
    6262  theplu::yat::classifier::CrossValidationSampler sampler(target,30,3);
    6363  *error << "Building Consensus_Inputranker" << std::endl;

  • trunk/test/crossvalidation_test.cc

    r704 r781  
    2828#include "yat/utility/matrix.h"
    2929
     30#include <cassert>
    3031#include <cstdlib>
    3132#include <fstream>

  • trunk/test/feature_selection_test.cc

    r779 r781  
    2424#include "yat/classifier/FeatureSelectorIR.h"
    2525#include "yat/classifier/FeatureSelectorRandom.h"
    26 #include "yat/statistics/ROCscore.h"
     26#include "yat/statistics/ROCScore.h"
    2727
    2828#include <fstream>
    … …  
    4545  bool ok = true;
    4646
    47   statistics::ROCscore roc;
     47  statistics::ROCScore roc;
    4848  classifier::FeatureSelectorIR f(roc, 12);
    4949  classifier::FeatureSelectorRandom f2(12);

  • trunk/test/inputranker_test.cc

    r779 r781  
    2323
    2424#include "yat/classifier/InputRanker.h"
    25 #include "yat/statistics/ROCscore.h"
     25#include "yat/statistics/ROCScore.h"
    2626#include "yat/utility/matrix.h"
    2727#include "yat/classifier/MatrixLookup.h"
    … …  
    5757  is.close();
    5858
    59   statistics::ROCscore roc;
     59  statistics::ROCScore roc;
    6060  classifier::InputRanker ir(data,target,roc);
    6161  if (ir.id()[0]!=2 || ir.id()[1]!=0 || ir.id()[2]!=1){

  • trunk/test/kernel_test.cc

    r680 r781  
    3030#include "yat/classifier/Kernel_SEV.h"
    3131
     32#include <cassert>
    3233#include <cmath>
    3334#include <cstdlib>

  • trunk/test/score_test.cc

    r779 r781  
    2525#include "yat/statistics/FoldChange.h"
    2626#include "yat/statistics/Pearson.h"
    27 #include "yat/statistics/ROCscore.h"
     27#include "yat/statistics/ROCScore.h"
    2828#include "yat/statistics/SAMScore.h"
    2929#include "yat/statistics/tScore.h"
    … …  
    5252  bool ok = true;
    5353
    54   *error << "testing ROCscore" << std::endl;
     54  *error << "testing ROCScore" << std::endl;
    5555  utility::vector value(31);
    5656  std::vector<std::string> label(31,"negative");
    … …  
    6060  for (size_t i=0; i<value.size(); i++)
    6161    value(i)=i;
    62   statistics::ROCscore roc;
     62  statistics::ROCScore roc;
    6363  double area = roc.score(target, value);
    6464  if (area!=1.0){

  • trunk/test/subset_generator_test.cc

    r779 r781  
    3232#include "yat/classifier/SVM.h"
    3333#include "yat/classifier/NCC.h"
    34 #include "yat/statistics/ROCscore.h"
     34#include "yat/statistics/ROCScore.h"
    3535#include "yat/statistics/PearsonDistance.h"
    3636#include "yat/utility/matrix.h"
    3737
     38#include <cassert>
    3839#include <fstream>
    3940#include <iostream>
    … …  
    7879  classifier::CrossValidationSampler sampler(target, 30, 3);
    7980
    80   statistics::ROCscore score;
     81  statistics::ROCScore score;
    8182  classifier::FeatureSelectorIR fs(score, 96, 0);
    8283  *error << "building SubsetGenerator" << std::endl;
    … …  
    9596  utility::vector out(target.size(),0);
    9697  for (size_t i = 0; i<out.size(); ++i)
    97     out(i)=ensemble_svm.validate()[0][i].mean();
    98   statistics::ROCscore roc;
     98    out(i)=ensemble_svm.validate()[0][i].mean(); 
     99  statistics::ROCScore roc;
    99100  *error << roc.score(target,out) << std::endl;
    100101

  • trunk/yat/classifier/FeatureSelectorIR.cc

    r747 r781  
    2929
    3030#include <algorithm>
     31#include <cassert>
    3132
    3233namespace theplu {

  • trunk/yat/classifier/FeatureSelectorRandom.cc

    r680 r781  
    2929
    3030#include <algorithm>
     31#include <cassert>
    3132
    3233namespace theplu {

  • trunk/yat/classifier/GaussianKernelFunction.cc

    r680 r781  
    2727#include "DataLookupWeighted1D.h"
    2828
     29#include <cassert>
    2930#include <math.h>
    3031

  • trunk/yat/classifier/InputRanker.cc

    r779 r781  
    3131#include "yat/utility/stl_utility.h"
    3232
     33#include <cassert>
    3334#include <cmath>
    3435#include <functional>

  • trunk/yat/classifier/MatrixLookup.cc

    r720 r781  
    2929#endif
    3030
     31#include <cassert>
    3132#include <fstream>
    3233

  • trunk/yat/classifier/MatrixLookupWeighted.cc

    r774 r781  
    2929#endif
    3030
     31#include <cassert>
    3132#include <fstream>
    3233

  • trunk/yat/classifier/PolynomialKernelFunction.cc

    r680 r781  
    2727#include "yat/statistics/AveragerPairWeighted.h"
    2828
     29#include <cassert>
    2930#include <cmath>
    3031

  • trunk/yat/statistics/AveragerPairWeighted.cc

    r772 r781  
    2727#include "yat/classifier/DataLookup1D.h"
    2828#include "yat/classifier/DataLookupWeighted1D.h"
     29
     30#include <cassert>
    2931
    3032namespace theplu {

  • trunk/yat/statistics/Makefile.am

    r779 r781  
    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 ROCScore.cc \
    3030  SAMScore.cc Score.cc SNR.cc tScore.cc tTest.cc \
    3131  utility.cc WilcoxonFoldChange.cc
    … …  
    3737  Fisher.h  \
    3838  FoldChange.h Histogram.h Pearson.h PearsonCorrelation.h \
    39   PearsonDistance.h ROC.h ROCscore.h \
     39  PearsonDistance.h ROC.h ROCScore.h \
    4040  SAMScore.h Score.h SNR.h tScore.h tTest.h \
    4141  utility.h WilcoxonFoldChange.h

  • trunk/yat/statistics/ROC.cc

    r779 r781  
    3030#include <gsl/gsl_cdf.h>
    3131
     32#include <cassert>
    3233#include <cmath>
    3334#include <utility>

  • trunk/yat/statistics/ROCScore.cc

    r779 r781  
    2222*/
    2323
    24 #include "ROCscore.h"
     24#include "ROCScore.h"
    2525#include "yat/classifier/DataLookupWeighted1D.h"
    2626#include "yat/classifier/Target.h"
    … …  
    3737namespace statistics { 
    3838
    39   ROCscore::ROCscore(bool absolute)
     39  ROCScore::ROCScore(bool absolute)
    4040    : Score(absolute)
    4141  {
    4242  }
    4343
    44   double ROCscore::score(const classifier::Target& target,
     44  double ROCScore::score(const classifier::Target& target,
    4545                         const utility::vector& value) const
    4646  {
    … …  
    5757
    5858
    59   double ROCscore::score(const classifier::Target& target,
     59  double ROCScore::score(const classifier::Target& target,
    6060                         const classifier::DataLookupWeighted1D& value) const
    6161  {
    … …  
    7373
    7474
    75   double ROCscore::score(const classifier::Target& target,
     75  double ROCScore::score(const classifier::Target& target,
    7676                         const utility::vector& value,
    7777                         const utility::vector& weight) const
    … …  
    9191
    9292  double
    93   ROCscore::score(const MultiMap& m) const
     93  ROCScore::score(const MultiMap& m) const
    9494  {
    9595    double area=0;

  • trunk/yat/statistics/ROCScore.h

    r779 r781  
    4444  /// @brief Class for Reciever Operating Characteristic.
    4545  ///   
    46   class ROCscore : public Score
     46  class ROCScore : public Score
    4747  {
    4848 
    … …  
    5151    ///
    5252    ///
    53     ROCscore(bool absolute=true);
     53    ROCScore(bool absolute=true);
    5454
    5555    /// Function taking \a value, \a target (+1 or -1) and vector

  • trunk/yat/statistics/SNR.cc

    r779 r781  
    2828#include "yat/classifier/Target.h"
    2929#include "yat/utility/vector.h"
     30
     31#include <cassert>
    3032
    3133namespace theplu {
Note: See TracChangeset for help on using the changeset viewer.