Changeset 450


Ignore:
Timestamp:
Dec 15, 2005, 9:59:21 PM (17 years ago)
Author:
Peter
Message:

starting to move namespace svm, it wont work compiling for a while, please hold... yeah yeah I know I should have made new branch, but...

Location:
trunk/lib/svm
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/svm/ConsensusInputRanker.cc

    r301 r450  
    22
    33
    4 #include <c++_tools/svm/ConsensusInputRanker.h>
     4#include <c++_tools/classifier/ConsensusInputRanker.h>
    55
    66#include <c++_tools/gslapi/matrix.h>
    77#include <c++_tools/statistics/utility.h>
    8 #include <c++_tools/svm/CrossValidation.h>
    9 #include <c++_tools/svm/InputRanker.h>
     8#include <c++_tools/classifier/CrossValidation.h>
     9#include <c++_tools/classifier/InputRanker.h>
    1010#include <c++_tools/utility/stl_utility.h>
    1111
     
    1414
    1515namespace theplu {
    16 namespace svm
     16namespace classifier
    1717
    1818  ConsensusInputRanker::ConsensusInputRanker(const gslapi::matrix& data,
     
    9292   
    9393
    94 }} // of namespace svm and namespace theplu
     94}} // of namespace classifier and namespace theplu
  • trunk/lib/svm/ConsensusInputRanker.h

    r295 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_consensusinputranker_
    4 #define _theplu_svm_consensusinputranker_
     3#ifndef _theplu_classifier_consensusinputranker_
     4#define _theplu_classifier_consensusinputranker_
    55
    6 #include <c++_tools/svm/InputRanker.h>
     6#include <c++_tools/classifier/InputRanker.h>
    77
    88namespace theplu {
     
    1010  class gslapi::vector;
    1111  class statistics::Score;
    12 namespace svm
     12namespace classifier
    1313
    1414  ///
     
    6565  };
    6666
    67 }} // of namespace svm and namespace theplu
     67}} // of namespace classifier and namespace theplu
    6868
    6969#endif
  • trunk/lib/svm/CrossValidation.cc

    r377 r450  
    33
    44#include <c++_tools/gslapi/vector.h>
    5 #include <c++_tools/svm/CrossValidation.h>
     5#include <c++_tools/classifier/CrossValidation.h>
    66#include <c++_tools/random/random.h>
    77
     
    99
    1010namespace theplu {
    11 namespace svm
     11namespace classifier
    1212
    1313  CrossValidation::CrossValidation(const theplu::gslapi::vector& target,
     
    5757  }
    5858 
    59 }} // of namespace svm and namespace theplu
     59}} // of namespace classifier and namespace theplu
  • trunk/lib/svm/CrossValidation.h

    r295 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_crossvalidation_
    4 #define _theplu_svm_crossvalidation_
     3#ifndef _theplu_classifier_crossvalidation_
     4#define _theplu_classifier_crossvalidation_
    55
    66#include <vector>
     
    1010  class vector;
    1111}
    12 namespace svm
     12namespace classifier
    1313
    1414  ///
     
    4343  };
    4444
    45 }} // of namespace svm and namespace theplu
     45}} // of namespace classifier and namespace theplu
    4646
    4747#endif
  • trunk/lib/svm/GaussianKernelFunction.cc

    r353 r450  
    11// $Id$
    22
    3 #include <c++_tools/svm/GaussianKernelFunction.h>
     3#include <c++_tools/classifier/GaussianKernelFunction.h>
    44
    5 #include <c++_tools/svm/KernelFunction.h>
     5#include <c++_tools/classifier/KernelFunction.h>
    66#include <c++_tools/gslapi/matrix.h>
    77#include <c++_tools/gslapi/vector.h>
     
    1010
    1111namespace theplu {
    12 namespace svm
     12namespace classifier
    1313
    1414GaussianKernelFunction::GaussianKernelFunction(double sigma)
  • trunk/lib/svm/GaussianKernelFunction.h

    r353 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_gaussian_kernel_function_
    4 #define _theplu_svm_gaussian_kernel_function_
     3#ifndef _theplu_classifier_gaussian_kernel_function_
     4#define _theplu_classifier_gaussian_kernel_function_
    55
    66#include <c++_tools/gslapi/vector.h>
    7 #include <c++_tools/svm/KernelFunction.h>
     7#include <c++_tools/classifier/KernelFunction.h>
    88
    99#include <cmath>
     
    1212class gslapi::vector;
    1313
    14 namespace svm {
     14namespace classifier {
    1515
    1616  ///
     
    5555  }; // class GaussianKernelFunction
    5656
    57 }} // of namespace svm and namespace theplu
     57}} // of namespace classifier and namespace theplu
    5858
    5959#endif
  • trunk/lib/svm/InputRanker.cc

    r420 r450  
    11// $Id$
    22
    3 #include <c++_tools/svm/InputRanker.h>
     3#include <c++_tools/classifier/InputRanker.h>
    44
    55#include <c++_tools/gslapi/matrix.h>
     
    1212
    1313namespace theplu {
    14 namespace svm
     14namespace classifier
    1515
    1616
     
    8888
    8989
    90 }} // of namespace svm and namespace theplu
     90}} // of namespace classifier and namespace theplu
  • trunk/lib/svm/InputRanker.h

    r420 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_inputranker_
    4 #define _theplu_svm_inputranker_
     3#ifndef _theplu_classifier_inputranker_
     4#define _theplu_classifier_inputranker_
    55
    66#include <vector>
     
    1414  class Score;
    1515}
    16 namespace svm
     16namespace classifier
    1717  ///
    1818  /// Class for ranking rows in a matrix, using a Score and a
     
    7171
    7272
    73 }} // of namespace svm and namespace theplu
     73}} // of namespace classifier and namespace theplu
    7474
    7575#endif
  • trunk/lib/svm/Kernel.h

    r429 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_kernel_
    4 #define _theplu_svm_kernel_
     3#ifndef _theplu_classifier_kernel_
     4#define _theplu_classifier_kernel_
    55
    66#include <cctype>
     
    1212}
    1313
    14 namespace svm {
     14namespace classifier {
    1515
    1616  class KernelFunction;
     
    6969  }; // class Kernel
    7070
    71 }} // of namespace svm and namespace theplu
     71}} // of namespace classifier and namespace theplu
    7272
    7373#endif
  • trunk/lib/svm/KernelFunction.h

    r353 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_kernel_function_
    4 #define _theplu_svm_kernel_function_
     3#ifndef _theplu_classifier_kernel_function_
     4#define _theplu_classifier_kernel_function_
    55
    66namespace theplu {
     
    1111}
    1212
    13 namespace svm {
     13namespace classifier {
    1414
    1515  ///
     
    4646  }; // class KernelFunction
    4747
    48 }} // of namespace svm and namespace theplu
     48}} // of namespace classifier and namespace theplu
    4949
    5050#endif
  • trunk/lib/svm/KernelView.cc

    r446 r450  
    11// $Id$
    22
    3 #include <c++_tools/svm/KernelView.h>
     3#include <c++_tools/classifier/KernelView.h>
    44
    5 #include <c++_tools/svm/KernelFunction.h>
     5#include <c++_tools/classifier/KernelFunction.h>
    66
    77
    88namespace theplu {
    9 namespace svm
     9namespace classifier
    1010
    1111  KernelView::KernelView(const Kernel& kernel, const std::vector<size_t>& index)
     
    2323  } 
    2424
    25 }} // of namespace svm and namespace theplu
     25}} // of namespace classifier and namespace theplu
  • trunk/lib/svm/KernelView.h

    r446 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_kernel_view_
    4 #define _theplu_svm_kernel_view_
     3#ifndef _theplu_classifier_kernel_view_
     4#define _theplu_classifier_kernel_view_
    55
    6 #include <c++_tools/svm/Kernel.h>
     6#include <c++_tools/classifier/Kernel.h>
    77#include <vector>
    88
    99namespace theplu {
    10 namespace svm {
     10namespace classifier {
    1111
    1212  class KernelFunction;
     
    6969  }; // class KernelView
    7070
    71 }} // of namespace svm and namespace theplu
     71}} // of namespace classifier and namespace theplu
    7272
    7373#endif
  • trunk/lib/svm/Kernel_MEV.cc

    r420 r450  
    11// $Id$
    22
    3 #include <c++_tools/svm/Kernel_MEV.h>
     3#include <c++_tools/classifier/Kernel_MEV.h>
    44
    55namespace theplu {
    6 namespace svm
     6namespace classifier
    77
    88
    9 }} // of namespace svm and namespace theplu
     9}} // of namespace classifier and namespace theplu
  • trunk/lib/svm/Kernel_MEV.h

    r420 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_kernel_mev_
    4 #define _theplu_svm_kernel_mev_
     3#ifndef _theplu_classifier_kernel_mev_
     4#define _theplu_classifier_kernel_mev_
    55
    6 #include <c++_tools/svm/Kernel.h>
    7 #include <c++_tools/svm/KernelFunction.h>
     6#include <c++_tools/classifier/Kernel.h>
     7#include <c++_tools/classifier/KernelFunction.h>
    88#include <c++_tools/gslapi/matrix.h>
    99
    1010namespace theplu {
    11 namespace svm {
     11namespace classifier {
    1212
    1313  ///
     
    7676  }; // class Kernel_MEV
    7777
    78 }} // of namespace svm and namespace theplu
     78}} // of namespace classifier and namespace theplu
    7979
    8080#endif
  • trunk/lib/svm/Kernel_SEV.cc

    r420 r450  
    11// $Id$
    22
    3 #include <c++_tools/svm/Kernel_SEV.h>
     3#include <c++_tools/classifier/Kernel_SEV.h>
    44
    5 #include <c++_tools/svm/Kernel.h>
    6 #include <c++_tools/svm/KernelFunction.h>
     5#include <c++_tools/classifier/Kernel.h>
     6#include <c++_tools/classifier/KernelFunction.h>
    77#include <c++_tools/gslapi/matrix.h>
    88#include <c++_tools/gslapi/vector.h>
    99
    1010namespace theplu {
    11 namespace svm
     11namespace classifier
    1212
    1313
     
    2323
    2424
    25 }} // of namespace svm and namespace theplu
     25}} // of namespace classifier and namespace theplu
  • trunk/lib/svm/Kernel_SEV.h

    r420 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_kernel_sev_
    4 #define _theplu_svm_kernel_sev_
     3#ifndef _theplu_classifier_kernel_sev_
     4#define _theplu_classifier_kernel_sev_
    55
    6 #include <c++_tools/svm/Kernel.h>
     6#include <c++_tools/classifier/Kernel.h>
    77#include <c++_tools/gslapi/matrix.h>
    88
    99
    1010namespace theplu {
    11 namespace svm {
     11namespace classifier {
    1212
    1313  class KernelFunction;
     
    6969  }; // class Kernel_SEV
    7070
    71 }} // of namespace svm and namespace theplu
     71}} // of namespace classifier and namespace theplu
    7272
    7373#endif
  • trunk/lib/svm/PolynomialKernelFunction.cc

    r353 r450  
    22
    33
    4 #include <c++_tools/svm/PolynomialKernelFunction.h>
     4#include <c++_tools/classifier/PolynomialKernelFunction.h>
    55
    66#include <c++_tools/gslapi/matrix.h>
     
    1111
    1212namespace theplu {
    13 namespace svm
     13namespace classifier
    1414
    1515PolynomialKernelFunction::PolynomialKernelFunction(int order)
  • trunk/lib/svm/PolynomialKernelFunction.h

    r353 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_polynomial_kernel_function_
    4 #define _theplu_svm_polynomial_kernel_function_
     3#ifndef _theplu_classifier_polynomial_kernel_function_
     4#define _theplu_classifier_polynomial_kernel_function_
    55
    6 #include <c++_tools/svm/KernelFunction.h>
     6#include <c++_tools/classifier/KernelFunction.h>
    77#include <c++_tools/gslapi/vector.h>
    88
     
    1616}
    1717
    18 namespace svm {
     18namespace classifier {
    1919
    2020  ///
     
    6060  }; // class PolynomialKernelFunction
    6161
    62 }} // of namespace svm and namespace theplu
     62}} // of namespace classifier and namespace theplu
    6363
    6464#endif
  • trunk/lib/svm/SVM.cc

    r445 r450  
    22
    33
    4 #include <c++_tools/svm/SVM.h>
    5 
    6 #include <c++_tools/svm/Kernel.h>
     4#include <c++_tools/classifier/SVM.h>
     5
     6#include <c++_tools/classifier/Kernel.h>
    77#include <c++_tools/gslapi/matrix.h>
    88#include <c++_tools/gslapi/vector.h>
     
    1919
    2020namespace theplu {
    21 namespace svm
     21namespace classifier
    2222
    2323  Index::Index(void)
     
    390390  }
    391391
    392 }} // of namespace svm and namespace theplu
     392}} // of namespace classifier and namespace theplu
  • trunk/lib/svm/SVM.h

    r445 r450  
    11// $Id$
    22
    3 #ifndef _theplu_svm_svm_
    4 #define _theplu_svm_svm_
    5 
    6 #include <c++_tools/svm/Kernel.h>
     3#ifndef _theplu_classifier_svm_
     4#define _theplu_classifier_svm_
     5
     6#include <c++_tools/classifier/Kernel.h>
    77#include <c++_tools/gslapi/vector.h>
    88
     
    1313
    1414namespace theplu {
    15 namespace svm
     15namespace classifier
    1616
    1717  class Kernel;
     
    228228 
    229229 
    230 }} // of namespace svm and namespace theplu
     230}} // of namespace classifier and namespace theplu
    231231
    232232#endif
Note: See TracChangeset for help on using the changeset viewer.