Threading test added

DescriptorManager.h

@@ -5,20 +5,17 @@
 #include <bitset>
 #include <climits>
 #include <set>
+#include <thread>
+
 #include <boost/filesystem.hpp>
 #include <boost/system/error_code.hpp>
 #include <boost/filesystem/fstream.hpp>
-//Boost serialization test:
 #include <boost/archive/binary_oarchive.hpp> 
 #include <boost/archive/binary_iarchive.hpp> 
 #include <boost/serialization/map.hpp> 
 #include <boost/serialization/bitset.hpp>
 #include <boost/serialization/string.hpp> 
 
-//YAS Serialization:
-//#include <yas/serialize.hpp>
-//#include <yas/std_types.hpp>
-
 #include <chrono> //Debug, for measuring execution times
 
 #include <Magick++.h> 
@@ -51,6 +48,7 @@ public:
 	void rankImages(string image_name, int method);
 	multiset<pair<uint64_t, string>> rankMutations(string image_name, int method);
 	void runExperiments();
+	void test();
 	void generatePreviews(string imagename);
 	void outputMap(int a);
 	void outputMap();
@@ -65,6 +63,7 @@ private:
 	Mutation* mutators[numMutations];
 	
 	Image* current_image = NULL; //for caching purposes
+	//TODO: Are maps the best container for us? Logarithmic random access is bad, but otherwise it might be fine?
 	map<string, uint64_t> features[numDescriptors]; //array of maps that will hold the descriptors
 	map<string, uint64_t> mutatedFeatures[numDescriptors][numMutations];
 	multiset<pair<uint64_t, string> > distances; //multiset that stores the distances