Changeset 1080 for trunk/yat/classifier


Ignore:
Timestamp:
Feb 13, 2008, 12:49:57 PM (13 years ago)
Author:
Peter
Message:

refs #247, #252, and #267

Location:
trunk/yat/classifier
Files:
4 edited

Legend:

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

    r1062 r1080  
    9595  DataLookup1D::const_iterator DataLookup1D::begin(void) const
    9696  {
    97     typedef utility::Iterator<const DataLookup2D, const double> Iter;
    9897    if (column_vector_)
    99       return const_iterator(Iter(*matrix_, 0, index_), matrix_->columns());
    100     return const_iterator(Iter(*matrix_, index_, 0), 1);
     98      return const_iterator(const_iterator::iterator_type(*matrix_, 0, index_),
     99                            matrix_->columns());
     100    return const_iterator(const_iterator::iterator_type(*matrix_, index_, 0),1);
    101101  }
    102102
     
    104104  DataLookup1D::const_iterator DataLookup1D::end(void) const
    105105  {
    106     typedef utility::Iterator<const DataLookup2D, const double> Iter;
    107106    if (column_vector_)
    108       return const_iterator(Iter(*matrix_, matrix_->rows(), index_),
     107      return const_iterator(const_iterator::iterator_type(*matrix_,
     108                                                          matrix_->rows(),
     109                                                          index_),
    109110                            matrix_->columns());
    110     return const_iterator(Iter(*matrix_, index_+1, 0), 1);
     111    return const_iterator(const_iterator::iterator_type(*matrix_,index_+1,0), 1);
    111112  }
    112113
  • trunk/yat/classifier/DataLookup1D.h

    r1062 r1080  
    2929#include "DataLookup2D.h"
    3030#include "yat/utility/Iterator.h"
     31#include "yat/utility/iterator_traits.h"
    3132#include "yat/utility/StrideIterator.h"
    3233
     
    4950  public:
    5051    /// 'Read Only' iterator
    51     typedef utility::StrideIterator<utility::Iterator<const DataLookup2D,
    52                                                       const double> >
     52    typedef utility::StrideIterator<
     53    utility::Iterator<const DataLookup2D, utility::unweighted_type, const double,
     54                      void, const double> >
    5355    const_iterator;
    5456
  • trunk/yat/classifier/KernelLookup.h

    r1066 r1080  
    3131#include "MatrixLookup.h"
    3232#include "yat/utility/Iterator.h"
     33#include "yat/utility/iterator_traits.h"
    3334#include "yat/utility/StrideIterator.h"
    3435
     
    7071  public:
    7172    /// 'Read Only' iterator
    72     typedef utility::StrideIterator<utility::Iterator<const KernelLookup,
    73                                                       const double> >
     73    typedef utility::StrideIterator<
     74    utility::Iterator<const KernelLookup, utility::unweighted_type, const double,
     75                      void, const double> >
    7476    const_iterator;
    7577
  • trunk/yat/classifier/MatrixLookup.h

    r1066 r1080  
    2929#include "DataLookup2D.h"
    3030#include "yat/utility/Iterator.h"
     31#include "yat/utility/iterator_traits.h"
    3132#include "yat/utility/StrideIterator.h"
    3233
     
    7374  public:
    7475    /// 'Read Only' iterator
    75     typedef utility::StrideIterator<utility::Iterator<const MatrixLookup,
    76                                                       const double> >
     76    typedef utility::StrideIterator<
     77    utility::Iterator<const MatrixLookup, utility::unweighted_type, const double,
     78                      void, const double> >
    7779    const_iterator;
    7880
Note: See TracChangeset for help on using the changeset viewer.