Ignore:
Timestamp:
Oct 17, 2008, 5:31:42 PM (13 years ago)
Author:
Peter
Message:

closes #396

File:
1 edited

Legend:

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

    r1581 r1587  
    7171  class MatrixLookupWeighted
    7272  {
    73  
    7473  public:
    7574    /**
     
    119118                                  bool owner=false);
    120119
    121     ///
    122     /// Constructor creating a lookup into the entire \a matrix and \a
    123     /// weights.
    124     ///
    125     /// @note If @a matrix or @a weights goes out of scope or is
    126     /// deleted, the MatrixLookupWeighted becomes invalid and the
    127     /// result of further use is undefined.
    128     ///
    129     /// \deprecated
    130     MatrixLookupWeighted(const utility::Matrix& matrix,
    131                          const utility::Matrix& weights,
    132                          const bool owner=false);// YAT_DEPRECATE;
    133    
    134120    /**
    135121       Constructor creating a MatrixLookupWeighted from a MatrixLookup. A
     
    138124       \note no check for nan is performed.
    139125       
    140        @note If underlying utility::Matrix goes out of scope or
    141        is deleted, the MatrixLookupWeighted becomes invalid and the
    142        result of further use is undefined.
     126       @note from yat 0.5 data is copied and further modifications in
     127       \a matrix will not be reflected in MatrixLookupWeighted.
    143128    */
    144129    explicit MatrixLookupWeighted(const MatrixLookup& matrix);
    145130
    146 
    147     ///
    148     /// Constructor creating a lookup into a sub-matrix of @a matrix.
    149     /// The @a row and @a column define what sub-matrix to look into,
    150     /// in other words, the created MatrixLookupWeighted will fullfill
    151     /// the following:
    152     /// MatrixLookupWeighted(i,j)=matrix(row[i],column[j])
    153     /// weights(row[i],column[j]). This also means that number of
    154     /// rows in created MatrixLookupWeighted is equal to size of
    155     /// @a row, and number of columns is equal to size of @a column.
    156     ///
    157     /// @note If @a matrix or @a weights goes out of scope or is deleted, the
    158     /// MatrixLookupWeighted becomes invalid and the result of further use is
    159     /// undefined.
    160     ///
    161     /// \deprecated
    162     MatrixLookupWeighted(const utility::Matrix& matrix,
    163                          const utility::Matrix& weights,
    164                          const utility::Index& row,
    165                          const utility::Index& column);// YAT_DEPRECATE;
    166 
    167     ///
    168     /// Constructor creating a lookup into a sub-matrix of @a matrix.
    169     ///
    170     /// If @a row_vectors is true the new MatrixLookupWeighted will be
    171     /// consist of the row vectors defined by @a index. This means
    172     /// that the created MatrixLookupWeighted will fullfill:
    173     /// MatrixLookupWeighted(i,j)=matrix(i,index[j])*weights(i,index[j])
    174     ///
    175     ///
    176     /// If @a row_vectors is false the new MatrixLookupWeighted will be consist
    177     /// of the rolumn vectors defined by @a index. This means that the
    178     /// created MatrixLookupWeighted will fullfill:
    179     ///
    180     ///
    181     /// @note If @a matrix or @a weights goes out of scope or is
    182     /// deleted, the MatrixLookupWeighted becomes invalid and the
    183     /// result of further use is undefined.
    184     ///
    185     /*
    186     MatrixLookupWeighted(const utility::Matrix& matrix,
    187                          const utility::Matrix& weights,
    188                          const utility::Index& index,
    189                          const bool row_vectors);
    190     */
    191131
    192132    ///
     
    266206    /// matrix.
    267207    ///
    268     /// @see matrix(istream&) for details.
     208    /// @see utility::MatrixWeighted(istream&) for details.
    269209    ///
    270210    MatrixLookupWeighted(std::istream&, char sep='\0');
     
    356296   
    357297  private:
    358     typedef utility::SmartPtr<const utility::Matrix> MatrixP;
     298    typedef utility::SmartPtr<const utility::MatrixWeighted> MatrixWP;
    359299    utility::Index column_index_;
    360     MatrixP data_;
     300    MatrixWP data_;
    361301    utility::Index row_index_;
    362     MatrixP weights_;
    363302
    364303    // for assertions
Note: See TracChangeset for help on using the changeset viewer.