Merge /home/rodner/dev/nice/vislearning

math/ftransform/PCA.cpp

@@ -71,7 +71,7 @@ void PCA::clear()
 }
 
 void PCA::calculateBasis(const NICE::Matrix &features,
-		const uint targetDimension)
+		const uint targetDimension, const uint mode)
 {
 	calculateBasis(features, targetDimension, false);
 }

math/ftransform/PCA.h

@@ -52,7 +52,7 @@ class PCA: public FTransform
            * @param dimension Dimension size / number of principal components 
           * @return Basis Vectors 
           */
-          void calculateBasis(const NICE::Matrix &features,const uint targetDimension);
+          void calculateBasis(const NICE::Matrix &features,const uint targetDimension,const uint mode=0);
           void calculateBasis(const NICE::Matrix &features,const uint targetDimension,const bool adaptive,const double targetRatio=1.0);
 		  
 		  /**

math/ftransform/tests/TestFTransform.cpp

@@ -25,8 +25,6 @@
 #include "vislearning/math/ftransform/FTransform.h"
 #include "vislearning/math/ftransform/PCA.h"
 
-#include "vislearning/nice_nonvis.h"
-
 using namespace std;
 using namespace NICE;
 using namespace OBJREC;