Ignore:
Timestamp:
Feb 1, 2008, 5:15:44 AM (15 years ago)
Author:
Peter
Message:

merging branch peter-dev into trunk delta 1008:994

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/matrix_test.cc

    r1000 r1009  
    3636    : m_(i,j,value) {}
    3737
    38   inline theplu::yat::utility::vector
    39   row(const size_t& i) { return theplu::yat::utility::vector(m_,i); }
     38  inline theplu::yat::utility::vectorView
     39  row(const size_t& i) { return m_.row_vec(i); }
    4040
    4141  inline const theplu::yat::utility::matrix& matrix(void) const { return m_; }
     
    258258    for (size_t j=0; j<m5.columns(); ++j)
    259259      m5_sum2+=m5(i,j);
    260   utility::vector v5subrow(m5,3);
     260  utility::vectorView v5subrow(m5,3);
    261261  double v5subrow_sum=0;
    262262  for (size_t i=0; i<v5subrow.size(); ++i) {
     
    280280    for (size_t j=0; j<m5.columns(); ++j)
    281281      m5_sum3+=m5(i,j);
    282   utility::vector v5subcolumn(m5,0,false);
     282  utility::vectorView v5subcolumn = m5.column_vec(0);
    283283  double v5subcolumn_sum=0;
    284284  for (size_t i=0; i<v5subcolumn.size(); ++i) {
     
    332332  *error << "\tthat class member returns a view" << std::endl;
    333333  matrixwrapper mw(5,2);
    334   utility::vector mwrow=mw.row(2);
     334  utility::vectorView mwrow=mw.row(2);
    335335  if (mwrow.gsl_vector_p()->data != &(mw.matrix()(2,0))) {
    336336    ok=false;
Note: See TracChangeset for help on using the changeset viewer.