Changeset 680 for trunk/yat/classifier


Ignore:
Timestamp:
Oct 11, 2006, 7:49:03 PM (15 years ago)
Author:
Jari Häkkinen
Message:

Addresses #153. Introduced yat namespace. Removed alignment namespace. Clean up of code.

Location:
trunk/yat/classifier
Files:
60 edited

Legend:

Unmodified
Added
Removed
  • trunk/yat/classifier/ConsensusInputRanker.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/ConsensusInputRanker.h"
    25 
    26 #include "yat/classifier/InputRanker.h"
    27 #include "yat/classifier/IRRetrieve.h"
    28 #include "yat/classifier/MatrixLookup.h"
    29 #include "yat/classifier/MatrixLookupWeighted.h"
    30 #include "yat/classifier/Sampler.h"
    31 #include "yat/classifier/Target.h"
     24#include "ConsensusInputRanker.h"
     25#include "InputRanker.h"
     26#include "IRRetrieve.h"
     27#include "MatrixLookup.h"
     28#include "MatrixLookupWeighted.h"
     29#include "Sampler.h"
     30#include "Target.h"
    3231#include "yat/statistics/Score.h"
    3332#include "yat/statistics/utility.h"
     
    4241
    4342namespace theplu {
     43namespace yat {
    4444namespace classifier { 
    4545
     
    111111
    112112
    113 }} // of namespace classifier and namespace theplu
     113}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/ConsensusInputRanker.h

    r677 r680  
    1 #ifndef _theplu_classifier_consensusinputranker_
    2 #define _theplu_classifier_consensusinputranker_
     1#ifndef _theplu_yat_classifier_consensusinputranker_
     2#define _theplu_yat_classifier_consensusinputranker_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/InputRanker.h"
     27#include "InputRanker.h"
    2828
    2929namespace theplu {
     30namespace yat {
    3031
    3132  class statistics::Score;
     
    128129  };
    129130
    130 }} // of namespace classifier and namespace theplu
     131}}} // of namespace classifier, yat, and theplu
    131132
    132133#endif
  • trunk/yat/classifier/CrossValidationSampler.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/CrossValidationSampler.h"
    25 #include "yat/classifier/Target.h"
     24#include "CrossValidationSampler.h"
     25#include "Target.h"
    2626#include "yat/random/random.h"
    2727
     
    3232
    3333namespace theplu {
     34namespace yat {
    3435namespace classifier { 
    3536
     
    9697  }
    9798
    98 }} // of namespace classifier and namespace theplu
     99}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/CrossValidationSampler.h

    r675 r680  
    1 #ifndef _theplu_classifier_crossvalidation_sampler_
    2 #define _theplu_classifier_crossvalidation_sampler_
     1#ifndef _theplu_yat_classifier_crossvalidation_sampler_
     2#define _theplu_yat_classifier_crossvalidation_sampler_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/Sampler.h"
     27#include "Sampler.h"
    2828
    2929namespace theplu {
     30namespace yat {
    3031namespace classifier { 
    3132
     
    6566  };
    6667
    67 }} // of namespace classifier and namespace theplu
     68}}} // of namespace classifier, yat, and theplu
    6869
    6970#endif
  • trunk/yat/classifier/DataLookup1D.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/DataLookup1D.h"
    25 #include "yat/classifier/DataLookup2D.h"
    26 #include "yat/classifier/MatrixLookup.h"
     24#include "DataLookup1D.h"
     25#include "DataLookup2D.h"
     26#include "MatrixLookup.h"
    2727
    2828#include <cassert>
     
    3131
    3232namespace theplu {
     33namespace yat {
    3334namespace classifier {
    3435
     
    8384  }
    8485
    85 }} // of namespace classifier and namespace theplu
     86}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/DataLookup1D.h

    r675 r680  
    1 #ifndef _theplu_classifier_dataLookup1D_
    2 #define _theplu_classifier_dataLookup1D_
     1#ifndef _theplu_yat_classifier_dataLookup1D_
     2#define _theplu_yat_classifier_dataLookup1D_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/DataLookup2D.h"
     27#include "DataLookup2D.h"
    2828
    2929#include <cassert>
     
    3232
    3333namespace theplu {
     34namespace yat {
    3435namespace classifier { 
    3536
     
    123124  std::ostream& operator<<(std::ostream& s, const DataLookup1D& v);
    124125 
    125 }} // of namespace classifier and namespace theplu
     126}}} // of namespace classifier, yat, and theplu
    126127
    127128#endif
  • trunk/yat/classifier/DataLookup2D.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/DataLookup2D.h"
     24#include "DataLookup2D.h"
    2525
    2626#include <vector>
     
    3131#endif
    3232
    33 
    3433namespace theplu {
     34namespace yat {
    3535namespace classifier {
    3636
     
    125125  }
    126126
    127 }} // of namespace classifier and namespace theplu
     127}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/DataLookup2D.h

    r675 r680  
    1 #ifndef _theplu_classifier_DataLookup2D_
    2 #define _theplu_classifier_DataLookup2D_
     1#ifndef _theplu_yat_classifier_DataLookup2D_
     2#define _theplu_yat_classifier_DataLookup2D_
    33
    44// $Id$
     
    2929
    3030namespace theplu {
     31namespace yat {
    3132namespace classifier { 
    3233
     
    165166  }; 
    166167 
    167 }} // of namespace classifier and namespace theplu
     168}}} // of namespace classifier, yat, and theplu
    168169
    169170#endif
  • trunk/yat/classifier/DataLookupWeighted1D.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/DataLookupWeighted1D.h"
    25 #include "yat/classifier/MatrixLookupWeighted.h"
     24#include "DataLookupWeighted1D.h"
     25#include "MatrixLookupWeighted.h"
    2626
    2727#include <cassert>
     
    3030
    3131namespace theplu {
     32namespace yat {
    3233namespace classifier {
    3334
     
    6465
    6566
    66 }} // of namespace classifier and namespace theplu
     67}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/DataLookupWeighted1D.h

    r675 r680  
    1 #ifndef _theplu_classifier_dataLookup_weighted_1D_
    2 #define _theplu_classifier_dataLookup_weighted_1D_
     1#ifndef _theplu_yat_classifier_dataLookup_weighted_1D_
     2#define _theplu_yat_classifier_dataLookup_weighted_1D_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/MatrixLookupWeighted.h"
     27#include "MatrixLookupWeighted.h"
    2828
    2929#include <iostream>
     
    3131
    3232namespace theplu {
     33namespace yat {
    3334namespace classifier { 
    3435
     
    119120  };
    120121
    121 }} // of namespace classifier and namespace theplu
     122}}} // of namespace classifier, yat, and theplu
    122123
    123124#endif
  • trunk/yat/classifier/EnsembleBuilder.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/EnsembleBuilder.h"
    25 
    26 #include "yat/classifier/DataLookup2D.h"
    27 #include "yat/classifier/KernelLookup.h"
    28 #include "yat/classifier/SubsetGenerator.h"
    29 #include "yat/classifier/SupervisedClassifier.h"
    30 #include "yat/classifier/Target.h"
    31 
     24#include "EnsembleBuilder.h"
     25#include "DataLookup2D.h"
     26#include "KernelLookup.h"
     27#include "SubsetGenerator.h"
     28#include "SupervisedClassifier.h"
     29#include "Target.h"
    3230#include "yat/utility/matrix.h"
    3331
    3432namespace theplu {
     33namespace yat {
    3534namespace classifier {
    3635
     
    125124  }
    126125
    127 }} // of namespace classifier and namespace theplu
     126}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/EnsembleBuilder.h

    r677 r680  
    1 #ifndef _theplu_classifier_ensemblebuilder_
    2 #define _theplu_classifier_ensemblebuilder_
     1#ifndef _theplu_yat_classifier_ensemblebuilder_
     2#define _theplu_yat_classifier_ensemblebuilder_
    33
    44// $Id$
     
    3030
    3131namespace theplu {
     32namespace yat {
    3233namespace classifier { 
    3334
     
    105106  };
    106107 
    107 }} // of namespace classifier and namespace theplu
     108}}} // of namespace classifier, yat, and theplu
    108109
    109110#endif
  • trunk/yat/classifier/FeatureSelector.cc

    r675 r680  
    2323
    2424#include "FeatureSelector.h"
    25 
    2625#include "MatrixLookup.h"
    2726#include "MatrixLookupWeighted.h"
     
    3029
    3130namespace theplu {
     31namespace yat {
    3232namespace classifier {
    3333
     
    6565  }
    6666
    67 } // end of namespace classifier
    68 } // end of namespace theplu
     67}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/FeatureSelector.h

    r675 r680  
    1 #ifndef _theplu_classifier_featureselector_
    2 #define _theplu_classifier_featureselector_
     1#ifndef _theplu_yat_classifier_featureselector_
     2#define _theplu_yat_classifier_featureselector_
    33
    44// $Id$
     
    2929
    3030namespace theplu {
     31namespace yat {
    3132namespace classifier {
    3233  class MatrixLookup;
     
    100101  };
    101102
    102 } // end of namespace classifier
    103 } // end of namespace theplu
     103}}} // of namespace classifier, yat, and theplu
    104104
    105105#endif
  • trunk/yat/classifier/FeatureSelectorIR.cc

    r675 r680  
    2323
    2424#include "FeatureSelectorIR.h"
    25 
    2625#include "FeatureSelector.h"
    2726#include "MatrixLookup.h"
     
    3130
    3231namespace theplu {
     32namespace yat {
    3333namespace classifier {
    3434
     
    7676  }
    7777
    78 
    79 } // end of namespace classifier
    80 } // end of namespace theplu
     78}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/FeatureSelectorIR.h

    r675 r680  
    1 #ifndef _theplu_classifier_featureselectorir_
    2 #define _theplu_classifier_featureselectorir_
     1#ifndef _theplu_yat_classifier_featureselectorir_
     2#define _theplu_yat_classifier_featureselectorir_
    33
    44// $Id$
     
    3030
    3131namespace theplu {
     32namespace yat {
    3233namespace classifier {
    3334
     
    6465  };
    6566
    66 } // end of namespace classifier
    67 } // end of namespace theplu
     67}}} // of namespace classifier, yat, and theplu
    6868
    6969#endif
  • trunk/yat/classifier/FeatureSelectorRandom.cc

    r675 r680  
    3131
    3232namespace theplu {
     33namespace yat {
    3334namespace classifier {
    3435
     
    6970  }
    7071
    71 
    72 } // end of namespace classifier
    73 } // end of namespace theplu
     72}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/FeatureSelectorRandom.h

    r675 r680  
    1 #ifndef _theplu_classifier_featureselector_random_
    2 #define _theplu_classifier_featureselector_random_
     1#ifndef _theplu_yat_classifier_featureselector_random_
     2#define _theplu_yat_classifier_featureselector_random_
    33
    44// $Id$
     
    2828
    2929namespace theplu {
     30namespace yat {
    3031namespace classifier {
    3132
     
    6465  };
    6566
    66 } // end of namespace classifier
    67 } // end of namespace theplu
     67}}} // of namespace classifier, yat, and theplu
    6868
    6969#endif
  • trunk/yat/classifier/GaussianKernelFunction.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/GaussianKernelFunction.h"
    25 
    26 #include "yat/classifier/KernelFunction.h"
    27 #include "yat/classifier/DataLookup1D.h"
    28 #include "yat/classifier/DataLookupWeighted1D.h"
     24#include "GaussianKernelFunction.h"
     25#include "KernelFunction.h"
     26#include "DataLookup1D.h"
     27#include "DataLookupWeighted1D.h"
    2928
    3029#include <math.h>
    3130
    3231namespace theplu {
     32namespace yat {
    3333namespace classifier { 
    3434
     
    9090
    9191
    92 }} // of namespace svn and namespace theplu
     92}}} // of namespace svn, yat, and theplu
  • trunk/yat/classifier/GaussianKernelFunction.h

    r675 r680  
    1 #ifndef _theplu_classifier_gaussian_kernel_function_
    2 #define _theplu_classifier_gaussian_kernel_function_
     1#ifndef _theplu_yat_classifier_gaussian_kernel_function_
     2#define _theplu_yat_classifier_gaussian_kernel_function_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/KernelFunction.h"
    28 #include "yat/classifier/DataLookup1D.h"
     27#include "KernelFunction.h"
     28#include "DataLookup1D.h"
    2929
    3030#include <cmath>
    3131
    3232namespace theplu {
     33namespace yat {
    3334namespace classifier {
    3435
     
    7879  }; // class GaussianKernelFunction
    7980
    80 }} // of namespace classifier and namespace theplu
     81}}} // of namespace classifier, yat, and theplu
    8182
    8283#endif
  • trunk/yat/classifier/IGP.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/IGP.h"
    25 
    26 #include "yat/classifier/DataLookup1D.h"
    27 #include "yat/classifier/MatrixLookup.h"
    28 #include "yat/classifier/Target.h"
    29 #include "yat/classifier/utility.h"
     24#include "IGP.h"
     25#include "DataLookup1D.h"
     26#include "MatrixLookup.h"
     27#include "Target.h"
     28#include "utility.h"
    3029#include "yat/utility/vector.h"
    3130#include "yat/statistics/Distance.h"
     
    3635
    3736namespace theplu {
     37namespace yat {
    3838namespace classifier {
    3939 
     
    8383  {
    8484  }
    85  
    86  
    87 }} // of namespace classifier and namespace theplu
     85
     86}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/IGP.h

    r675 r680  
    1 #ifndef _theplu_classifier_igp_
    2 #define _theplu_classifier_igp_
     1#ifndef _theplu_yat_classifier_igp_
     2#define _theplu_yat_classifier_igp_
    33
    44// $Id$
     
    2828
    2929namespace theplu {
     30namespace yat {
    3031
    3132  namespace statistics {
     
    7172  }; 
    7273 
    73 }} // of namespace classifier and namespace theplu
     74}}} // of namespace classifier, yat, and theplu
    7475
    7576#endif
  • trunk/yat/classifier/IRRank.h

    r675 r680  
    1 #ifndef _theplu_classifier_ir_rank_
    2 #define _theplu_classifier_ir_rank_
     1#ifndef _theplu_yat_classifier_ir_rank_
     2#define _theplu_yat_classifier_ir_rank_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/InputRanker.h"
    28 #include "yat/classifier/IRRetrieve.h"
     27#include "InputRanker.h"
     28#include "IRRetrieve.h"
    2929
    3030namespace theplu {
     31namespace yat {
    3132namespace classifier { 
    3233
     
    5051
    5152
    52 }} // of namespace classifier and namespace theplu
     53}}} // of namespace classifier, yat, and theplu
    5354
    5455#endif
  • trunk/yat/classifier/IRRetrieve.h

    r675 r680  
    1 #ifndef _theplu_classifier_ir_retrieve_
    2 #define _theplu_classifier_ir_retrieve_
     1#ifndef _theplu_yat_classifier_ir_retrieve_
     2#define _theplu_yat_classifier_ir_retrieve_
    33
    44// $Id$
     
    2626
    2727namespace theplu {
     28namespace yat {
    2829namespace classifier { 
    2930
     
    5152
    5253
    53 }} // of namespace classifier and namespace theplu
     54}}} // of namespace classifier, yat, and theplu
    5455
    5556#endif
  • trunk/yat/classifier/IRScore.h

    r675 r680  
    1 #ifndef _theplu_classifier_ir_score_
    2 #define _theplu_classifier_ir_score_
     1#ifndef _theplu_yat_classifier_ir_score_
     2#define _theplu_yat_classifier_ir_score_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/InputRanker.h"
     27#include "InputRanker.h"
    2828
    2929namespace theplu {
     30namespace yat {
    3031namespace classifier { 
    3132
     
    4950
    5051
    51 }} // of namespace classifier and namespace theplu
     52}}} // of namespace classifier, yat, and theplu
    5253
    5354#endif
  • trunk/yat/classifier/InputRanker.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/InputRanker.h"
    25 
    26 #include "yat/classifier/MatrixLookup.h"
    27 #include "yat/classifier/MatrixLookupWeighted.h"
    28 #include "yat/classifier/DataLookup1D.h"
    29 #include "yat/classifier/DataLookupWeighted1D.h"
    30 #include "yat/classifier/Target.h"
     24#include "InputRanker.h"
     25#include "MatrixLookup.h"
     26#include "MatrixLookupWeighted.h"
     27#include "DataLookup1D.h"
     28#include "DataLookupWeighted1D.h"
     29#include "Target.h"
    3130#include "yat/statistics/ROC.h"
    3231#include "yat/utility/stl_utility.h"
    3332
     33#include <cmath>
    3434#include <functional>
    3535#include <utility>
    3636#include <vector>
    3737
    38 #include <cmath>
    39 
    4038namespace theplu {
     39namespace yat {
    4140namespace classifier { 
    4241
     
    9998
    10099
    101 }} // of namespace classifier and namespace theplu
     100}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/InputRanker.h

    r675 r680  
    1 #ifndef _theplu_classifier_inputranker_
    2 #define _theplu_classifier_inputranker_
     1#ifndef _theplu_yat_classifier_inputranker_
     2#define _theplu_yat_classifier_inputranker_
    33
    44// $Id$
     
    2828
    2929namespace theplu {
     30namespace yat {
    3031namespace statistics {
    3132  class Score;
     
    9394
    9495
    95 }} // of namespace classifier and namespace theplu
     96}}} // of namespace classifier, yat, and theplu
    9697
    9798#endif
  • trunk/yat/classifier/Kernel.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/Kernel.h"
    25 
    26 #include "yat/classifier/DataLookup1D.h"
    27 #include "yat/classifier/DataLookupWeighted1D.h"
    28 #include "yat/classifier/KernelFunction.h"
    29 #include "yat/classifier/MatrixLookup.h"
     24#include "Kernel.h"
     25#include "DataLookup1D.h"
     26#include "DataLookupWeighted1D.h"
     27#include "KernelFunction.h"
     28#include "MatrixLookup.h"
    3029
    3130#include <vector>
    3231
    3332namespace theplu {
     33namespace yat {
    3434namespace classifier {
    3535
     
    107107  }
    108108
    109 }} // of namespace classifier and namespace theplu
     109}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/Kernel.h

    r675 r680  
    1 #ifndef _theplu_classifier_kernel_
    2 #define _theplu_classifier_kernel_
     1#ifndef _theplu_yat_classifier_kernel_
     2#define _theplu_yat_classifier_kernel_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/DataLookup2D.h"
    28 #include "yat/classifier/KernelFunction.h"
    29 #include "yat/classifier/MatrixLookupWeighted.h"
     27#include "DataLookup2D.h"
     28#include "KernelFunction.h"
     29#include "MatrixLookupWeighted.h"
    3030
    3131#include <cctype>
     
    3333
    3434namespace theplu {
     35namespace yat {
    3536namespace classifier {
    3637
     
    198199  }; // class Kernel
    199200
    200 }} // of namespace classifier and namespace theplu
     201}}} // of namespace classifier, yat, and theplu
    201202
    202203#endif
  • trunk/yat/classifier/KernelFunction.h

    r675 r680  
    1 #ifndef _theplu_classifier_kernel_function_
    2 #define _theplu_classifier_kernel_function_
     1#ifndef _theplu_yat_classifier_kernel_function_
     2#define _theplu_yat_classifier_kernel_function_
    33
    44// $Id$
     
    2626
    2727namespace theplu {
     28namespace yat {
    2829namespace classifier {
    2930  class DataLookup1D;
     
    7475  }; // class KernelFunction
    7576
    76 }} // of namespace classifier and namespace theplu
     77}}} // of namespace classifier, yat, and theplu
    7778
    7879#endif
  • trunk/yat/classifier/KernelLookup.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/KernelLookup.h"
    25 #include "yat/classifier/DataLookup2D.h"
    26 #include "yat/classifier/MatrixLookup.h"
    27 #include "yat/classifier/MatrixLookupWeighted.h"
    28 
     24#include "KernelLookup.h"
     25#include "DataLookup2D.h"
     26#include "MatrixLookup.h"
     27#include "MatrixLookupWeighted.h"
    2928
    3029#include <cassert>
     
    3433
    3534namespace theplu {
     35namespace yat {
    3636namespace classifier { 
    3737
     
    263263  }
    264264
    265 }} // of namespace classifier and namespace theplu
     265}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/KernelLookup.h

    r675 r680  
    1 #ifndef _theplu_classifier_kernel_lookup_
    2 #define _theplu_classifier_kernel_lookup_
     1#ifndef _theplu_yat_classifier_kernel_lookup_
     2#define _theplu_yat_classifier_kernel_lookup_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/Kernel.h"
    28 #include "yat/classifier/DataLookup2D.h"
    29 #include "yat/classifier/MatrixLookup.h"
     27#include "Kernel.h"
     28#include "DataLookup2D.h"
     29#include "MatrixLookup.h"
    3030
    3131#include <vector>
    3232
    3333namespace theplu {
     34namespace yat {
    3435namespace classifier {
    3536
     
    275276  }; // class KernelLookup
    276277
    277 }} // of namespace classifier and namespace theplu
     278}}} // of namespace classifier, yat, and theplu
    278279
    279280#endif
  • trunk/yat/classifier/Kernel_MEV.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/Kernel_MEV.h"
    25 
    26 #include "yat/classifier/DataLookup1D.h"
    27 #include "yat/classifier/DataLookupWeighted1D.h"
     24#include "Kernel_MEV.h"
     25#include "DataLookup1D.h"
     26#include "DataLookupWeighted1D.h"
    2827
    2928namespace theplu {
     29namespace yat {
    3030namespace classifier { 
    3131
     
    8383
    8484
    85 }} // of namespace classifier and namespace theplu
     85}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/Kernel_MEV.h

    r675 r680  
    1 #ifndef _theplu_classifier_kernel_mev_
    2 #define _theplu_classifier_kernel_mev_
     1#ifndef _theplu_yat_classifier_kernel_mev_
     2#define _theplu_yat_classifier_kernel_mev_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/DataLookup1D.h"
    28 #include "yat/classifier/Kernel.h"
    29 #include "yat/classifier/KernelFunction.h"
     27#include "DataLookup1D.h"
     28#include "Kernel.h"
     29#include "KernelFunction.h"
    3030
    3131namespace theplu {
     32namespace yat {
    3233namespace classifier {
    3334  class MatrixLookup;
     
    123124  }; // class Kernel_MEV
    124125
    125 }} // of namespace classifier and namespace theplu
     126}}} // of namespace classifier, yat, and theplu
    126127
    127128#endif
  • trunk/yat/classifier/Kernel_SEV.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/Kernel_SEV.h"
    25 
    26 #include "yat/classifier/DataLookup1D.h"
    27 #include "yat/classifier/DataLookupWeighted1D.h"
    28 #include "yat/classifier/Kernel.h"
    29 #include "yat/classifier/KernelFunction.h"
    30 #include "yat/classifier/MatrixLookup.h"
     24#include "Kernel_SEV.h"
     25#include "DataLookup1D.h"
     26#include "DataLookupWeighted1D.h"
     27#include "Kernel.h"
     28#include "KernelFunction.h"
     29#include "MatrixLookup.h"
    3130#include "yat/utility/matrix.h"
    3231
    3332namespace theplu {
     33namespace yat {
    3434namespace classifier { 
    3535
     
    100100
    101101
    102 }} // of namespace classifier and namespace theplu
     102}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/Kernel_SEV.h

    r675 r680  
    1 #ifndef _theplu_classifier_kernel_sev_
    2 #define _theplu_classifier_kernel_sev_
     1#ifndef _theplu_yat_classifier_kernel_sev_
     2#define _theplu_yat_classifier_kernel_sev_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/Kernel.h"
     27#include "Kernel.h"
    2828#include "yat/utility/matrix.h"
    2929
    3030namespace theplu {
     31namespace yat {
    3132namespace classifier {
    3233
     
    119120  }; // class Kernel_SEV
    120121
    121 }} // of namespace classifier and namespace theplu
     122}}} // of namespace classifier, yat, and theplu
    122123
    123124#endif
  • trunk/yat/classifier/MatrixLookup.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/MatrixLookup.h"
    25 
     24#include "MatrixLookup.h"
    2625#include "yat/utility/matrix.h"
    2726
     
    3332
    3433namespace theplu {
     34namespace yat {
    3535namespace classifier {
    3636
     
    223223
    224224
    225 }} // of namespace classifier and namespace theplu
     225}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/MatrixLookup.h

    r675 r680  
    1 #ifndef _theplu_classifier_matrix_lookup_
    2 #define _theplu_classifier_matrix_lookup_
     1#ifndef _theplu_yat_classifier_matrix_lookup_
     2#define _theplu_yat_classifier_matrix_lookup_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/DataLookup2D.h"
     27#include "DataLookup2D.h"
    2828#include "yat/utility/matrix.h"
    2929
     
    3131
    3232namespace theplu {
     33namespace yat {
    3334namespace classifier { 
    34 
    35  
    3635
    3736  ///
     
    257256  std::ostream& operator<< (std::ostream& s, const MatrixLookup&);
    258257
    259 }} // of namespace classifier and namespace theplu
     258}}} // of namespace classifier, yat, and theplu
    260259
    261260#endif
  • trunk/yat/classifier/MatrixLookupWeighted.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/MatrixLookupWeighted.h"
    25 
     24#include "MatrixLookupWeighted.h"
    2625#include "yat/utility/matrix.h"
    2726
     
    3332
    3433namespace theplu {
     34namespace yat {
    3535namespace classifier {
    3636
     
    302302
    303303
    304 }} // of namespace classifier and namespace theplu
     304}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/MatrixLookupWeighted.h

    r675 r680  
    1 #ifndef _theplu_classifier_matrix_lookup_weighted_
    2 #define _theplu_classifier_matrix_lookup_weighted_
     1#ifndef _theplu_yat_classifier_matrix_lookup_weighted_
     2#define _theplu_yat_classifier_matrix_lookup_weighted_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/DataLookup2D.h"
     27#include "DataLookup2D.h"
    2828#include "yat/utility/matrix.h"
    2929
     
    3131
    3232namespace theplu {
     33namespace yat {
    3334namespace classifier { 
    3435
    35  
    3636  ///
    3737  /// A MatrixLookupWeighted is very similar to a MatrixLookup, but
     
    290290  std::ostream& operator<< (std::ostream& s, const MatrixLookupWeighted&);
    291291
    292 }} // of namespace classifier and namespace theplu
     292}}} // of namespace classifier, yat, and theplu
    293293
    294294#endif
  • trunk/yat/classifier/NBC.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/NBC.h"
    25 
    26 #include "yat/classifier/DataLookup2D.h"
    27 #include "yat/classifier/MatrixLookup.h"
    28 #include "yat/classifier/MatrixLookupWeighted.h"
    29 #include "yat/classifier/Target.h"
     24#include "NBC.h"
     25#include "DataLookup2D.h"
     26#include "MatrixLookup.h"
     27#include "MatrixLookupWeighted.h"
     28#include "Target.h"
    3029#include "yat/statistics/AveragerWeighted.h"
    3130#include "yat/utility/matrix.h"
     
    3433
    3534namespace theplu {
     35namespace yat {
    3636namespace classifier {
    3737
     
    100100
    101101
    102 }} // of namespace classifier and namespace theplu
     102}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/NBC.h

    r675 r680  
    1 #ifndef _theplu_classifier_nbc_
    2 #define _theplu_classifier_nbc_
     1#ifndef _theplu_yat_classifier_nbc_
     2#define _theplu_yat_classifier_nbc_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/SupervisedClassifier.h"
     27#include "SupervisedClassifier.h"
    2828#include "yat/utility/matrix.h"
    2929
    3030namespace theplu {
     31namespace yat {
    3132namespace classifier { 
    3233
     
    8485  };
    8586 
    86 }} // of namespace classifier and namespace theplu
     87}}} // of namespace classifier, yat, and theplu
    8788
    8889#endif
  • trunk/yat/classifier/NCC.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/NCC.h"
    25 
    26 #include "yat/classifier/DataLookup1D.h"
    27 #include "yat/classifier/DataLookup2D.h"
    28 #include "yat/classifier/MatrixLookup.h"
    29 #include "yat/classifier/MatrixLookupWeighted.h"
    30 #include "yat/classifier/Target.h"
     24#include "NCC.h"
     25#include "DataLookup1D.h"
     26#include "DataLookup2D.h"
     27#include "MatrixLookup.h"
     28#include "MatrixLookupWeighted.h"
     29#include "Target.h"
    3130#include "yat/utility/matrix.h"
    3231#include "yat/utility/vector.h"
     
    4039
    4140namespace theplu {
     41namespace yat {
    4242namespace classifier {
    4343
     
    165165//  }
    166166
    167 }} // of namespace classifier and namespace theplu
     167}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/NCC.h

    r675 r680  
    1 #ifndef _theplu_classifier_ncc_
    2 #define _theplu_classifier_ncc_
     1#ifndef _theplu_yat_classifier_ncc_
     2#define _theplu_yat_classifier_ncc_
    33
    44// $Id$
     
    2626
    2727#include "yat/utility/matrix.h"
    28 
    29 #include "yat/classifier/SupervisedClassifier.h"
     28#include "SupervisedClassifier.h"
    3029
    3130#include <map>
    3231
    3332namespace theplu {
     33namespace yat {
    3434
    3535  namespace utlitity {
     
    114114 
    115115 
    116 }} // of namespace classifier and namespace theplu
     116}}} // of namespace classifier, yat, and theplu
    117117
    118118#endif
  • trunk/yat/classifier/PolynomialKernelFunction.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/PolynomialKernelFunction.h"
    25 #include "yat/classifier/DataLookup1D.h"
    26 #include "yat/classifier/DataLookupWeighted1D.h"
    27 
     24#include "PolynomialKernelFunction.h"
     25#include "DataLookup1D.h"
     26#include "DataLookupWeighted1D.h"
    2827#include "yat/statistics/AveragerPairWeighted.h"
    2928
    3029#include <cmath>
    3130
    32 
    3331namespace theplu {
     32namespace yat {
    3433namespace classifier { 
    3534
     
    7271
    7372
    74 }} // of namespace cpptools and namespace theplu
     73}}} // of namespace cpptools, yat, and theplu
  • trunk/yat/classifier/PolynomialKernelFunction.h

    r675 r680  
    1 #ifndef _theplu_classifier_polynomial_kernel_function_
    2 #define _theplu_classifier_polynomial_kernel_function_
     1#ifndef _theplu_yat_classifier_polynomial_kernel_function_
     2#define _theplu_yat_classifier_polynomial_kernel_function_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/KernelFunction.h"
    28 #include "yat/classifier/DataLookup1D.h"
    29 
     27#include "KernelFunction.h"
     28#include "DataLookup1D.h"
    3029
    3130#include <cmath>
    3231
    33 
    3432namespace theplu {
     33namespace yat {
    3534namespace classifier {
    3635
     
    8685  }; // class PolynomialKernelFunction
    8786
    88 }} // of namespace classifier and namespace theplu
     87}}} // of namespace classifier, yat, and theplu
    8988
    9089#endif
  • trunk/yat/classifier/SVM.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/SVM.h"
    25 
    26 #include "yat/classifier/DataLookup2D.h"
     24#include "SVM.h"
     25#include "DataLookup2D.h"
    2726#include "yat/random/random.h"
    2827#include "yat/statistics/Averager.h"
     
    3837#include <vector>
    3938
    40 
    4139namespace theplu {
     40namespace yat {
    4241namespace classifier { 
    4342
     
    240239
    241240
    242   bool SVM::choose(const theplu::utility::vector& E)
     241  bool SVM::choose(const theplu::yat::utility::vector& E)
    243242  {
    244243    // First check for violation among SVs
     
    374373
    375374
    376 }} // of namespace classifier and namespace theplu
     375}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/SVM.h

    r675 r680  
    1 #ifndef _theplu_classifier_svm_
    2 #define _theplu_classifier_svm_
     1#ifndef _theplu_yat_classifier_svm_
     2#define _theplu_yat_classifier_svm_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/KernelLookup.h"
    28 #include "yat/classifier/SupervisedClassifier.h"
    29 #include "yat/classifier/SVindex.h"
    30 #include "yat/classifier/Target.h"
     27#include "KernelLookup.h"
     28#include "SupervisedClassifier.h"
     29#include "SVindex.h"
     30#include "Target.h"
    3131#include "yat/utility/vector.h"
    3232
     
    3434#include <vector>
    3535
    36 
    3736namespace theplu {
     37namespace yat {
    3838namespace classifier { 
    3939
     
    107107    /// @return output
    108108    ///
    109     inline const theplu::utility::vector& output(void) const { return output_; }
     109    inline const theplu::yat::utility::vector&
     110    output(void) const { return output_; }
    110111
    111112    ///
     
    192193    ///  can be found
    193194    ///
    194     bool choose(const theplu::utility::vector&);
     195    bool choose(const theplu::yat::utility::vector&);
    195196
    196197    ///
     
    217218  };
    218219
    219 }} // of namespace classifier and namespace theplu
     220}}} // of namespace classifier, yat, and theplu
    220221
    221222#endif
  • trunk/yat/classifier/SVindex.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/SVindex.h"
    25 
    26 #include "yat/classifier/DataLookup2D.h"
     24#include "SVindex.h"
     25#include "DataLookup2D.h"
    2726#include "yat/random/random.h"
    2827#include "yat/statistics/Averager.h"
     
    3837#include <vector>
    3938
    40 
    4139namespace theplu {
     40namespace yat {
    4241namespace classifier { 
    4342
     
    158157  }
    159158
    160 }} // of namespace classifier and namespace theplu
     159}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/SVindex.h

    r675 r680  
    1 #ifndef _theplu_classifier_sv_index_
    2 #define _theplu_classifier_sv_index_
     1#ifndef _theplu_yat_classifier_sv_index_
     2#define _theplu_yat_classifier_sv_index_
    33
    44// $Id$
     
    3030#include <vector>
    3131
    32 
    3332namespace theplu {
     33namespace yat {
    3434namespace classifier { 
    3535
     
    110110#endif /* DOXYGEN_SHOULD_SKIP_THIS */
    111111
    112 }} // of namespace classifier and namespace theplu
     112}}} // of namespace classifier, yat, and theplu
    113113
    114114#endif
  • trunk/yat/classifier/Sampler.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/Sampler.h"
    25 #include "yat/classifier/Target.h"
     24#include "Sampler.h"
     25#include "Target.h"
    2626
    2727namespace theplu {
     28namespace yat {
    2829namespace classifier { 
    2930
     
    3738  }
    3839
    39 
    40 }} // of namespace classifier and namespace theplu
     40}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/Sampler.h

    r675 r680  
    1 #ifndef _theplu_classifier_sampler_
    2 #define _theplu_classifier_sampler_
     1#ifndef _theplu_yat_classifier_sampler_
     2#define _theplu_yat_classifier_sampler_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/Target.h"
     27#include "Target.h"
    2828
    2929#include <vector>
    3030
    3131namespace theplu {
     32namespace yat {
    3233namespace classifier { 
    3334
     
    111112  };
    112113
    113 }} // of namespace classifier and namespace theplu
     114}}} // of namespace classifier, yat, and theplu
    114115
    115116#endif
  • trunk/yat/classifier/SubsetGenerator.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/SubsetGenerator.h"
    25 #include "yat/classifier/DataLookup2D.h"
    26 #include "yat/classifier/FeatureSelector.h"
    27 #include "yat/classifier/KernelLookup.h"
    28 #include "yat/classifier/MatrixLookup.h"
    29 #include "yat/classifier/MatrixLookupWeighted.h"
    30 #include "yat/classifier/Target.h"
     24#include "SubsetGenerator.h"
     25#include "DataLookup2D.h"
     26#include "FeatureSelector.h"
     27#include "KernelLookup.h"
     28#include "MatrixLookup.h"
     29#include "MatrixLookupWeighted.h"
     30#include "Target.h"
    3131
    3232#include <algorithm>
     
    3737
    3838namespace theplu {
     39namespace yat {
    3940namespace classifier { 
    4041
     
    206207  }
    207208
    208 }} // of namespace classifier and namespace theplu
     209}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/SubsetGenerator.h

    r675 r680  
    1 #ifndef _theplu_classifier_subset_generator_
    2 #define _theplu_classifier_subset_generator_
     1#ifndef _theplu_yat_classifier_subset_generator_
     2#define _theplu_yat_classifier_subset_generator_
    33
    44// $Id$
     
    2525*/
    2626
    27 #include "yat/classifier/Target.h"
    28 #include "yat/classifier/Sampler.h"
     27#include "Target.h"
     28#include "Sampler.h"
    2929
    3030#include <vector>
    3131
    3232namespace theplu {
     33namespace yat {
    3334namespace classifier { 
    3435  class DataLookup2D;
     
    164165  };
    165166
    166 }} // of namespace classifier and namespace theplu
     167}}} // of namespace classifier, yat, and theplu
    167168
    168169#endif
  • trunk/yat/classifier/SupervisedClassifier.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/SupervisedClassifier.h"
    25 #include "yat/classifier/InputRanker.h"
     24#include "SupervisedClassifier.h"
     25#include "InputRanker.h"
    2626
    2727namespace theplu {
     28namespace yat {
    2829namespace classifier {
    2930
     
    3334  }
    3435
    35   SupervisedClassifier::~SupervisedClassifier()
     36  SupervisedClassifier::~SupervisedClassifier(void)
    3637  {
    3738  }
    3839
    39 
    40 }}
     40}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/SupervisedClassifier.h

    r675 r680  
    1 #ifndef _theplu_classifier_supervisedclassifier_
    2 #define _theplu_classifier_supervisedclassifier_
     1#ifndef _theplu_yat_classifier_supervisedclassifier_
     2#define _theplu_yat_classifier_supervisedclassifier_
    33
    44// $Id$
     
    2828
    2929namespace theplu {
     30namespace yat {
    3031
    3132  namespace utility {
     
    4748  public:
    4849    ///
    49     /// Constructor. Taking a Target object.
     50    /// @brief Constructor taking a Target object.
    5051    ///
    5152    SupervisedClassifier(const Target&);
     
    5354
    5455    ///
    55     /// Destructor
     56    /// @brief Destructor
    5657    ///
    57     virtual ~SupervisedClassifier();
     58    virtual ~SupervisedClassifier(void);
    5859
    5960    ///
     
    9091  }; 
    9192 
    92 }} // of namespace classifier and namespace theplu
     93}}} // of namespace classifier, yat, and theplu
    9394
    9495#endif
  • trunk/yat/classifier/Target.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/Target.h"
     24#include "Target.h"
    2525#include "yat/random/random.h"
    2626#include "yat/utility/stl_utility.h"
     
    3737
    3838namespace theplu {
     39namespace yat {
    3940namespace classifier {
    4041
     
    160161
    161162
    162 }} // of namespace classifier and namespace theplu
     163}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/Target.h

    r675 r680  
    1 #ifndef _theplu_classifier_target_
    2 #define _theplu_classifier_target_
     1#ifndef _theplu_yat_classifier_target_
     2#define _theplu_yat_classifier_target_
    33
    44// $Id$
     
    2828
    2929#include <cassert>
     30#include <iosfwd>
    3031#include <map>
    3132#include <string>
    3233#include <vector>
    3334
    34 #include <iostream>
    35 
    3635namespace theplu {
     36namespace yat {
    3737namespace classifier { 
    3838
     
    171171  std::ostream& operator<<(std::ostream&, const Target& );
    172172
    173 }} // of namespace classifier and namespace theplu
     173}}} // of namespace classifier, yat, and theplu
    174174
    175175#endif
  • trunk/yat/classifier/utility.cc

    r675 r680  
    2222*/
    2323
    24 #include "yat/classifier/utility.h"
    25 
    26 
    27 #include "yat/classifier/DataLookup1D.h"
     24#include "utility.h"
     25#include "DataLookup1D.h"
    2826#include "yat/utility/vector.h"
    2927
    3028
    3129namespace theplu {
     30namespace yat {
    3231namespace classifier {
    3332
     
    3938  }
    4039
    41 }} // of namespace classifier and namespace theplu
     40}}} // of namespace classifier, yat, and theplu
  • trunk/yat/classifier/utility.h

    r675 r680  
    1 #ifndef _theplu_classifier_utility_
    2 #define _theplu_classifier_utility_
     1#ifndef _theplu_yat_classifier_utility_
     2#define _theplu_yat_classifier_utility_
    33
    44// $Id$
     
    2626
    2727namespace theplu {
     28namespace yat {
    2829
    2930  namespace utility {
     
    4041  void convert(const DataLookup1D&, utility::vector&);
    4142
    42 
    43 }} // of namespace classifier and namespace theplu
     43}}} // of namespace classifier, yat, and theplu
    4444
    4545#endif
Note: See TracChangeset for help on using the changeset viewer.