Changeset 91 for foam/trunk

Timestamp:

07/23/2009 09:42:50 AM (12 years ago)

Author:

dave

Message:

moving stuff around and making a vision lib

Location:

foam/trunk

Files:

• faceident/Makefile (modified) (1 diff)
• faceident/src/main.cpp (modified) (2 diffs)
• pcatools (added)
• pcatools/src (added)
• vision/Makefile (modified) (3 diffs)
• vision/src/Vector.h (modified) (3 diffs)
• vision/src/main.cpp (modified) (3 diffs)

foam/trunk/faceident/Makefile

@@ -5 +5 @@
         src/Face.cpp\
         src/ImageUtils.cpp\
-        src/SceneState.cpp\
-        src/tinyxml.cpp\
-        src/tinyxmlerror.cpp\
-        src/tinyxmlparser.cpp
+        src/SceneState.cpp
 
-CCFLAGS = `pkg-config --cflags opencv` -ggdb -Wall -O3 -ffast-math -Wno-unused -DTIXML_USE_STL 
-LDFLAGS = 
-LIBS    = `pkg-config --libs opencv` -lYARP_dev -lYARP_sig -lYARP_OS -lACE
+# for the minute, go out and up to link to the vision lib
+CCFLAGS = -I../vision/src `pkg-config --cflags opencv` -ggdb -Wall -O3 -ffast-math -Wno-unused -DTIXML_USE_STL 
+LDFLAGS = -L../vision/
+LIBS    = `pkg-config --libs opencv` -lYARP_dev -lYARP_sig -lYARP_OS -lACE -lvision
 
 CC = g++

foam/trunk/faceident/src/main.cpp

@@ -66 +66 @@
 //////////////////////////////////////////////////////////
 // These are the tweakable bits - see comments in FaceBank.h
-FaceBank facebank(30, 40, 0.2, 0.1); //0.2
+FaceBank facebank(80, 120, 0.2, 0.1); //0.2
 SceneState scenestate;
 
 // show all faces currently detected 
-#define SHOW_FACES
+//#define SHOW_FACES
 //#define SAVE_FRAMES
 
@@ -220 +220 @@
                 }
         }
-
+        facebank.Save("faces");
         cvDestroyWindow("result");
         return 0;

foam/trunk/vision/Makefile

@@ -1 @@
-TARGET  := test
+TARGET  := libvision.a
 
-SRCS    := src/main.cpp\
-        src/Image.cpp\
+SRCS    := src/Image.cpp\
         src/Rendering.cpp\
         src/Classifier.cpp\
@@ -14 +13 @@
 
 CCFLAGS = `pkg-config --cflags opencv` -ggdb -Wall -O3 -ffast-math -Wno-unused -DTIXML_USE_STL 
-LDFLAGS = 
-LIBS    = `pkg-config --libs opencv` -lYARP_dev -lYARP_sig -lYARP_OS -lACE
 
 CC = g++
@@ -30 +27 @@
 
 ${TARGET}: ${OBJS} 
-        ${CC} ${LDFLAGS} -o $@ $^ ${LIBS}
+        ar rc ${TARGET} ${OBJS}
 
 ${OBJS}: %.o: %.cpp %.dep 

foam/trunk/vision/src/Vector.h

@@ -58 +58 @@
         bool IsInf();
         T Mean();
+        T DistanceFrom(const Vector &other) const;
+        T Magnitude() const;
 
         Vector &operator=(const Vector &other);
@@ -158 +160 @@
 
 template<class T>
+T Vector<T>::DistanceFrom(const Vector &other) const
+{
+        assert(m_Size==other.m_Size);
+        
+        float acc=0;
+        for (unsigned int i=0; i<m_Size; i++)
+        {
+                acc+=(other[i]-(*this)[i]) * (other[i]-(*this)[i]);
+        }
+        
+        return sqrt(acc);
+}
+
+template<class T>
+T Vector<T>::Magnitude() const
+{
+        float acc=0;
+        for (unsigned int i=0; i<m_Size; i++)
+        {
+                acc+=(*this)[i] * (*this)[i];
+        }
+        
+        return sqrt(acc);
+}
+
+template<class T>
 Vector<T> Vector<T>::operator+(const Vector &other) const
 {
@@ -329 +357 @@
         Vector<T> om(m);
         assert(om[5]==0.5);
+        
+        assert(feq(m.Magnitude(),0.5f));
+        Vector<T> a(10);
+        a.Zero();
+        a[5]=-10;
+        assert(feq(a.DistanceFrom(m),10.5f));
 }
 

foam/trunk/vision/src/main.cpp

@@ -33 +33 @@
 double scale = 1;
 
-//int w=50;
-//int h=80;
-int w=20;
-int h=30;
+int w=50;
+int h=80;
+//int w=20;
+//int h=30;
 
 PCA pca(w*h);
-Vector<float> params(50);
+Vector<float> params(100);
 Image src("data/dave.png");
 
@@ -65 +65 @@
 {
         //Recalc();
-        //FILE *f=fopen("spacek-20x30.pca", "wb");
+        //FILE *f=fopen("spacek-50x80.pca", "wb");
         //pca.Save(f);
         
-        FILE *f=fopen("spacek-20x30.pca", "rb");
+        FILE *f=fopen("spacek-50x80.pca", "rb");
         pca.Load(f);
-        
         fclose(f);
         
-        pca.Compress(0,50);
+        pca.Compress(0,100);
         src = src.Scale(w,h).RGB2GRAY();
         Vector<float> d(src.ToFloatVector());   
@@ -298 +297 @@
         //}
         
-        for (unsigned int i=0; i<pca.GetEigenTransform().GetRows(); i++)
-        {
-                camera.Blit(Image(w,h,1,pca.GetEigenTransform().GetRowVector(i)*2+pca.GetMean()),(i%20)*(w+2),0+(i/20)*(h+2));
-        }
-        
-        camera.Blit(Image(w,h,1,pca.Synth(params)),200,200);
-        camera.Blit(src,100,200);
+        static float t=0;
+        
+        for (unsigned int i=0; i<30; i++)
+        {
+                camera.Blit(Image(w,h,1,(pca.GetEigenTransform().GetRowVector(i)*50)/((i+1) * 1)+pca.GetMean()
+                        ),(i%10)*(w+2),0+(i/10)*(h+2));
+        }
+        
+        t+=0.1;
+        
+        camera.Blit(Image(w,h,1,pca.GetMean()),0,300);
+        camera.Blit(src,60,300);
+        camera.Blit(Image(w,h,1,pca.Synth(params)),120,300);
 
     cvShowImage("result", camera.m_Image);