Changeset 682


Ignore:
Timestamp:
Oct 12, 2006, 12:06:38 AM (17 years ago)
Author:
Jari Häkkinen
Message:

Addresses #153. Moved regression files to .../yat/regression.

Location:
trunk
Files:
2 added
4 edited
26 moved

Legend:

Unmodified
Added
Removed

  • trunk/configure.ac

    r675 r682  
    8484
    8585AC_CONFIG_FILES([Makefile
     86     doc/Makefile
     87     test/Makefile
    8688     yat/Makefile
     89     yat/classifier/Makefile
    8790     yat/random/Makefile
    88      yat/utility/Makefile
     91     yat/regression/Makefile
    8992     yat/statistics/Makefile
    90      yat/classifier/Makefile
    91      doc/Makefile
    92      test/Makefile])
     93     yat/utility/Makefile])
    9394
    9495AC_OUTPUT

  • trunk/test/regression_test.cc

    r680 r682  
    2222*/
    2323
    24 #include "yat/statistics/KernelBox.h"
    25 #include "yat/statistics/Linear.h"
    26 #include "yat/statistics/LinearWeighted.h"
    27 #include "yat/statistics/Local.h"
    28 #include "yat/statistics/Naive.h"
    29 #include "yat/statistics/NaiveWeighted.h"
    30 #include "yat/statistics/Polynomial.h"
    31 #include "yat/statistics/PolynomialWeighted.h"
     24#include "yat/regression/KernelBox.h"
     25#include "yat/regression/Linear.h"
     26#include "yat/regression/LinearWeighted.h"
     27#include "yat/regression/Local.h"
     28#include "yat/regression/Naive.h"
     29#include "yat/regression/NaiveWeighted.h"
     30#include "yat/regression/Polynomial.h"
     31#include "yat/regression/PolynomialWeighted.h"
    3232#include "yat/utility/matrix.h"
    3333#include "yat/utility/vector.h"
    … …  
    4141using namespace theplu::yat;
    4242
    43 bool Local_test(statistics::regression::OneDimensionalWeighted&,
    44                 statistics::regression::Kernel&);
     43bool Local_test(regression::OneDimensionalWeighted&,
     44                regression::Kernel&);
    4545
    4646
    … …  
    6464
    6565  *error << "testing regression::LinearWeighted" << std::endl;
    66   statistics::regression::LinearWeighted linear_w;
     66  regression::LinearWeighted linear_w;
    6767  linear_w.fit(x,y,w);
    6868  double y_predicted = linear_w.predict(1990);
    … …  
    7777  // testing regression::NaiveWeighted
    7878  *error << "testing regression::NaiveWeighted" << std::endl;
    79   statistics::regression::NaiveWeighted naive_w;
     79  regression::NaiveWeighted naive_w;
    8080  naive_w.fit(x,y,w);
    8181  y_predicted=naive_w.predict(0.0);
    … …  
    8888  // testing regression::Local
    8989  *error << "testing regression::Local" << std::endl;
    90   statistics::regression::KernelBox kb;
    91   statistics::regression::LinearWeighted rl;
     90  regression::KernelBox kb;
     91  regression::LinearWeighted rl;
    9292  if (!Local_test(rl,kb)) {
    9393    *error << "regression_Local: Linear cannot reproduce fit." << std::endl;
    9494    ok=false;
    9595  }
    96   statistics::regression::NaiveWeighted rn;
     96  regression::NaiveWeighted rn;
    9797  if (!Local_test(rn,kb)) {
    9898    *error << "regression_Local: Naive cannot reproduce fit." << std::endl;
    … …  
    112112    }
    113113
    114     statistics::regression::Polynomial polynomialfit(2);
     114    regression::Polynomial polynomialfit(2);
    115115    polynomialfit.fit(x,ln_y);
    116116    utility::vector fit=polynomialfit.fit_parameters();
    … …  
    123123
    124124  *error << "testing regression::Linear" << std::endl;
    125   statistics::regression::Linear lin;
     125  regression::Linear lin;
    126126 
    127127  *error << "testing regression::Naive" << std::endl;
    128   statistics::regression::Naive naive;
     128  regression::Naive naive;
    129129
    130130  *error << "testing regression::Polynomial" << std::endl;
    131   statistics::regression::Polynomial pol(2);
     131  regression::Polynomial pol(2);
    132132
    133133  *error << "testing regression::PolynomialWeighted" << std::endl;
    134   statistics::regression::PolynomialWeighted pol_weighted(2);
     134  regression::PolynomialWeighted pol_weighted(2);
    135135
    136136  if (error!=&std::cerr)
    … …  
    142142
    143143
    144 bool Local_test(statistics::regression::OneDimensionalWeighted& r,
    145                 statistics::regression::Kernel& k)
     144bool Local_test(regression::OneDimensionalWeighted& r,
     145                regression::Kernel& k)
    146146{
    147   statistics::regression::Local rl(r,k);
     147  regression::Local rl(r,k);
    148148  for (size_t i=0; i<1000; i++){
    149149    rl.add(i, 10);

  • trunk/yat/Makefile.am

    r675 r682  
    2424INCLUDES = @local_includes@
    2525
    26 SUBDIRS = classifier random statistics utility
     26SUBDIRS = classifier random regression statistics utility
    2727
    2828lib_LTLIBRARIES = libyat.la
    … …  
    3333  classifier/libclassifier.la \
    3434  random/librandom.la \
     35  regression/libregression.la \
    3536  statistics/libstatistics.la \
    3637  utility/libutility.la

  • trunk/yat/regression/Linear.cc

    r681 r682  
    2323
    2424#include "Linear.h"
    25 #include "AveragerPair.h"
     25#include "yat/statistics/AveragerPair.h"
    2626#include "yat/utility/vector.h"
    2727

  • trunk/yat/regression/LinearWeighted.cc

    r681 r682  
    2323
    2424#include "LinearWeighted.h"
    25 #include "AveragerPairWeighted.h"
     25#include "yat/statistics/AveragerPairWeighted.h"
    2626#include "yat/utility/vector.h"
    2727
    … …  
    4040    // want.
    4141    utility::vector dummie(w.size(),1);
    42     AveragerPairWeighted ap;
     42    statistics::AveragerPairWeighted ap;
    4343    ap.add_values(x,y,w,dummie);
    4444

  • trunk/yat/regression/Naive.cc

    r681 r682  
    2323
    2424#include "Naive.h"
    25 #include "Averager.h"
    26 #include "AveragerWeighted.h"
    2725#include "OneDimensional.h"
     26#include "yat/statistics/Averager.h"
     27#include "yat/statistics/AveragerWeighted.h"
    2828#include "yat/utility/vector.h"
    2929

  • trunk/yat/regression/NaiveWeighted.cc

    r681 r682  
    2323
    2424#include "NaiveWeighted.h"
    25 #include "AveragerWeighted.h"
    2625#include "OneDimensional.h"
     26#include "yat/statistics/AveragerWeighted.h"
    2727#include "yat/utility/vector.h"
    2828
    … …  
    3535                          const utility::vector& w)
    3636  {
    37     AveragerWeighted a;
     37    statistics::AveragerWeighted a;
    3838    for (size_t i=0; i<y.size(); i++)
    3939      a.add(y(i), w(i));

  • trunk/yat/regression/OneDimensional.h

    r681 r682  
    2525*/
    2626
    27 #include "AveragerPair.h"
     27#include "yat/statistics/AveragerPair.h"
    2828
    2929#include <ostream>
    … …  
    8787    /// Averager for pair of x and y
    8888    ///
    89     AveragerPair ap_;
     89    statistics::AveragerPair ap_;
    9090
    9191    ///

  • trunk/yat/statistics/Makefile.am

    r680 r682  
    2424
    2525noinst_LTLIBRARIES = libstatistics.la
    26 libstatistics_la_SOURCES = \
    27   Averager.cc AveragerPair.cc AveragerWeighted.cc \
    28   AveragerPairWeighted.cc \
    29   Distance.cc \
    30   Fisher.cc FoldChange.cc \
    31   Histogram.cc KernelBox.cc KernelTriCube.cc Linear.cc \
    32   LinearWeighted.cc Local.cc \
    33   MultiDimensional.cc \
    34   MultiDimensionalWeighted.cc \
    35   Naive.cc NaiveWeighted.cc OneDimensional.cc\
    36   Pearson.cc PearsonDistance.cc \
    37   Polynomial.cc \
    38   PolynomialWeighted.cc \
    39   ROC.cc SAM.cc Score.cc SNR.cc tScore.cc utility.cc \
    40   WilcoxonFoldChange.cc
     26libstatistics_la_SOURCES = Averager.cc AveragerPair.cc      \
     27  AveragerWeighted.cc AveragerPairWeighted.cc Distance.cc   \
     28  Fisher.cc FoldChange.cc Histogram.cc Pearson.cc     \
     29  PearsonDistance.cc ROC.cc SAM.cc Score.cc SNR.cc tScore.cc  \
     30  utility.cc WilcoxonFoldChange.cc
    4131
    4232include_statisticsdir = $(includedir)/yat/statistics
    4333
    44 include_statistics_HEADERS = \
    45   Averager.h AveragerPair.h AveragerWeighted.h \
    46   AveragerPairWeighted.h \
    47   Distance.h \
    48   Fisher.h FoldChange.h \
    49   Histogram.h Kernel.h KernelBox.h KernelTriCube.h Linear.h LinearWeighted.h \
    50   Local.h MultiDimensional.h \
    51   MultiDimensionalWeighted.h \
    52   Naive.h NaiveWeighted.h OneDimensional.h \
    53   OneDimensionalWeighted.h Pearson.h  PearsonDistance.h \
    54   Polynomial.h \
    55   PolynomialWeighted.h \
    56   ROC.h SAM.h Score.h SNR.h tScore.h \
    57   utility.h WilcoxonFoldChange.h
     34include_statistics_HEADERS = Averager.h AveragerPair.h      \
     35  AveragerWeighted.h AveragerPairWeighted.h Distance.h Fisher.h \
     36  FoldChange.h Histogram.h Pearson.h PearsonDistance.h ROC.h  \
     37  SAM.h Score.h SNR.h tScore.h utility.h WilcoxonFoldChange.h
Note: See TracChangeset for help on using the changeset viewer.