Changeset 680 for trunk/yat/statistics


Ignore:
Timestamp:
Oct 11, 2006, 7:49:03 PM (15 years ago)
Author:
Jari Häkkinen
Message:

Addresses #153. Introduced yat namespace. Removed alignment namespace. Clean up of code.

Location:
trunk/yat/statistics
Files:
1 deleted
61 edited

Legend:

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

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/Averager.h"
     24#include "Averager.h"
    2525
    2626namespace theplu {
    27 namespace statistics{
    28  
     27namespace yat {
     28namespace statistics {
     29
    2930  Averager::Averager(void)
    3031    : n_(0), x_(0), xx_(0)
     
    3637  {
    3738  }
    38  
     39
    3940  Averager::Averager(const Averager& a)
    4041    : n_(a.n_), x_(a.x_), xx_(a.xx_)
    4142  {
    4243  }
    43  
     44
    4445  const Averager& Averager::operator+=(const Averager& a)
    4546  {
     
    5051  }
    5152
    52 
    53 }} // of namespace statistics and namespace theplu
     53}}} // of namespace statistics, yat, and theplu
  • trunk/yat/statistics/Averager.h

    r675 r680  
    1 #ifndef _theplu_statistics_averager_
    2 #define _theplu_statistics_averager_
     1#ifndef _theplu_yat_statistics_averager_
     2#define _theplu_yat_statistics_averager_
    33
    44// $Id$
     
    2929
    3030namespace theplu{
     31namespace yat{
     32namespace statistics{
    3133
    32 namespace statistics{
    3334  class ostream;
    3435
     
    193194  }
    194195
    195 
    196 }} // of namespace statistics and namespace theplu
     196}}} // of namespace statistics, yat, and theplu
    197197
    198198#endif
  • trunk/yat/statistics/AveragerPair.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/AveragerPair.h"
    25 #include "yat/statistics/Averager.h"
     24#include "AveragerPair.h"
     25#include "Averager.h"
    2626
    2727#include <cassert>
     
    2929
    3030namespace theplu {
     31namespace yat {
    3132namespace statistics{
    3233 
    33 
    3434  const AveragerPair& AveragerPair::operator+=(const AveragerPair& a)
    3535  {
     
    3939    return *this;
    4040  }
    41  
    4241
    43 }} // of namespace statistics and namespace theplu
     42}}} // of namespace statistics, yat, and theplu
  • trunk/yat/statistics/AveragerPair.h

    r675 r680  
    1 #ifndef _theplu_statistics_averagerpair_
    2 #define _theplu_statistics_averagerpair_
     1#ifndef _theplu_yat_statistics_averagerpair_
     2#define _theplu_yat_statistics_averagerpair_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Averager.h"
     27#include "Averager.h"
    2828
    2929#include <cassert>
     
    3131#include <utility>
    3232
    33 
    3433namespace theplu{
     34namespace yat{
    3535namespace statistics{
    3636
     
    183183
    184184
    185 }} // of namespace statistics and namespace theplu
     185}}} // of namespace statistics, yat, and theplu
    186186
    187187#endif
  • trunk/yat/statistics/AveragerPairWeighted.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/AveragerPairWeighted.h"
    25 #include "yat/statistics/AveragerPair.h"
    26 #include "yat/statistics/Averager.h"
     24#include "AveragerPairWeighted.h"
     25#include "AveragerPair.h"
     26#include "Averager.h"
    2727#include "yat/classifier/DataLookup1D.h"
    2828#include "yat/classifier/DataLookupWeighted1D.h"
     
    3232
    3333namespace theplu {
    34 namespace statistics{
     34namespace yat {
     35namespace statistics {
    3536 
    3637
     
    6667  }
    6768
    68 }} // of namespace statistics and namespace theplu
     69}}} // of namespace statistics, yat, and theplu
  • trunk/yat/statistics/AveragerPairWeighted.h

    r675 r680  
    1 #ifndef _theplu_statistics_averager_pair_weighted_
    2 #define _theplu_statistics_averager_pair_weighted_
     1#ifndef _theplu_yat_statistics_averager_pair_weighted_
     2#define _theplu_yat_statistics_averager_pair_weighted_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/AveragerWeighted.h"
     27#include "AveragerWeighted.h"
    2828
    2929#include <cmath>
    3030
    31 
    3231namespace theplu{
     32namespace yat{
    3333namespace classifier{
    3434  class DataLookup1D;
     
    176176
    177177
    178 }} // of namespace statistics and namespace theplu
     178}}} // of namespace statistics, yat and theplu
    179179
    180180#endif
  • trunk/yat/statistics/AveragerWeighted.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/AveragerWeighted.h"
     24#include "AveragerWeighted.h"
    2525
    2626namespace theplu {
     27namespace yat {
    2728namespace statistics{
    2829 
     
    3536
    3637
    37 }} // of namespace statistics and namespace theplu
     38}}} // of namespace statistics, yat and theplu
  • trunk/yat/statistics/AveragerWeighted.h

    r675 r680  
    1 #ifndef _theplu_statistics_averager_weighted_
    2 #define _theplu_statistics_averager_weighted_
     1#ifndef _theplu_yat_statistics_averager_weighted_
     2#define _theplu_yat_statistics_averager_weighted_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Averager.h"
     27#include "Averager.h"
    2828
    2929#include <cmath>
    3030
    3131namespace theplu{
     32namespace yat{
    3233namespace statistics{
    3334
     
    243244///std::ostream& operator<<(std::ostream& s,const AveragerWeighted&);
    244245
    245 }} // of namespace statistics and namespace theplu
     246}}} // of namespace statistics, yat and theplu
    246247
    247248#endif
  • trunk/yat/statistics/Distance.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/Distance.h"
    25 
     24#include "Distance.h"
    2625#include "yat/classifier/DataLookup1D.h"
    2726#include "yat/classifier/utility.h"
     
    2928
    3029namespace theplu{
     30namespace yat{
    3131namespace statistics{
    3232
     
    5959
    6060
    61 }} // of namespace statistics and namespace theplu
     61}}} // of namespace statistics, yat and theplu
    6262
    6363
  • trunk/yat/statistics/Distance.h

    r675 r680  
    1 #ifndef _theplu_statistics_distance_
    2 #define _theplu_statistics_distance_
     1#ifndef _theplu_yat_statistics_distance_
     2#define _theplu_yat_statistics_distance_
    33
    44// $Id$
     
    2626
    2727namespace theplu{
     28namespace yat{
    2829
    2930  namespace utility {
     
    9495  };
    9596
    96 }} // of namespace statistics and namespace theplu
     97}}} // of namespace statistics, yat and theplu
    9798
    9899#endif
  • trunk/yat/statistics/Fisher.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/Fisher.h"
    25 #include "yat/statistics/Score.h"
    26 #include "yat/statistics/utility.h"
     24#include "Fisher.h"
     25#include "Score.h"
     26#include "utility.h"
    2727#include "yat/classifier/DataLookupWeighted1D.h"
    2828#include "yat/classifier/Target.h"
     
    3232
    3333namespace theplu {
     34namespace yat {
    3435namespace statistics {
    3536
     
    223224  }
    224225
    225 }} // of namespace statistics and namespace theplu
     226}}} // of namespace statistics, yat and theplu
  • trunk/yat/statistics/Fisher.h

    r675 r680  
    1 #ifndef _theplu_statistics_fisher_
    2 #define _theplu_statistics_fisher_
     1#ifndef _theplu_yat_statistics_fisher_
     2#define _theplu_yat_statistics_fisher_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Score.h"
     27#include "Score.h"
    2828#include "yat/utility/vector.h"
    2929
     
    3131
    3232namespace theplu {
     33namespace yat {
    3334namespace statistics { 
    3435  /**
     
    185186  };
    186187
    187 }} // of namespace statistics and namespace theplu
     188}}} // of namespace statistics, yat and theplu
    188189
    189190#endif
  • trunk/yat/statistics/FoldChange.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/FoldChange.h"
    25 #include "yat/statistics/Score.h"
    26 #include "yat/statistics/Averager.h"
    27 #include "yat/statistics/AveragerWeighted.h"
     24#include "FoldChange.h"
     25#include "Score.h"
     26#include "Averager.h"
     27#include "AveragerWeighted.h"
    2828#include "yat/classifier/DataLookupWeighted1D.h"
    2929#include "yat/classifier/Target.h"
    3030
    3131namespace theplu {
     32namespace yat {
    3233namespace statistics {
    3334
     
    109110  }
    110111
    111 } // of namespace statistics
    112 } // of namespace theplu
     112}}} // of namespace statistics, yat, and theplu
  • trunk/yat/statistics/FoldChange.h

    r675 r680  
    1 #ifndef _theplu_statistics_foldchange_
    2 #define _theplu_statistics_foldchange_
     1#ifndef _theplu_yat_statistics_foldchange_
     2#define _theplu_yat_statistics_foldchange_
    33
    44// $Id$
     
    2828
    2929namespace theplu {
     30namespace yat {
    3031
    3132  class utility::vector;
     
    9192  };
    9293
    93 } // of namespace statistics
    94 } // of namespace theplu
     94}}} // of namespace statistics, yat, and theplu
    9595
    9696#endif
  • trunk/yat/statistics/Histogram.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/Histogram.h"
     24#include "Histogram.h"
    2525
    2626#include <cmath>
    2727#include <fstream>
    2828
    29 
    3029namespace theplu {
     30namespace yat {
    3131namespace statistics {
    3232
     
    135135}
    136136
    137 }} // of namespace statistics and namespace theplu
     137}}} // of namespace statistics, yat, and theplu
  • trunk/yat/statistics/Histogram.h

    r675 r680  
    1 #ifndef _theplu_statistics_histogram_
    2 #define _theplu_statistics_histogram_
     1#ifndef _theplu_yat_statistics_histogram_
     2#define _theplu_yat_statistics_histogram_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/AveragerWeighted.h"
     27#include "AveragerWeighted.h"
    2828
    2929#include <string>
    3030#include <vector>
    3131
    32 
    3332namespace theplu {
     33namespace yat {
    3434namespace statistics {
    3535
     
    196196std::ostream& operator<<(std::ostream& s,const Histogram&);
    197197
    198 }} // of namespace statistics and namespace theplu
     198}}} // of namespace statistics, yat and theplu
    199199
    200200#endif
  • trunk/yat/statistics/Kernel.h

    r675 r680  
    1 #ifndef _theplu_statistics_kernel_
    2 #define _theplu_statistics_kernel_
     1#ifndef _theplu_yat_statistics_kernel_
     2#define _theplu_yat_statistics_kernel_
    33
    44// $Id$
     
    2626
    2727namespace theplu {
     28namespace yat {
    2829namespace statistics {
    29 namespace regression{
     30namespace regression {
    3031  ///
    3132  /// Abstract Base Class for calculating the weights in a more
     
    5051  };
    5152
    52 } // of namespace regression
    53 } // of namespace statistics
    54 } // of namespace theplu
     53}}}} // of namespaces regression, statisitcs, yat, and theplu
    5554
    5655#endif
  • trunk/yat/statistics/KernelBox.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/KernelBox.h"
    25 #include "yat/statistics/Kernel.h"
     24#include "KernelBox.h"
    2625
    2726namespace theplu {
     27namespace yat {
    2828namespace statistics {
    2929namespace regression {
     30
    3031  KernelBox::KernelBox(void)
    3132    : Kernel()
     
    4142  }
    4243
    43 } // of namespace regression
    44 } // of namespace statistics
    45 } // of namespace theplu
    46 
     44}}}} // of namespaces regression, statisitcs, yat, and theplu
  • trunk/yat/statistics/KernelBox.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_kernel_box_
    2 #define _theplu_statistics_regression_kernel_box_
     1#ifndef _theplu_yat_statistics_regression_kernel_box_
     2#define _theplu_yat_statistics_regression_kernel_box_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Kernel.h"
     27#include "Kernel.h"
    2828
    2929namespace theplu {
     30namespace yat {
    3031namespace statistics {
    3132namespace regression{
     
    5253  };
    5354
    54 } // of namespace regression
    55 } // of namespace statistics
    56 } // of namespace theplu
     55}}}} // of namespaces regression, statisitcs, yat, and theplu
    5756
    5857#endif
  • trunk/yat/statistics/KernelTriCube.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/KernelTriCube.h"
    25 #include "yat/statistics/Kernel.h"
     24#include "KernelTriCube.h"
     25#include "Kernel.h"
    2626
    2727#include <cmath>
    2828
    2929namespace theplu {
     30namespace yat {
    3031namespace statistics {
    3132namespace regression {
     
    4445  }
    4546
    46 } // of namespace regression
    47 } // of namespace statistics
    48 } // of namespace theplu
    49 
     47}}}} // of namespaces regression, statisitcs, yat, and theplu
  • trunk/yat/statistics/KernelTriCube.h

    r675 r680  
    1 #ifndef _theplu_statistics_kernel_tricube_
    2 #define _theplu_statistics_kernel_tricube_
     1#ifndef _theplu_yat_statistics_kernel_tricube_
     2#define _theplu_yat_statistics_kernel_tricube_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Kernel.h"
    28 
     27#include "Kernel.h"
    2928
    3029namespace theplu {
     30namespace yat {
    3131namespace statistics {
    3232namespace regression {
     
    5353  };
    5454
    55 } // of namespace regression
    56 } // of namespace statistics
    57 } // of namespace theplu
    58 
     55}}}} // of namespaces regression, statisitcs, yat, and theplu
    5956
    6057#endif
  • trunk/yat/statistics/Linear.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/Linear.h"
    25 
    26 #include "yat/statistics/AveragerPair.h"
     24#include "Linear.h"
     25#include "AveragerPair.h"
    2726#include "yat/utility/vector.h"
    2827
     
    3130
    3231namespace theplu {
     32namespace yat {
    3333namespace statistics {
    3434namespace regression {
     
    6868  }
    6969
    70 }}} // of namespaces regression, statisitcs and thep
     70}}}} // of namespaces regression, statisitcs, yat, and theplu
  • trunk/yat/statistics/Linear.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_linear_
    2 #define _theplu_statistics_regression_linear_
     1#ifndef _theplu_yat_statistics_regression_linear_
     2#define _theplu_yat_statistics_regression_linear_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/OneDimensional.h"
     27#include "OneDimensional.h"
    2828
    2929#include <cmath>
    3030
    3131namespace theplu {
     32namespace yat {
    3233  namespace utility {
    3334    class vector;
     
    121122  };
    122123
    123 }}} // of namespaces regression, statisitcs and thep
     124}}}} // of namespaces regression,, yat statisitcs thep
    124125
    125126#endif
  • trunk/yat/statistics/LinearWeighted.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/LinearWeighted.h"
    25 
    26 #include "yat/statistics/AveragerPairWeighted.h"
     24#include "LinearWeighted.h"
     25#include "AveragerPairWeighted.h"
    2726#include "yat/utility/vector.h"
    2827
    2928#include <gsl/gsl_fit.h>
    3029
    31 
    3230namespace theplu {
     31namespace yat {
    3332namespace statistics {
    3433namespace regression {
     
    6766
    6867
    69 }}} // of namespaces regression, statisitcs and thep
     68}}}} // of namespaces regression,, yat statisitcs thep
  • trunk/yat/statistics/LinearWeighted.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_linear_weighted_
    2 #define _theplu_statistics_regression_linear_weighted_
     1#ifndef _theplu_yat_statistics_regression_linear_weighted_
     2#define _theplu_yat_statistics_regression_linear_weighted_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/OneDimensionalWeighted.h"
     27#include "OneDimensionalWeighted.h"
    2828
    2929#include <cmath>
    3030
    3131namespace theplu {
     32namespace yat {
    3233  namespace utility {
    3334    class vector;
     
    129130  };
    130131
    131 }}} // of namespaces regression, statisitcs and thep
     132}}}} // of namespaces regression,, yat statisitcs thep
    132133
    133134#endif
  • trunk/yat/statistics/Local.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/Local.h"
    25 
     24#include "Local.h"
     25#include "Kernel.h"
     26#include "OneDimensionalWeighted.h"
    2627#include "yat/utility/vector.h"
    27 #include "yat/statistics/Kernel.h"
    28 #include "yat/statistics/OneDimensionalWeighted.h"
    2928
    3029#include <algorithm>
     
    3332
    3433namespace theplu {
     34namespace yat {
    3535namespace statistics {
    3636namespace regression {
     
    120120    return os;
    121121  }
    122 }}} // of namespaces regression, statisitcs and thep
     122}}}} // of namespaces regression,, yat statisitcs thep
  • trunk/yat/statistics/Local.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_local_
    2 #define _theplu_statistics_regression_local_
     1#ifndef _theplu_yat_statistics_regression_local_
     2#define _theplu_yat_statistics_regression_local_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Kernel.h"
    28 #include "yat/statistics/OneDimensionalWeighted.h"
     27#include "Kernel.h"
     28#include "OneDimensionalWeighted.h"
    2929#include "yat/utility/vector.h"
    3030
     
    3232
    3333namespace theplu {
     34namespace yat {
    3435namespace statistics {
    3536namespace regression {
     
    111112
    112113
    113 }}} // of namespaces regression, statistics and thep
     114}}}} // of namespaces regression,, yat statistics thep
    114115
    115116#endif
  • trunk/yat/statistics/Makefile.am

    r675 r680  
    2929  Distance.cc \
    3030  Fisher.cc FoldChange.cc \
    31   Histogram.cc Kernel.cc KernelBox.cc KernelTriCube.cc Linear.cc \
     31  Histogram.cc KernelBox.cc KernelTriCube.cc Linear.cc \
    3232  LinearWeighted.cc Local.cc \
    3333  MultiDimensional.cc \
  • trunk/yat/statistics/MultiDimensional.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/MultiDimensional.h"
     24#include "MultiDimensional.h"
    2525#include "yat/utility/matrix.h"
    2626#include "yat/utility/vector.h"
    2727
    2828namespace theplu {
     29namespace yat {
    2930namespace statistics {
    3031namespace regression {
     
    6768  }
    6869
    69 }}} // of namespaces regression, statisitcs and thep
     70}}}} // of namespaces regression,, yat statisitcs thep
  • trunk/yat/statistics/MultiDimensional.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_multidimensional_
    2 #define _theplu_statistics_regression_multidimensional_
     1#ifndef _theplu_yat_statistics_regression_multidimensional_
     2#define _theplu_yat_statistics_regression_multidimensional_
    33
    44// $Id$
     
    3030#include <gsl/gsl_multifit.h>
    3131
    32 
    3332namespace theplu {
     33namespace yat {
    3434namespace statistics {
    3535namespace regression {
     
    8888
    8989
    90 }}} // of namespaces regression, statisitcs and thep
     90}}}} // of namespaces regression,, yat statisitcs thep
    9191
    9292#endif
  • trunk/yat/statistics/MultiDimensionalWeighted.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/MultiDimensionalWeighted.h"
     24#include "MultiDimensionalWeighted.h"
    2525#include "yat/utility/matrix.h"
    2626#include "yat/utility/vector.h"
     
    2929
    3030namespace theplu {
     31namespace yat {
    3132namespace statistics {
    3233namespace regression {
     
    7475  }
    7576
    76 }}} // of namespaces regression, statisitcs and thep
     77}}}} // of namespaces regression,, yat statisitcs thep
  • trunk/yat/statistics/MultiDimensionalWeighted.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_multidimensional_weighted_
    2 #define _theplu_statistics_regression_multidimensional_weighted_
     1#ifndef _theplu_yat_statistics_regression_multidimensional_weighted_
     2#define _theplu_yat_statistics_regression_multidimensional_weighted_
    33
    44// $Id$
     
    3030#include <gsl/gsl_multifit.h>
    3131
    32 
    3332namespace theplu {
     33namespace yat {
    3434namespace statistics {
    3535namespace regression {
     
    8989
    9090
    91 }}} // of namespaces regression, statisitcs and thep
     91}}}} // of namespaces regression,, yat statisitcs thep
    9292
    9393#endif
  • trunk/yat/statistics/Naive.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/Naive.h"
    25 
    26 #include "yat/statistics/Averager.h"
    27 #include "yat/statistics/AveragerWeighted.h"
    28 #include "yat/statistics/OneDimensional.h"
     24#include "Naive.h"
     25#include "Averager.h"
     26#include "AveragerWeighted.h"
     27#include "OneDimensional.h"
    2928#include "yat/utility/vector.h"
    3029
     
    3231#include <iostream>
    3332
    34 
    3533namespace theplu {
     34namespace yat {
    3635namespace statistics {
    3736namespace regression {
     
    6160
    6261
    63 }}} // of namespaces regression, statisitcs and thep
     62}}}} // of namespaces regression,, yat statisitcs thep
  • trunk/yat/statistics/Naive.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_naive_
    2 #define _theplu_statistics_regression_naive_
     1#ifndef _theplu_yat_statistics_regression_naive_
     2#define _theplu_yat_statistics_regression_naive_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/OneDimensional.h"
     27#include "OneDimensional.h"
    2828
    2929#include <iostream>
     
    3131
    3232namespace theplu {
     33namespace yat {
    3334  namespace utility {
    3435    class vector;
     
    9394
    9495
    95 }}} // of namespaces regression, statisitcs and thep
     96}}}} // of namespaces regression,, yat statisitcs thep
    9697
    9798#endif
  • trunk/yat/statistics/NaiveWeighted.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/NaiveWeighted.h"
    25 
    26 #include "yat/statistics/AveragerWeighted.h"
    27 #include "yat/statistics/OneDimensional.h"
     24#include "NaiveWeighted.h"
     25#include "AveragerWeighted.h"
     26#include "OneDimensional.h"
    2827#include "yat/utility/vector.h"
    2928
    30 
    3129namespace theplu {
     30namespace yat {
    3231namespace statistics {
    3332namespace regression {
     
    4746
    4847
    49 }}} // of namespaces regression, statisitcs and thep
     48}}}} // of namespaces regression,, yat statisitcs thep
  • trunk/yat/statistics/NaiveWeighted.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_naive_weighted_
    2 #define _theplu_statistics_regression_naive_weighted_
     1#ifndef _theplu_yat_statistics_regression_naive_weighted_
     2#define _theplu_yat_statistics_regression_naive_weighted_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/OneDimensionalWeighted.h"
     27#include "OneDimensionalWeighted.h"
    2828
    2929#include <cmath>
     
    3131#include <utility>
    3232
    33 
    3433namespace theplu {
     34namespace yat {
    3535  namespace utility {
    3636    class vector;
     
    100100
    101101
    102 }}} // of namespaces regression, statisitcs and thep
     102}}}} // of namespaces regression,, yat statisitcs thep
    103103
    104104#endif
  • trunk/yat/statistics/OneDimensional.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/OneDimensional.h"
     24#include "OneDimensional.h"
    2525
    2626namespace theplu {
     27namespace yat {
    2728namespace statistics {
    2829namespace regression {
     
    4748  }
    4849
    49 }}} // of namespaces regression, statisitcs and thep
     50}}}} // of namespaces regression,, yat statisitcs thep
  • trunk/yat/statistics/OneDimensional.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_onedimensioanl_
    2 #define _theplu_statistics_regression_onedimensioanl_
     1#ifndef _theplu_yat_statistics_regression_onedimensioanl_
     2#define _theplu_yat_statistics_regression_onedimensioanl_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/AveragerPair.h"
     27#include "AveragerPair.h"
    2828
    2929#include <ostream>
    3030
    3131namespace theplu {
     32namespace yat {
    3233namespace utility {
    3334  class vector;
     
    9697  };
    9798
    98 }}} // of namespaces regression, statisitcs and thep
     99}}}} // of namespaces regression,, yat statisitcs thep
    99100
    100101#endif
  • trunk/yat/statistics/OneDimensionalWeighted.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_onedimensioanlweighted_
    2 #define _theplu_statistics_regression_onedimensioanlweighted_
     1#ifndef _theplu_yat_statistics_regression_onedimensioanlweighted_
     2#define _theplu_yat_statistics_regression_onedimensioanlweighted_
    33
    44// $Id$
     
    2828
    2929namespace theplu {
     30namespace yat {
    3031namespace utility {
    3132  class vector;
     
    8990  };
    9091
    91 }}} // of namespaces regression, statisitcs and thep
     92}}}} // of namespaces regression,, yat statisitcs thep
    9293
    9394#endif
  • trunk/yat/statistics/Pearson.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/Pearson.h"
    25 #include "yat/statistics/AveragerPair.h"
    26 #include "yat/statistics/AveragerPairWeighted.h"
     24#include "Pearson.h"
     25#include "AveragerPair.h"
     26#include "AveragerPairWeighted.h"
    2727#include "yat/utility/vector.h"
    2828#include "yat/classifier/DataLookupWeighted1D.h"
     
    3232#include <gsl/gsl_cdf.h>
    3333
    34 
    3534namespace theplu {
     35namespace yat {
    3636namespace statistics { 
    3737
     
    119119  }
    120120
    121 }} // of namespace statistics and namespace theplu
     121}}} // of namespace statistics, yat and theplu
  • trunk/yat/statistics/Pearson.h

    r675 r680  
    1 #ifndef _theplu_statistics_pearson_
    2 #define _theplu_statistics_pearson_
     1#ifndef _theplu_yat_statistics_pearson_
     2#define _theplu_yat_statistics_pearson_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Score.h"
     27#include "Score.h"
    2828
    2929namespace theplu {
     30namespace yat {
    3031namespace utility {
    3132  class vector;
     
    106107  };
    107108
    108 }} // of namespace statistics and namespace theplu
     109}}} // of namespace statistics, yat and theplu
    109110
    110111#endif
  • trunk/yat/statistics/PearsonDistance.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/PearsonDistance.h"
    25 
    26 #include "yat/statistics/AveragerPair.h"
    27 #include "yat/statistics/AveragerPairWeighted.h"
     24#include "PearsonDistance.h"
     25#include "AveragerPair.h"
     26#include "AveragerPairWeighted.h"
    2827#include "yat/utility/vector.h"
    2928
    3029namespace theplu{
     30namespace yat{
    3131namespace statistics{
    3232
     
    5353
    5454
    55 }} // of namespace statistics and namespace theplu
     55}}} // of namespace statistics, yat and theplu
    5656
    5757
  • trunk/yat/statistics/PearsonDistance.h

    r675 r680  
    1 #ifndef _theplu_statistics_pearson_distance_
    2 #define _theplu_statistics_pearson_distance_
     1#ifndef _theplu_yat_statistics_pearson_distance_
     2#define _theplu_yat_statistics_pearson_distance_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Distance.h"
     27#include "Distance.h"
    2828
    2929namespace theplu{
     30namespace yat{
    3031 
    3132  namespace utility {
     
    7273  };
    7374
    74 }} // of namespace statistics and namespace theplu
     75}}} // of namespace statistics, yat and theplu
    7576
    7677#endif
  • trunk/yat/statistics/Polynomial.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/Polynomial.h"
     24#include "Polynomial.h"
    2525#include "yat/utility/matrix.h"
    2626#include "yat/utility/vector.h"
    2727
    2828namespace theplu {
     29namespace yat {
    2930namespace statistics {
    3031namespace regression {
     
    6465  }
    6566
    66 }}} // of namespaces regression, statisitcs and thep
     67}}}} // of namespaces regression,, yat statisitcs thep
  • trunk/yat/statistics/Polynomial.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_polynomial_
    2 #define _theplu_statistics_regression_polynomial_
     1#ifndef _theplu_yat_statistics_regression_polynomial_
     2#define _theplu_yat_statistics_regression_polynomial_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/OneDimensional.h"
    28 #include "yat/statistics/MultiDimensional.h"
    29 
     27#include "OneDimensional.h"
     28#include "MultiDimensional.h"
    3029#include "yat/utility/vector.h"
    3130
     
    3433#include <cassert>
    3534
    36 
    3735namespace theplu {
     36namespace yat {
    3837namespace statistics {
    3938namespace regression {
     
    9089
    9190
    92 }}} // of namespaces regression, statisitcs and thep
     91}}}} // of namespaces regression,, yat statisitcs thep
    9392
    9493#endif
  • trunk/yat/statistics/PolynomialWeighted.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/PolynomialWeighted.h"
     24#include "PolynomialWeighted.h"
    2525#include "yat/utility/matrix.h"
    2626#include "yat/utility/vector.h"
     
    2929
    3030namespace theplu {
     31namespace yat {
    3132namespace statistics {
    3233namespace regression {
     
    7172  }
    7273
    73 }}} // of namespaces regression, statisitcs and thep
     74}}}} // of namespaces regression,, yat statisitcs thep
  • trunk/yat/statistics/PolynomialWeighted.h

    r675 r680  
    1 #ifndef _theplu_statistics_regression_polynomial_weighted_
    2 #define _theplu_statistics_regression_polynomial_weighted_
     1#ifndef _theplu_yat_statistics_regression_polynomial_weighted_
     2#define _theplu_yat_statistics_regression_polynomial_weighted_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/OneDimensionalWeighted.h"
    28 #include "yat/statistics/MultiDimensionalWeighted.h"
    29 
     27#include "OneDimensionalWeighted.h"
     28#include "MultiDimensionalWeighted.h"
    3029#include "yat/utility/vector.h"
    3130
    3231#include <cassert>
    3332
    34 
    3533namespace theplu {
     34namespace yat {
    3635namespace statistics {
    3736namespace regression {
     
    9392
    9493
    95 }}} // of namespaces regression, statisitcs and thep
     94}}}} // of namespaces regression,, yat statisitcs thep
    9695
    9796#endif
  • trunk/yat/statistics/ROC.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/ROC.h"
    25 
     24#include "ROC.h"
    2625#include "yat/classifier/DataLookupWeighted1D.h"
    2726#include "yat/utility/stl_utility.h"
     
    3433#include <vector>
    3534
    36 
    3735namespace theplu {
     36namespace yat {
    3837namespace statistics { 
    3938
     
    223222
    224223
    225 }} // of namespace statistics and namespace theplu
     224}}} // of namespace statistics, yat and theplu
  • trunk/yat/statistics/ROC.h

    r675 r680  
    1 #ifndef _theplu_statistics_roc_
    2 #define _theplu_statistics_roc_
     1#ifndef _theplu_yat_statistics_roc_
     2#define _theplu_yat_statistics_roc_
    33
    44// $Id$
     
    2525*/
    2626
     27#include "Score.h"
    2728#include "yat/classifier/Target.h"
    28 #include "yat/statistics/Score.h"
    2929
    3030#include <utility>
     
    3232
    3333namespace theplu {
     34namespace yat {
    3435  namespace utility {
    3536    class vector;
     
    164165
    165166
    166 }} // of namespace statistics and namespace theplu
     167}}} // of namespace statistics, yat and theplu
    167168
    168169#endif
  • trunk/yat/statistics/SAM.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/SAM.h"
    25 #include "yat/statistics/Averager.h"
    26 #include "yat/statistics/AveragerWeighted.h"
     24#include "SAM.h"
     25#include "Averager.h"
     26#include "AveragerWeighted.h"
    2727#include "yat/classifier/DataLookupWeighted1D.h"
    2828#include "yat/classifier/Target.h"
     
    3232
    3333namespace theplu {
     34namespace yat {
    3435namespace statistics { 
    3536
     
    113114
    114115
    115 }} // of namespace statistics and namespace theplu
     116}}} // of namespace statistics, yat and theplu
  • trunk/yat/statistics/SAM.h

    r675 r680  
    1 #ifndef _theplu_statistics_sam
    2 #define _theplu_statistics_sam
     1#ifndef _theplu_yat_statistics_sam
     2#define _theplu_yat_statistics_sam
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Score.h"
     27#include "Score.h"
    2828
    2929namespace theplu {
     30namespace yat {
    3031  namespace utility {
    3132    class vector;
     
    100101  };
    101102
    102 }} // of namespace statistics and namespace theplu
     103}}} // of namespace statistics, yat and theplu
    103104
    104105#endif
  • trunk/yat/statistics/SNR.cc

    r676 r680  
    2222*/
    2323
    24 #include "yat/statistics/SNR.h"
    25 #include "yat/statistics/Averager.h"
    26 #include "yat/statistics/AveragerWeighted.h"
     24#include "SNR.h"
     25#include "Averager.h"
     26#include "AveragerWeighted.h"
    2727#include "yat/classifier/DataLookupWeighted1D.h"
    2828#include "yat/classifier/Target.h"
    2929
    3030namespace theplu {
     31namespace yat {
    3132namespace statistics { 
    3233
     
    109110
    110111
    111 }} // of namespace statistics and namespace theplu
     112}}} // of namespace statistics, yat and theplu
  • trunk/yat/statistics/SNR.h

    r675 r680  
    1 #ifndef _theplu_statistics_snr
    2 #define _theplu_statistics_snr
     1#ifndef _theplu_yat_statistics_snr
     2#define _theplu_yat_statistics_snr
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Score.h"
     27#include "Score.h"
    2828
    2929#include <gsl/gsl_cdf.h>
    3030
    3131namespace theplu {
     32namespace yat {
    3233  namespace utility {
    3334    class vector;
     
    8283  };
    8384
    84 }} // of namespace statistics and namespace theplu
     85}}} // of namespace statistics, yat and theplu
    8586
    8687#endif
  • trunk/yat/statistics/Score.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/Score.h"
     24#include "Score.h"
    2525
    2626namespace theplu {
     27namespace yat {
    2728namespace statistics { 
    2829
     
    3233  }
    3334
    34 }} // of namespace statistics and namespace theplu
     35}}} // of namespace statistics, yat and theplu
  • trunk/yat/statistics/Score.h

    r675 r680  
    1 #ifndef _theplu_statistics_score_
    2 #define _theplu_statistics_score_
     1#ifndef _theplu_yat_statistics_score_
     2#define _theplu_yat_statistics_score_
    33
    44// $Id$
     
    3535
    3636namespace theplu {
     37namespace yat {
    3738namespace classifier {
    3839  class Target;
     
    150151  }; // class Score
    151152
    152 }} // of namespace statistics and namespace theplu
     153}}} // of namespace statistics, yat and theplu
    153154
    154155#endif
  • trunk/yat/statistics/WilcoxonFoldChange.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/WilcoxonFoldChange.h"
    25 #include "yat/statistics/utility.h"
     24#include "WilcoxonFoldChange.h"
     25#include "utility.h"
    2626#include "yat/classifier/Target.h"
    2727
     
    3131
    3232namespace theplu {
     33namespace yat {
    3334namespace statistics {
    3435
     
    3839  {
    3940  }
    40 
    4141
    4242
     
    7676  }
    7777
    78 } // of namespace statistics
    79 } // of namespace theplu
     78}}} // of namespace statistics, yat, and theplu
  • trunk/yat/statistics/WilcoxonFoldChange.h

    r675 r680  
    1 #ifndef _theplu_statistics_wilcoxonfoldchange_
    2 #define _theplu_statistics_wilcoxonfoldchange_
     1#ifndef _theplu_yat_statistics_wilcoxonfoldchange_
     2#define _theplu_yat_statistics_wilcoxonfoldchange_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Score.h"
     27#include "Score.h"
    2828
    2929namespace theplu {
     30namespace yat {
    3031  namespace utility {
    3132    class vector;
     
    8990    ///
    9091    WilcoxonFoldChange& operator=(const WilcoxonFoldChange&);
    91 
    9292  };
    9393
    94 } // of namespace statistics
    95 } // of namespace theplu
     94}}} // of namespace statistics, yat, and theplu
    9695
    9796#endif
  • trunk/yat/statistics/tScore.cc

    r676 r680  
    2222*/
    2323
    24 #include "yat/statistics/tScore.h"
    25 #include "yat/statistics/Averager.h"
    26 #include "yat/statistics/AveragerWeighted.h"
     24#include "tScore.h"
     25#include "Averager.h"
     26#include "AveragerWeighted.h"
    2727#include "yat/classifier/DataLookupWeighted1D.h"
    2828#include "yat/classifier/Target.h"
     
    3131#include <cmath>
    3232
    33 
    3433namespace theplu {
     34namespace yat {
    3535namespace statistics { 
    3636
     
    122122  }
    123123
    124 
    125 
    126 }} // of namespace statistics and namespace theplu
     124}}} // of namespace statistics, yat, and theplu
  • trunk/yat/statistics/tScore.h

    r675 r680  
    1 #ifndef _theplu_statistics_tscore_
    2 #define _theplu_statistics_tscore_
     1#ifndef _theplu_yat_statistics_tscore_
     2#define _theplu_yat_statistics_tscore_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/statistics/Score.h"
     27#include "Score.h"
    2828
    2929#include <gsl/gsl_cdf.h>
     
    3131
    3232namespace theplu {
     33namespace yat {
    3334  namespace utility {
    3435    class vector;
     
    124125  };
    125126
    126 }} // of namespace statistics and namespace theplu
     127}}} // of namespace statistics, yat and theplu
    127128
    128129#endif
  • trunk/yat/statistics/utility.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/statistics/utility.h"
     24#include "utility.h"
    2525
    2626#include <gsl/gsl_randist.h>
     
    2828
    2929namespace theplu {
     30namespace yat {
    3031namespace statistics { 
    3132
     
    8182  }
    8283
    83 }} // of namespace statistics and namespace theplu
     84}}} // of namespace statistics, yat and theplu
  • trunk/yat/statistics/utility.h

    r675 r680  
    1 #ifndef _theplu_statistics_utility_
    2 #define _theplu_statistics_utility_
     1#ifndef _theplu_yat_statistics_utility_
     2#define _theplu_yat_statistics_utility_
    33
    44// $Id$
     
    3535
    3636namespace theplu {
     37namespace yat {
    3738namespace statistics { 
    3839
     
    182183 
    183184
    184 }} // of namespace statistics and namespace theplu
     185}}} // of namespace statistics, yat and theplu
    185186
    186187#endif
    187 
Note: See TracChangeset for help on using the changeset viewer.