generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove usage of obsolete _dataAsRows flag

Browse Source
This commit is contained in:
berak 2015-09-08 14:45:13 +02:00 committed by Alexander Alekhin
parent 33dc41056f
commit 28974e7290
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/contrib/include/opencv2/contrib/contrib.hpp
View File

@ -853,8 +853,7 @@ namespace cv
class CV_EXPORTS LDA class CV_EXPORTS LDA
{ {
public: public:
// Initializes a LDA with num_components (default 0) and specifies how // Initializes a LDA with num_components (default 0).
// samples are aligned (default dataAsRow=true).
LDA(int num_components = 0) : LDA(int num_components = 0) :
_num_components(num_components) {}; _num_components(num_components) {};
@ -895,13 +894,18 @@ namespace cv
// Destructor. // Destructor.
~LDA() {} ~LDA() {}
//! Compute the discriminants for data in src and labels. /** Compute the discriminants for data in src (row aligned) and labels.
*/
void compute(InputArrayOfArrays src, InputArray labels); void compute(InputArrayOfArrays src, InputArray labels);
// Projects samples into the LDA subspace. /** Projects samples into the LDA subspace.
src may be one or more row aligned samples.
*/
Mat project(InputArray src); Mat project(InputArray src);
// Reconstructs projections from the LDA subspace. /** Reconstructs projections from the LDA subspace.
src may be one or more row aligned projections.
*/
Mat reconstruct(InputArray src); Mat reconstruct(InputArray src);
// Returns the eigenvectors of this LDA. // Returns the eigenvectors of this LDA.
@ -911,7 +915,7 @@ namespace cv
Mat eigenvalues() const { return _eigenvalues; } Mat eigenvalues() const { return _eigenvalues; }
protected: protected:
bool _dataAsRow; bool _dataAsRow; // unused, but needed for ABI compatibility.
int _num_components; int _num_components;
Mat _eigenvectors; Mat _eigenvectors;
Mat _eigenvalues; Mat _eigenvalues;

8
modules/contrib/src/lda.cpp
View File

@ -1100,14 +1100,14 @@ void LDA::compute(InputArrayOfArrays _src, InputArray _lbls) {
} }
} }
// Projects samples into the LDA subspace. // Projects one or more row aligned samples into the LDA subspace.
Mat LDA::project(InputArray src) { Mat LDA::project(InputArray src) {
return subspaceProject(_eigenvectors, Mat(), _dataAsRow ? src : src.getMat().t()); return subspaceProject(_eigenvectors, Mat(), src);
} }
// Reconstructs projections from the LDA subspace. // Reconstructs projections from the LDA subspace from one or more row aligned samples.
Mat LDA::reconstruct(InputArray src) { Mat LDA::reconstruct(InputArray src) {
return subspaceReconstruct(_eigenvectors, Mat(), _dataAsRow ? src : src.getMat().t()); return subspaceReconstruct(_eigenvectors, Mat(), src);
} }
} }