Changeset 225


Ignore:
Timestamp:
Jan 28, 2005, 12:11:38 PM (17 years ago)
Author:
Jari Häkkinen
Message:

Minor fixes.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r93 r225  
    4242AC_CHECK_FUNCS([pow sqrt])
    4343
     44LOCAL_INCLUDES="-I/home/max/jari/local/include"
    4445LDFLAGS="-L/home/max/jari/local/lib"
    45 
    4646CXXFLAGS="-O3 -Wall -DGSL_RANGE_CHECK_OFF"
     47AC_SUBST([LOCAL_INCLUDES])
    4748AC_SUBST(CXXFLAGS)
    4849
  • trunk/src/Makefile.am

    r216 r225  
    55lib_LIBRARIES = libc++_tools.a
    66
     7INCLUDES = @LOCAL_INCLUDES@
    78
    8 
    9 libc___tools_a_SOURCES = \
    10   Alignment.cc Averager.cc AveragerPair.cc ConsensusInputRanker.cc \
    11   CrossValidation.cc \
    12   Fisher.cc FileIO.cc GaussianKernelFunction.cc Histogram.cc \
    13   InputRanker.cc \
    14   Kernel.cc kNNI.cc matrix.cc Merge.cc NNI.cc PCA.cc \
    15   PolynomialKernelFunction.cc random_singleton.cc \
    16   RegressionKernelBox.cc \
    17   RegressionLinear.cc RegressionLocal.cc RegressionNaive.cc ROC.cc \
    18   Score.cc Statistics.cc \
    19   PolynomialKernelFunction.cc random_singleton.cc \
    20   Regression.cc RegressionKernel.cc RegressionLinear.cc ROC.cc Score.cc \
    21   Statistics.cc \
    22   SVD.cc SVM.cc tScore.cc vector.cc WeightedAverager.cc WeNNI.cc
    23 
    24 
    25 INCLUDES = -I/home/max/jari/local/include
     9libc___tools_a_SOURCES =                                            \
     10  Alignment.cc Averager.cc AveragerPair.cc ConsensusInputRanker.cc  \
     11  CrossValidation.cc FileIO.cc Fisher.cc GaussianKernelFunction.cc  \
     12  Histogram.cc InputRanker.cc Kernel.cc kNNI.cc matrix.cc Merge.cc  \
     13  NNI.cc PCA.cc PolynomialKernelFunction.cc random_singleton.cc     \
     14  Regression.cc RegressionKernel.cc RegressionKernelBox.cc          \
     15  RegressionLinear.cc RegressionLocal.cc RegressionNaive.cc ROC.cc  \
     16  Score.cc Statistics.cc SVD.cc SVM.cc tScore.cc vector.cc          \
     17  WeightedAverager.cc WeNNI.cc
    2618
    2719include_cpp_toolsdir = $(includedir)/c++_tools
    28 include_cpp_tools_HEADERS = \
    29   Alignment.h Averager.h AveragerPair.h ConsensusInputRanker.h \
    30   CrossValidation.h \
    31   FileIO.h Fisher.h GaussianKernelFunction.h Histogram.h InputRanker.h \
    32   Kernel.h \
    33   KernelFunction.h kNNI.h matrix.h Merge.h NNI.h PCA.h Pearson.h \
    34   PolynomialKernelFunction.h random_singleton.h \
    35   Regression.h RegressionKernel.h RegressionKernelBox.h \
    36   RegressionLinear.h RegressionLocal.h RegressionNaive.h ROC.h Score.h \
    37   PolynomialKernelFunction.h random_singleton.h Regression.h \
    38   RegressionKernel.h RegressionKernelBox.h \
    39   RegressionLinear.h ROC.h Score.h \
    40   Statistics.h stl_utility.h SVD.h SVM.h tScore.h vector.h WeNNI.h \
    41   WeightedAverager.h
     20
     21include_cpp_tools_HEADERS =                                           \
     22  Alignment.h Averager.h AveragerPair.h ConsensusInputRanker.h        \
     23  CrossValidation.h FileIO.h Fisher.h GaussianKernelFunction.h        \
     24  Histogram.h InputRanker.h Kernel.h KernelFunction.h kNNI.h matrix.h \
     25  Merge.h NNI.h PCA.h Pearson.h PolynomialKernelFunction.h            \
     26  random_singleton.h Regression.h RegressionKernel.h                  \
     27  RegressionKernelBox.h RegressionLinear.h RegressionLocal.h          \
     28  RegressionNaive.h ROC.h Score.h Statistics.h stl_utility.h SVD.h    \
     29  SVM.h tScore.h vector.h WeightedAverager.h WeNNI.h
  • trunk/test/Makefile.am

    r217 r225  
    55check_PROGRAMS =                                                    \
    66  test_averagerpair test_consensus_inputranker test_crossvalidation \
    7   test_inputranker                                                  \
    8   test_kernel test_merge test_nni test_pca test_regression_linear \
    9   test_regression_local test_rnd test_roc       \
     7  test_inputranker test_kernel test_merge test_nni test_pca         \
     8  test_regression_linear test_regression_local test_rnd test_roc    \
    109  test_statistics test_svd test_svm test_vector
    1110
    12 test_averagerpair_SOURCES = test_averagerpair.cc
    13 test_averagerpair_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
     11LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    1412    $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    1513
    16 test_consensus_inputranker_SOURCES = test_consensus_inputranker.cc
    17 test_consensus_inputranker_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    18     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    19 
    20 test_crossvalidation_SOURCES = test_crossvalidation.cc
    21 test_crossvalidation_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    22     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    23 
    24 test_inputranker_SOURCES = test_inputranker.cc
    25 test_inputranker_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    26     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    27 
    28 test_kernel_SOURCES = test_kernel.cc
    29 test_kernel_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    30     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    31 
    32 test_merge_SOURCES = test_merge.cc
    33 test_merge_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    34     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    35 
    36 test_nni_SOURCES = test_nni.cc
    37 test_nni_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    38     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    39 
    40 test_pca_SOURCES = test_pca.cc
    41 test_pca_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    42     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    43 
    44 test_regression_linear_SOURCES = test_regression_linear.cc
    45 test_regression_linear_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    46     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    47 
    48 test_regression_local_SOURCES = test_regression_local.cc
    49 test_regression_local_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    50     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    51 
    52 test_rnd_SOURCES = test_rnd.cc
    53 test_rnd_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    54     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    55 
    56 test_roc_SOURCES = test_roc.cc
    57 test_roc_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    58     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    59 
    60 test_statistics_SOURCES = test_statistics.cc
    61 test_statistics_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    62     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    63 
    64 test_svd_SOURCES = test_svd.cc
    65 test_svd_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    66     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    67 
    68 test_svm_SOURCES = test_svm.cc
    69 test_svm_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    70     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    71 
    72 test_vector_SOURCES = test_vector.cc
    73 test_vector_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
    74     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
    75 
    76 INCLUDES = -I@top_srcdir@/$(CPP_TOOLS_HEADER_LOCATION) \
    77      -I/home/max/jari/local/include
     14INCLUDES = -I@top_srcdir@/$(CPP_TOOLS_HEADER_LOCATION) @LOCAL_INCLUDES@
    7815
    7916AM_LDFLAGS = -g
     17
     18test_averagerpair_SOURCES = test_averagerpair.cc
     19test_consensus_inputranker_SOURCES = test_consensus_inputranker.cc
     20test_crossvalidation_SOURCES = test_crossvalidation.cc
     21test_inputranker_SOURCES = test_inputranker.cc
     22test_kernel_SOURCES = test_kernel.cc
     23test_merge_SOURCES = test_merge.cc
     24test_nni_SOURCES = test_nni.cc
     25test_pca_SOURCES = test_pca.cc
     26test_regression_linear_SOURCES = test_regression_linear.cc
     27test_regression_local_SOURCES = test_regression_local.cc
     28test_rnd_SOURCES = test_rnd.cc
     29test_roc_SOURCES = test_roc.cc
     30test_statistics_SOURCES = test_statistics.cc
     31test_svd_SOURCES = test_svd.cc
     32test_svm_SOURCES = test_svm.cc
     33test_vector_SOURCES = test_vector.cc
Note: See TracChangeset for help on using the changeset viewer.