Changeset 1483 for trunk/yat/classifier


Ignore:
Timestamp:
Sep 9, 2008, 6:03:15 PM (13 years ago)
Author:
Peter
Message:

refs #396 - removing a constructor in MatrixLookupWeighted? - needed to re-organize tests in ncc_test to track down an error

Location:
trunk/yat/classifier
Files:
3 edited

Legend:

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

    r1482 r1483  
    8888
    8989
     90  /*
    9091  MatrixLookupWeighted::MatrixLookupWeighted(const utility::Matrix& data)
    9192    : data_(MatrixP(&data, false))
     
    9899    assert(validate());
    99100  }
     101  */
    100102
    101103
  • trunk/yat/classifier/MatrixLookupWeighted.h

    r1482 r1483  
    107107       \brief Create a lookup into entire \a matrix.
    108108     */
    109     MatrixLookupWeighted(const utility::MatrixWeighted& matrix);
     109    explicit MatrixLookupWeighted(const utility::MatrixWeighted& matrix);
    110110
    111111    ///
     
    133133    /// result of further use is undefined.
    134134    ///
    135     MatrixLookupWeighted(const utility::Matrix& matrix);
     135    //MatrixLookupWeighted(const utility::Matrix& matrix);
    136136
    137137
  • trunk/yat/classifier/NCC.h

    r1437 r1483  
    3434#include "yat/statistics/AveragerWeighted.h"
    3535#include "yat/utility/Matrix.h"
     36#include "yat/utility/MatrixWeighted.h"
    3637#include "yat/utility/Vector.h"
    3738#include "yat/utility/stl_utility.h"
     
    294295                                          utility::Matrix& prediction) const
    295296  {
    296     MatrixLookupWeighted weighted_centroids(centroids_);
     297    utility::MatrixWeighted weighted_centroids(centroids_);
    297298    for(size_t j=0; j<test.columns();j++)
    298299      for(size_t k=0; k<centroids_.columns();k++)
Note: See TracChangeset for help on using the changeset viewer.