Changeset 1110 for trunk/yat/classifier


Ignore:
Timestamp:
Feb 19, 2008, 11:03:34 PM (13 years ago)
Author:
Peter
Message:

changing name of Iterator and some left-over from prev commit

Location:
trunk/yat/classifier
Files:
5 edited

Legend:

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

    r1083 r1110  
    2828
    2929#include "DataLookup2D.h"
    30 #include "yat/utility/Iterator.h"
     30#include "yat/utility/Container2DIterator.h"
    3131#include "yat/utility/iterator_traits.h"
    3232#include "yat/utility/StrideIterator.h"
     
    5151    /// 'Read Only' iterator
    5252    typedef utility::StrideIterator<
    53     utility::Iterator<const DataLookup2D, const double, void, const double> >
     53    utility::Container2DIterator<const DataLookup2D, const double, void,
     54                                 const double> >
    5455    const_iterator;
    5556
  • trunk/yat/classifier/DataLookupWeighted1D.h

    r1090 r1110  
    5050    /// 'Read Only' iterator
    5151    typedef utility::StrideIterator<
    52     utility::Iterator<const MatrixLookupWeighted,
    53                       const std::pair<double, double>, void,
    54                       const std::pair<double, double>,
    55                       utility::IteratorPolicyWeighted<const MatrixLookupWeighted,
    56                                                       const double,
    57                                                       const double> > >
     52    utility::Container2DIterator<const MatrixLookupWeighted,
     53                                 const std::pair<double, double>, void,
     54                                 const std::pair<double, double>,
     55             utility::IteratorPolicyWeighted<const MatrixLookupWeighted,
     56                                             const double,
     57                                             const double> > >
    5858    const_iterator;
    5959
  • trunk/yat/classifier/KernelLookup.h

    r1105 r1110  
    3030#include "DataLookup2D.h"
    3131#include "MatrixLookup.h"
    32 #include "yat/utility/Iterator.h"
     32#include "yat/utility/Container2DIterator.h"
    3333#include "yat/utility/iterator_traits.h"
    3434#include "yat/utility/StrideIterator.h"
     
    7272    /// 'Read Only' iterator
    7373    typedef utility::StrideIterator<
    74     utility::Iterator<const KernelLookup, const double, void, const double> >
     74    utility::Container2DIterator<const KernelLookup, const double, void,
     75                                 const double> >
    7576    const_iterator;
    7677
  • trunk/yat/classifier/MatrixLookup.h

    r1104 r1110  
    2828
    2929#include "DataLookup2D.h"
    30 #include "yat/utility/Iterator.h"
     30#include "yat/utility/Container2DIterator.h"
    3131#include "yat/utility/iterator_traits.h"
    3232#include "yat/utility/StrideIterator.h"
     
    7575    /// 'Read Only' iterator
    7676    typedef utility::StrideIterator<
    77     utility::Iterator<const MatrixLookup, const double, void, const double> >
     77    utility::Container2DIterator<const MatrixLookup, const double, void,
     78                                 const double> >
    7879    const_iterator;
    7980
  • trunk/yat/classifier/MatrixLookupWeighted.h

    r1105 r1110  
    2727
    2828#include "DataLookup2D.h"
    29 #include "yat/utility/Iterator.h"
     29#include "yat/utility/Container2DIterator.h"
    3030#include "yat/utility/IteratorPolicy.h"
    3131#include "yat/utility/StrideIterator.h"
     
    7272    /// 'Read Only' iterator
    7373    typedef utility::StrideIterator<
    74     utility::Iterator<const MatrixLookupWeighted,
    75                       const std::pair<double, double>, void, 
    76                       const std::pair<double, double>,
    77                       utility::IteratorPolicyWeighted<const MatrixLookupWeighted,
    78                                                       const double,
    79                                                       const double> > >
     74    utility::Container2DIterator<const MatrixLookupWeighted,
     75                                 const std::pair<double, double>, void,
     76                                 const std::pair<double, double>,
     77             utility::IteratorPolicyWeighted<const MatrixLookupWeighted,
     78                                             const double,
     79                                             const double> > >
    8080    const_iterator;
    8181
Note: See TracChangeset for help on using the changeset viewer.