Ignore:
Timestamp:
Feb 22, 2008, 4:29:56 PM (14 years ago)
Author:
Peter
Message:

fixes #308

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/matrix_lookup_test.cc

    r1000 r1121  
    2222*/
    2323
    24 #include "yat/utility/matrix.h"
     24#include "yat/utility/Matrix.h"
    2525#include "yat/classifier/MatrixLookup.h"
    2626
     
    3131using namespace theplu::yat;
    3232
    33 utility::matrix matrix(size_t n);
     33utility::Matrix matrix(size_t n);
    3434
    3535int main(const int argc,const char* argv[])
     
    4848
    4949  *error << "\nTesting MatrixLookup" << std::endl;
    50   *error << "MatrixLookup::MatrixLookup(const utility::matrix& data)...";
    51   utility::matrix gsl_m1(matrix(2));
     50  *error << "MatrixLookup::MatrixLookup(const utility::Matrix& data)...";
     51  utility::Matrix gsl_m1(matrix(2));
    5252  classifier::MatrixLookup m1(gsl_m1);
    5353  if (m1.rows()!=gsl_m1.rows() || m1.columns()!=gsl_m1.columns() ||
     
    6161
    6262 
    63   *error << "MatrixLookup::MatrixLookup(const utility::matrix&,\n"
     63  *error << "MatrixLookup::MatrixLookup(const utility::Matrix&,\n"
    6464         << "                           const std::vector<size_t>&,\n"
    6565         << "                           const std::vector<size_t>&)...";
    66   utility::matrix gsl_m2(matrix(4));
     66  utility::Matrix gsl_m2(matrix(4));
    6767  std::vector<size_t> index_odd;
    6868  index_odd.push_back(1);
     
    8282    *error << "Ok" << std::endl;
    8383
    84   *error << "MatrixLookup::MatrixLookup(const utility::matrix&,\n"
     84  *error << "MatrixLookup::MatrixLookup(const utility::Matrix&,\n"
    8585         << "                           const std::vector<size_t>&,\n"
    8686         << "                           const bool)...";
     
    173173}
    174174
    175 utility::matrix matrix(size_t n)
     175utility::Matrix matrix(size_t n)
    176176{
    177   utility::matrix res(n,n);
     177  utility::Matrix res(n,n);
    178178  for (size_t i=0;i<n;i++)
    179179    for (size_t j=0;j<n;j++)
Note: See TracChangeset for help on using the changeset viewer.