Changeset 97 for foam/trunk/vision

Timestamp:

08/03/2009 01:42:48 PM (11 years ago)

Author:

dave

Message:

added the eigen spaces and the rest of the data associated with this, faces, etc

Location:

foam/trunk/vision/src

Files:

• Matrix.h (modified) (7 diffs)
• PCA.cpp (modified) (3 diffs)
• PCA.h (modified) (2 diffs)
• Vector.h (modified) (4 diffs)

foam/trunk/vision/src/Matrix.h

@@ -94 +94 @@
         void SetRowVector(unsigned int r, const Vector<T> &row);
         void SetColVector(unsigned int c, const Vector<T> &col);
-         
+        void NormaliseRows();
+        void NormaliseCols();
+
         void Print() const;
         void SetAll(T s);
@@ -119 +121 @@
         Matrix CropCols(unsigned int s, unsigned int e);
 
-        void Save(FILE *f);
+        void Save(FILE *f) const;
         void Load(FILE *f);
 
@@ -230 +232 @@
 Matrix<T> Matrix<T>::Transposed() const
 {
-        Matrix<T> copy(*this);
+        Matrix<T> copy(m_Cols,m_Rows);
         for (unsigned int i=0; i<m_Rows; i++)
         {
                 for (unsigned int j=0; j<m_Cols; j++)
                 {
-                        copy[i][j]=(*this)[j][i];
+                        copy[j][i]=(*this)[i][j];
                 }
         }
@@ -255 +257 @@
 Matrix<T> Matrix<T>::operator+(const Matrix &other) const
 {
-        assert(m_Rows=other.m_Rows);
-        assert(m_Cols=other.m_Cols);
+        assert(m_Rows==other.m_Rows);
+        assert(m_Cols==other.m_Cols);
         
         Matrix<T> ret(m_Rows,m_Cols);
@@ -272 +274 @@
 Matrix<T> Matrix<T>::operator-(const Matrix &other) const
 {
-        assert(m_Rows=other.m_Rows);
-        assert(m_Cols=other.m_Cols);
+        assert(m_Rows==other.m_Rows);
+        assert(m_Cols==other.m_Cols);
         
         Matrix<T> ret(m_Rows,m_Cols);
@@ -530 +532 @@
 
 template<class T>
-void Matrix<T>::Save(FILE* f)
+void Matrix<T>::NormaliseRows()
+{
+        for(unsigned int i=0; i<m_Rows; i++)
+        {
+                SetRowVector(i,GetRowVector(i).Normalised());
+        }
+}
+
+template<class T>
+void Matrix<T>::NormaliseCols()
+{
+        for(unsigned int i=0; i<m_Cols; i++)
+        {
+                SetColVector(i,GetColVector(i).Normalised());
+        }
+}
+
+template<class T>
+void Matrix<T>::Save(FILE* f) const
 {
         int version = 1;        
@@ -638 +658 @@
         
         assert(j.Inverted()==k);
+                
+        Matrix<float> l(2,2);
+        l[0][0]=3;
+        l[0][1]=3;
+        l[1][0]=0;
+        l[1][1]=0;
+        
+        Matrix<float> n(2,2);
+        n[0][0]=2;
+        n[0][1]=2;
+        n[1][0]=0;
+        n[1][1]=0;
+        
+        n*=l;
+        
+        Matrix<float> o(4,4);
+        o.Zero();
+        o[0][0]=1;
+        o[1][1]=1;
+        o[2][2]=1;
+        o[3][3]=1;
+        
+        j*=k;
+        assert(j==o);
+
+        {
+                Matrix<float> a(2,3);
+                Matrix<float> b(3,2);
+                
+                a[0][0]=1; a[0][1]=2; a[0][2]=3;
+                a[1][0]=4; a[1][1]=5; a[1][2]=6;
+
+                b[0][0]=2; b[0][1]=3;
+                b[1][0]=-1; b[1][1]=1;
+                b[2][0]=1; b[2][1]=2;
+                
+                Matrix<float> result(2,2);
+                result[0][0]=3; result[0][1]=11;
+                result[1][0]=9; result[1][1]=29;
+                
+                assert(a*b==result);
+        }
+        
 }
 

foam/trunk/vision/src/PCA.cpp

@@ -51 +51 @@
         
         // allocate the transform matrix (this is where it'll run out of memory)
-        cerr<<"Allocating "<<m_FeatureSize*m_FeatureSize*sizeof(float)/1024/1024.0<<" megs for covariance matrix"<<endl;
+        float size= m_FeatureSize*m_FeatureSize*sizeof(float)/1024/1024.0;
+        if (size>1)
+        {
+                cerr<<"Allocating "<<size<<" megs for covariance matrix"<<endl;
+        }
         m_EigenTransform = Matrix<float>(m_FeatureSize,m_FeatureSize);
         m_EigenTransform.Zero();
@@ -92 +96 @@
 }
 
-void PCA::Save(FILE *f)
+void PCA::Save(FILE *f) const
 {
         int version = 2;
@@ -158 +162 @@
         
         pca.Calculate();
-                
+        
+        
         in[0]=.69; in[1]=.49;
         Vector<float> out = pca.Project(in);
         assert(feq(out[0],-0.82797f) && feq(out[1],-0.175115f));
+
+        PCA pcasub(2);
+        
+        in[0]=-0.677; in[1]=-0.735;
+        pcasub.AddFeature(in);
+        in[0]=0; in[1]=0;
+        pcasub.AddFeature(in);
+        in[0]=0.677; in[1]=0.735;
+        pcasub.AddFeature(in);
+        
+        pcasub.Calculate();
+        pca.Mult(pca);  
+        
         
 }

foam/trunk/vision/src/PCA.h

@@ -50 +50 @@
         const Vector<float> &GetEigenValues() const { return m_EigenValues; }
         const Matrix<float> &GetEigenTransform() const { return m_EigenTransform; }
+        Matrix<float> &EigenTransform() { return m_EigenTransform; }
         const FeatureVec &GetFeatures() const { return m_Features; }
         const Vector<float> &GetMean() const { return m_Mean; }
@@ -57 +58 @@
         
         void Load(FILE *f);
-        void Save(FILE *f);
+        void Save(FILE *f) const;
         
 private:        

foam/trunk/vision/src/Vector.h

@@ -60 +60 @@
         T DistanceFrom(const Vector &other) const;
         T Magnitude() const;
+        Vector Normalised() const;
 
         Vector &operator=(const Vector &other);
@@ -75 +76 @@
         Vector &operator/=(T v);
         
-        void Save(FILE *f);
+        void Save(FILE *f) const;
         void Load(FILE *f);
         
@@ -186 +187 @@
 
 template<class T>
+Vector<T> Vector<T>::Normalised() const
+{
+        Vector<T> ret(*this);
+        ret/=ret.Magnitude();
+        return ret;
+}
+
+template<class T>
 Vector<T> Vector<T>::operator+(const Vector &other) const
 {
@@ -329 +338 @@
 
 template<class T>
-void Vector<T>::Save(FILE* f)
+void Vector<T>::Save(FILE* f) const
 {
         int version = 1;