Changeset 297


Ignore:
Timestamp:
Apr 29, 2005, 12:03:53 PM (16 years ago)
Author:
Peter
Message:

bux fixes

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r296 r297  
    1414AC_PREREQ(2.57)
    1515AC_INIT([[thep-c++_tools]],[0.1],[jari@thep.lu.se])
    16 AC_CONFIG_SRCDIR([src/gslapi/matrix.h])
     16AC_CONFIG_SRCDIR([lib/gslapi/matrix.h])
    1717AC_CONFIG_AUX_DIR([autotools])
    1818AC_PREFIX_DEFAULT([/usr/local])
     
    6464
    6565CPP_TOOLS_LIB="libc++_tools.a"
    66 CPP_TOOLS_LIB_LOCATION="src"
    67 CPP_TOOLS_HEADER_LOCATION="src"
     66CPP_TOOLS_LIB_LOCATION="lib"
     67CPP_TOOLS_HEADER_LOCATION="lib"
    6868AC_SUBST(CPP_TOOLS_LIB)
    6969AC_SUBST(CPP_TOOLS_LIB_LOCATION)
     
    7575AC_CONFIG_FILES([Makefile
    7676     doc/Makefile
    77      src/Makefile
    78      src/gslapi/Makefile
    79      src/misc/Makefile
    80      src/statistics/Makefile
    81      src/svm/Makefile
     77     lib/Makefile
     78     lib/gslapi/Makefile
     79     lib/utility/Makefile
     80     lib/statistics/Makefile
     81     lib/svm/Makefile
    8282     test/Makefile])
    8383
  • trunk/lib/Makefile.am

    r295 r297  
    33## $Id$
    44
    5 lib_LIBRARIES = libc++_tools.a
    65
    7 INCLUDES = @LOCAL_INCLUDES@
    86
    9 libc___tools_a_SOURCES =                                            \
    10   Alignment.cc Averager.cc AveragerPair.cc ConsensusInputRanker.cc  \
    11   CrossValidation.cc FileIO.cc Fisher.cc GaussianKernelFunction.cc  \
    12   gslapi_utility.cc \
    13   Histogram.cc InputRanker.cc Kernel.cc kNNI.cc matrix.cc Merge.cc  \
    14   NNI.cc PCA.cc PolynomialKernelFunction.cc random_singleton.cc     \
    15   Regression.cc RegressionKernel.cc RegressionKernelBox.cc          \
    16   RegressionKernelTriCube.cc  \
    17   RegressionLinear.cc RegressionLocal.cc RegressionNaive.cc ROC.cc  \
    18   Score.cc Statistics.cc stl_utility.cc SVD.cc SVM.cc tScore.cc \
    19   vector.cc \
    20   WeightedAverager.cc WeNNI.cc
     7INCLUDES = @local_includes@
    218
    22 include_cpp_toolsdir = $(includedir)/c++_tools
     9SUBDIRS = gslapi utility statistics svm
     10lib_LTLIBRARIES = libc++_tools.la
     11libc___tools_la_SOURCES =
     12libc___tools_la_LIBADD = \
     13  gslapi/libgslapi.la \
     14  statistics/libstatistics.la \
     15  utility/libutility.la \
     16  svm/libsvm.la
    2317
    24 include_cpp_tools_HEADERS =                                           \
    25   Alignment.h Averager.h AveragerPair.h ConsensusInputRanker.h        \
    26   CrossValidation.h FileIO.h Fisher.h GaussianKernelFunction.h        \
    27   gslapi_utility.h \
    28   Histogram.h InputRanker.h Kernel.h KernelFunction.h kNNI.h matrix.h \
    29   Merge.h NNI.h PCA.h Pearson.h PolynomialKernelFunction.h            \
    30   random_singleton.h Regression.h RegressionKernel.h                  \
    31   RegressionKernelBox.h RegressionKernelTriCube.h RegressionLinear.h \
    32   RegressionLocal.h         \
    33   RegressionNaive.h ROC.h Score.h Statistics.h stl_utility.h SVD.h    \
    34   SVM.h tScore.h vector.h WeightedAverager.h WeNNI.h
  • trunk/lib/statistics/Fisher.cc

    r295 r297  
    33#include <c++_tools/statistics/Fisher.h>
    44#include <c++_tools/statistics/Score.h>
    5 #include <c++_tools/statistics/Statistics.h>
     5#include <c++_tools/statistics/utility.h>
    66
    77namespace theplu {
  • trunk/lib/statistics/KernelBox.h

    r296 r297  
    55#define _theplu_statistics_regression_kernel_box_
    66
    7 #include "RegressionKernel.h"
     7#include <c++_tools/statistics/Kernel.h>
    88
    99namespace theplu {
     
    1414  ///
    1515
    16   class RegressionKernelBox : public RegressionKernel
     16  class KernelBox : public Kernel
    1717  {
    1818   
     
    2121    /// Constructor
    2222    ///
    23     RegressionKernelBox() ;
     23    KernelBox() ;
    2424
    2525    ///
Note: See TracChangeset for help on using the changeset viewer.