Changeset 1497


Ignore:
Timestamp:
Sep 12, 2008, 8:30:41 PM (12 years ago)
Author:
Peter
Message:

changing name to normalizer - closes #416

Location:
trunk
Files:
4 edited
6 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/configure.ac

    r1487 r1497  
    253253     yat/Makefile
    254254     yat/classifier/Makefile
    255      yat/normalization/Makefile
     255     yat/normalizer/Makefile
    256256     yat/random/Makefile
    257257     yat/regression/Makefile

  • trunk/doc/namespaces.doxygen

    r1487 r1497  
    6161
    6262///
    63 /// @namespace theplu::yat::normalization
     63/// @namespace theplu::yat::normalizer
    6464///
    6565/// @brief Normalization of data

  • trunk/test/normalization_test.cc

    r1496 r1497  
    2222#include "Suite.h"
    2323
    24 #include "yat/normalization/Centralizer.h"
    25 #include "yat/normalization/ColumnNormalizer.h"
    26 #include "yat/normalization/QuantileNormalizer.h"
    27 #include "yat/normalization/Spearman.h"
     24#include "yat/normalizer/Centralizer.h"
     25#include "yat/normalizer/ColumnNormalizer.h"
     26#include "yat/normalizer/QuantileNormalizer.h"
     27#include "yat/normalizer/Spearman.h"
    2828
    2929#include "yat/utility/Matrix.h"
    … …  
    5858  vec.push_back(2);
    5959  vec.push_back(3);
    60   normalization::Centralizer<> c;
     60  normalizer::Centralizer<> c;
    6161  c(vec.begin(), vec.end(), vec.begin());
    6262  for (size_t i=0; i<vec.size(); ++i)
    … …  
    6767void test_column_normalize(test::Suite& suite)
    6868{
    69   using namespace normalization;
     69  using namespace normalizer;
    7070  suite.err() << "Testing ColumnNormalizer\n";
    7171 
    … …  
    9696  m(1,0) = 2;
    9797  m(1,1) = 4;
    98   normalization::QuantileNormalizer qn;
     98  normalizer::QuantileNormalizer qn;
    9999  qn(m, m);
    100100  suite.err() << "Testing m(0,0)\n";
    … …  
    111111{
    112112  suite.err() << "Testing Spearman\n";
    113   normalization::Spearman spearman;
     113  normalizer::Spearman spearman;
    114114  std::vector<double> vec;
    115115  vec.push_back(0);

  • trunk/yat/Makefile.am

    r1487 r1497  
    2222# along with yat. If not, see <http://www.gnu.org/licenses/>.
    2323
    24 SUBDIRS = classifier normalization random regression statistics utility
     24SUBDIRS = classifier normalizer random regression statistics utility
    2525
    2626lib_LTLIBRARIES = libyat.la
    … …  
    3535libyat_la_LIBADD = \
    3636  classifier/libclassifier.la \
    37   normalization/libnormalization.la \
     37  normalizer/libnormalizer.la \
    3838  random/librandom.la \
    3939  regression/libregression.la \

  • trunk/yat/normalizer/Centralizer.h

    r1496 r1497  
    1 #ifndef _theplu_yat_normalization_centralizer_
    2 #define _theplu_yat_normalization_centralizer_
     1#ifndef _theplu_yat_normalizer_centralizer_
     2#define _theplu_yat_normalizer_centralizer_
    33
    44/*
    … …  
    2828namespace theplu {
    2929namespace yat {
    30 namespace normalization {
     30namespace normalizer {
    3131
    3232  /**
    … …  
    8282  };
    8383
    84 }}} // end of namespace normalization, yat and thep
     84}}} // end of namespace normalizer, yat and thep
    8585#endif

  • trunk/yat/normalizer/ColumnNormalizer.h

    r1496 r1497  
    1 #ifndef _theplu_yat_normalization_column_normalizer_
    2 #define _theplu_yat_normalization_column_normalizer_
     1#ifndef _theplu_yat_normalizer_column_normalizer_
     2#define _theplu_yat_normalizer_column_normalizer_
    33
    44/*
    … …  
    2525namespace theplu {
    2626namespace yat {
    27 namespace normalization {
     27namespace normalizer {
    2828
    2929  /**
    … …  
    7676
    7777
    78 }}} // end of namespace normalization, yat and thep
     78}}} // end of namespace normalizer, yat and thep
    7979#endif

  • trunk/yat/normalizer/Makefile.am

    r1496 r1497  
    2020# along with yat. If not, see <http://www.gnu.org/licenses/>.
    2121
    22 noinst_LTLIBRARIES = libnormalization.la
    23 libnormalization_la_SOURCES = QuantileNormalizer.cc
     22noinst_LTLIBRARIES = libnormalizer.la
     23libnormalizer_la_SOURCES = QuantileNormalizer.cc
    2424
    25 include_normalizationdir = $(includedir)/yat/normalization
     25include_normalizerdir = $(includedir)/yat/normalizer
    2626
    27 include_normalization_HEADERS = Centralizer.h ColumnNormalizer.h \
     27include_normalizer_HEADERS = Centralizer.h ColumnNormalizer.h \
    2828  QuantileNormalizer.h Spearman.h

  • trunk/yat/normalizer/QuantileNormalizer.cc

    r1496 r1497  
    3333namespace theplu {
    3434namespace yat {
    35 namespace normalization {
     35namespace normalizer {
    3636
    3737  void QuantileNormalizer::operator()(const utility::Matrix& data,

  • trunk/yat/normalizer/QuantileNormalizer.h

    r1496 r1497  
    1 #ifndef _theplu_yat_normalization_quantile_normalizer_
    2 #define _theplu_yat_normalization_quantile_normalizer_
     1#ifndef _theplu_yat_normalizer_quantile_normalizer_
     2#define _theplu_yat_normalizer_quantile_normalizer_
    33
    44/*
    … …  
    2626  class Matrix;
    2727}
    28 namespace normalization {
     28namespace normalizer {
    2929
    3030  /**
    31      \brief Perform quantile normalization
     31     \brief Perform quantile normalizer
    3232
    3333     \since New in yat 0.5
    … …  
    4141       in step 1. This results in a \a matrix in which each column has
    4242       the same distribution of data, and the rank of an element
    43        within a column is preserved in the normalization.
     43       within a column is preserved in the normalizer.
    4444
    4545       \note Number of rows in \a matrix and \a result must match.
    … …  
    4949  };
    5050
    51 }}} // end of namespace normalization, yat and thep
     51}}} // end of namespace normalizer, yat and thep
    5252#endif

  • trunk/yat/normalizer/Spearman.h

    r1496 r1497  
    1 #ifndef _theplu_yat_normalization_spearman_
    2 #define _theplu_yat_normalization_spearman_
     1#ifndef _theplu_yat_normalizer_spearman_
     2#define _theplu_yat_normalizer_spearman_
    33
    44/*
    … …  
    2828namespace theplu {
    2929namespace yat {
    30 namespace normalization {
     30namespace normalizer {
    3131
    3232  /**
    … …  
    6868  };
    6969
    70 }}} // end of namespace normalization, yat and thep
     70}}} // end of namespace normalizer, yat and thep
    7171#endif
Note: See TracChangeset for help on using the changeset viewer.