Changeset 682 for trunk/yat


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

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

Location:
trunk/yat
Files:
2 added
2 edited
26 moved

Legend:

Unmodified
Added
Removed
  • 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.