Ignore:
Timestamp:
Aug 31, 2006, 10:52:02 AM (15 years ago)
Author:
Jari Häkkinen
Message:

Removed gslapi namespace and put the code into utility namespace.
Move #ifndef _header_ idiom to top of touched header files.
Removed unneccesary #includes, and added needed #includes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/matrix_lookup_test.cc

    r537 r616  
    11// $Id$
    22
    3 #include <c++_tools/gslapi/matrix.h>
     3#include <c++_tools/utility/matrix.h>
    44#include <c++_tools/classifier/MatrixLookup.h>
    55
     
    1010using namespace theplu;
    1111
    12 gslapi::matrix matrix(size_t n);
     12utility::matrix matrix(size_t n);
    1313
    1414int main(const int argc,const char* argv[])
     
    2727
    2828  *error << "\nTesting MatrixLookup" << std::endl;
    29   *error << "MatrixLookup::MatrixLookup(const gslapi::matrix& data)...";
    30   gslapi::matrix gsl_m1(matrix(2));
     29  *error << "MatrixLookup::MatrixLookup(const utility::matrix& data)...";
     30  utility::matrix gsl_m1(matrix(2));
    3131  classifier::MatrixLookup m1(gsl_m1);
    3232  if (m1.rows()!=gsl_m1.rows() || m1.columns()!=gsl_m1.columns() ||
     
    4040
    4141 
    42   *error << "MatrixLookup::MatrixLookup(const gslapi::matrix&,\n"
     42  *error << "MatrixLookup::MatrixLookup(const utility::matrix&,\n"
    4343         << "                           const std::vector<size_t>&,\n"
    4444         << "                           const std::vector<size_t>&)...";
    45   gslapi::matrix gsl_m2(matrix(4));
     45  utility::matrix gsl_m2(matrix(4));
    4646  std::vector<size_t> index_odd;
    4747  index_odd.push_back(1);
     
    6161    *error << "Ok" << std::endl;
    6262
    63   *error << "MatrixLookup::MatrixLookup(const gslapi::matrix&,\n"
     63  *error << "MatrixLookup::MatrixLookup(const utility::matrix&,\n"
    6464         << "                           const std::vector<size_t>&,\n"
    6565         << "                           const bool)...";
     
    152152}
    153153
    154 gslapi::matrix matrix(size_t n)
     154utility::matrix matrix(size_t n)
    155155{
    156   gslapi::matrix res(n,n);
     156  utility::matrix res(n,n);
    157157  for (size_t i=0;i<n;i++)
    158158    for (size_t j=0;j<n;j++)
Note: See TracChangeset for help on using the changeset viewer.