Pruning works

.gitignore

@@ -1,5 +1,7 @@
 part1/segment
 *.png
+*.pgm
+*.sift
 *.PNG
 *.swp
 part2-sift/part2-sift/Debug

part2-sift/part2-sift/Debug/part2-sift.lastbuildstate

@@ -1,2 +1,2 @@
 #v4.0:v100
-Debug|Win32|C:\Users\hardcore\class\cse515\part2-sift\|
+Debug|Win32|C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\|

part2-sift/part2-sift/Debug/part2-sift.log

@@ -1,31 +1,56 @@
-Build started 10/30/2010 12:12:48 PM.
-     1>Project "C:\Users\hardcore\class\cse515\part2-sift\part2-sift\part2-sift.vcxproj" on node 2 (build target(s)).
-     1>InitializeBuildStatus:
+Build started 11/3/2010 11:43:19 PM.
+     1>Project "C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\part2-sift\part2-sift.vcxproj" on node 2 (rebuild target(s)).
+     1>_PrepareForClean:
+         Deleting file "Debug\part2-sift.lastbuildstate".
+       InitializeBuildStatus:
          Creating "Debug\part2-sift.unsuccessfulbuild" because "AlwaysCreate" was specified.
        ClCompile:
-         C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /I"C:\Users\hardcore\class\cse515\part2-sift\part2-sift\vlfeat-0.9.9" /ZI /nologo /W3 /WX- /Od /Oy- /D WIN32 /D _DEBUG /D _CONSOLE /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TP /wd4251 /analyze- /errorReport:prompt Sifter.cpp
+         C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /ZI /nologo /W3 /WX- /Od /Oy- /D WIN32 /D NDEBUG /D _CONSOLE /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TP /wd4251 /analyze- /errorReport:prompt Sift.cpp Sifter.cpp
          Sifter.cpp
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(47): warning C4018: '>' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(52): warning C4244: 'initializing' : conversion from 'unsigned int' to 'float', possible loss of data
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(60): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(73): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(105): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(111): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(114): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(125): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(178): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(181): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(193): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(207): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(241): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(246): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(257): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(262): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(272): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(276): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(298): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(375): warning C4018: '<' : signed/unsigned mismatch
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sifter.cpp(377): warning C4018: '<' : signed/unsigned mismatch
+         Sift.cpp
+     1>c:\users\ace\documents\visual studio 2010\projects\515sift\part2-sift\part2-sift\sift.cpp(39): warning C4244: 'initializing' : conversion from 'double' to 'float', possible loss of data
+         Generating Code...
        ManifestResourceCompile:
-         All outputs are up-to-date.
+         C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\rc.exe /nologo /fo"Debug\part2-sift.exe.embed.manifest.res" Debug\part2-sift_manifest.rc 
        Link:
-         C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\Users\hardcore\class\cse515\part2-sift\Debug\part2-sift.exe" /INCREMENTAL /NOLOGO /LIBPATH:"C:\Users\hardcore\class\cse515\part2-sift\part2-sift\vlfeat-0.9.9\bin\w32" vl.lib CORE_RL_Magick++_.lib CORE_RL_Magick_.lib X11.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /ManifestFile:"Debug\part2-sift.exe.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /DEBUG /PDB:"C:\Users\hardcore\class\cse515\part2-sift\Debug\part2-sift.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\Users\hardcore\class\cse515\part2-sift\Debug\part2-sift.lib" /MACHINE:X86 "Debug\part2-sift.exe.embed.manifest.res"
+         C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\Debug\part2-sift.exe" /INCREMENTAL /NOLOGO /LIBPATH:"C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\part2-sift\ImageMagick-6.6.5-Q16" /LIBPATH:"C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\part2-sift\vlfeat-0.9.9\bin\w32" CORE_RL_Magick++_.lib CORE_RL_Magick_.lib X11.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /ManifestFile:"Debug\part2-sift.exe.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /DEBUG /PDB:"C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\Debug\part2-sift.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\Debug\part2-sift.lib" /MACHINE:X86 "Debug\part2-sift.exe.embed.manifest.res"
          Debug\Sift.obj
          Debug\Sifter.obj
        Manifest:
+         Deleting file "Debug\part2-sift.exe.embed.manifest".
          C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\mt.exe /nologo /verbose /out:"Debug\part2-sift.exe.embed.manifest" /manifest "Debug\part2-sift.exe.intermediate.manifest"
-         All outputs are up-to-date.
+         C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\rc.exe /nologo /fo"Debug\part2-sift.exe.embed.manifest.res" Debug\part2-sift_manifest.rc 
        LinkEmbedManifest:
-         All outputs are up-to-date.
-         part2-sift.vcxproj -> C:\Users\hardcore\class\cse515\part2-sift\Debug\part2-sift.exe
-       PostBuildEvent:
-         copy C:\Users\hardcore\class\cse515\part2-sift\part2-sift\vlfeat-0.9.9\bin\w32\vl.dll C:\Users\hardcore\class\cse515\part2-sift\Debug
-         :VCEnd
-                 1 file(s) copied.
+         C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\Debug\part2-sift.exe" /INCREMENTAL /NOLOGO /LIBPATH:"C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\part2-sift\ImageMagick-6.6.5-Q16" /LIBPATH:"C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\part2-sift\vlfeat-0.9.9\bin\w32" CORE_RL_Magick++_.lib CORE_RL_Magick_.lib X11.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /ManifestFile:"Debug\part2-sift.exe.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /DEBUG /PDB:"C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\Debug\part2-sift.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\Debug\part2-sift.lib" /MACHINE:X86 "Debug\part2-sift.exe.embed.manifest.res"
+         Debug\Sift.obj
+         Debug\Sifter.obj
+         part2-sift.vcxproj -> C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\Debug\part2-sift.exe
        FinalizeBuildStatus:
          Deleting file "Debug\part2-sift.unsuccessfulbuild".
          Touching "Debug\part2-sift.lastbuildstate".
-     1>Done Building Project "C:\Users\hardcore\class\cse515\part2-sift\part2-sift\part2-sift.vcxproj" (build target(s)).
+     1>Done Building Project "C:\Users\Ace\Documents\Visual Studio 2010\Projects\515Sift\part2-sift\part2-sift\part2-sift.vcxproj" (rebuild target(s)).
 
 Build succeeded.
 
-Time Elapsed 00:00:03.08
+Time Elapsed 00:00:04.07

part2-sift/part2-sift/FullExtractor-Driver.cpp

@@ -0,0 +1,89 @@
+#include <iostream>
+#include <fstream>
+#include "Sifter.h"
+#include "windows.h"
+
+void IndexDirectory(const char *, int, int);
+void IndexFile(std::string, std::string, Sifter *, int, int);
+
+int main(int argc, const char * argv[]){
+
+	if(argc != 4)
+	{
+		std::cout << "Usage: " << std::endl;
+		std::cout << "SiftExtractor.exe <k - shapes> <l - descriptors> <image directory>" << std::endl;
+		return 1;
+	}
+	int newK = atoi(argv[1]);
+	int newL = atoi(argv[2]);
+	IndexDirectory(argv[3], newK, newL);
+/*	Sifter test;
+	std::vector<std::vector<int>> exam;
+	exam = test.keynodeSetExtract(argv[1], 10,10);
+	for(int i = 0; i < exam.size(); i++)
+	{
+		for(int j = 0; j < exam[i].size(); j++)
+		{
+			std::cout << exam[i][j] << " ";
+		}
+		std::cout << std::endl;
+	}
+	std::cout << "DONE!" << std::endl;*/
+
+	return 0;
+}
+
+void IndexDirectory(const char *foldername, int k, int l)
+{
+	WIN32_FIND_DATAA findData;
+	char findPattern[MAX_PATH];
+	sprintf(findPattern, "%s*", foldername);
+	HANDLE hFind = FindFirstFileA(findPattern, &findData);
+	Sifter siftOMatic;
+	std::string fullName = "";
+	std::string fn = "";
+	std::ofstream outputfile;
+	outputfile.open("output.txt");
+	if(hFind != INVALID_HANDLE_VALUE)
+	{
+		do
+		{
+			if(!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+			{
+				fullName = foldername;
+				fn = findData.cFileName;
+				fullName += fn;
+				std::cout << "Now indexing: " << fullName << std::endl;
+				IndexFile(fullName, fn, &siftOMatic, k, l);
+				// Index image...
+			}
+		}while(FindNextFileA(hFind, &findData));
+	}
+	outputfile.close();
+}
+
+void IndexFile(std::string filename, std::string image, Sifter *siftIt, int k, int l)
+{
+	std::vector<std::vector<int>> extract = siftIt->keynodeSetExtract(filename, k, l);
+	std::ofstream f;
+	f.open("output.txt", std::ios_base::app);
+	for(int i = 0; i < extract.size(); i++)
+	{
+		f << image << ",";
+		std::cout << image << ",";
+		for(int j = 0; j < extract[i].size(); j++)
+		{
+			f << extract[i][j];
+			std::cout << extract[i][j];
+			if(j+1 != extract[i].size())
+			{
+				std::cout << ",";
+				f << ",";
+			}
+		}
+		f << std::endl;
+		std::cout << std::endl;
+	}
+	f.close();
+
+}