Changeset 297 for trunk/lib

Timestamp:

Apr 29, 2005, 12:03:53 PM (17 years ago)

Author:

Peter

Message:

bux fixes

Location:

trunk/lib

Files:

• Makefile.am (modified) (1 diff)
• statistics/Fisher.cc (modified) (1 diff)
• statistics/KernelBox.h (modified) (3 diffs)

trunk/lib/Makefile.am

@@ -3 +3 @@
 ## $Id$
 
-lib_LIBRARIES = libc++_tools.a
 
-INCLUDES = @LOCAL_INCLUDES@
 
-libc___tools_a_SOURCES =                                            \
-  Alignment.cc Averager.cc AveragerPair.cc ConsensusInputRanker.cc  \
-  CrossValidation.cc FileIO.cc Fisher.cc GaussianKernelFunction.cc  \
-  gslapi_utility.cc \
-  Histogram.cc InputRanker.cc Kernel.cc kNNI.cc matrix.cc Merge.cc  \
-  NNI.cc PCA.cc PolynomialKernelFunction.cc random_singleton.cc     \
-  Regression.cc RegressionKernel.cc RegressionKernelBox.cc          \
-  RegressionKernelTriCube.cc  \
-  RegressionLinear.cc RegressionLocal.cc RegressionNaive.cc ROC.cc  \
-  Score.cc Statistics.cc stl_utility.cc SVD.cc SVM.cc tScore.cc \
-  vector.cc \
-  WeightedAverager.cc WeNNI.cc
+INCLUDES = @local_includes@
 
-include_cpp_toolsdir = $(includedir)/c++_tools
+SUBDIRS = gslapi utility statistics svm
+lib_LTLIBRARIES = libc++_tools.la
+libc___tools_la_SOURCES = 
+libc___tools_la_LIBADD = \
+  gslapi/libgslapi.la \
+  statistics/libstatistics.la \
+  utility/libutility.la \
+  svm/libsvm.la
 
-include_cpp_tools_HEADERS =                                           \
-  Alignment.h Averager.h AveragerPair.h ConsensusInputRanker.h        \
-  CrossValidation.h FileIO.h Fisher.h GaussianKernelFunction.h        \
-  gslapi_utility.h \
-  Histogram.h InputRanker.h Kernel.h KernelFunction.h kNNI.h matrix.h \
-  Merge.h NNI.h PCA.h Pearson.h PolynomialKernelFunction.h            \
-  random_singleton.h Regression.h RegressionKernel.h                  \
-  RegressionKernelBox.h RegressionKernelTriCube.h RegressionLinear.h \
-  RegressionLocal.h         \
-  RegressionNaive.h ROC.h Score.h Statistics.h stl_utility.h SVD.h    \
-  SVM.h tScore.h vector.h WeightedAverager.h WeNNI.h

trunk/lib/statistics/Fisher.cc

@@ -3 +3 @@
 #include <c++_tools/statistics/Fisher.h>
 #include <c++_tools/statistics/Score.h>
-#include <c++_tools/statistics/Statistics.h>
+#include <c++_tools/statistics/utility.h>
 
 namespace theplu {

trunk/lib/statistics/KernelBox.h

@@ -5 +5 @@
 #define _theplu_statistics_regression_kernel_box_
 
-#include "RegressionKernel.h"
+#include <c++_tools/statistics/Kernel.h>
 
 namespace theplu {
@@ -14 +14 @@
   ///
 
-  class RegressionKernelBox : public RegressionKernel
+  class KernelBox : public Kernel
   {
     
@@ -21 +21 @@
     /// Constructor
     ///
-    RegressionKernelBox() ;
+    KernelBox() ;
 
     ///