WIP on new init

Rework seems done, but man are there bugs
2018-10-11 17:05:41 +02:00
parent d0cbf6b420
commit edfa53a4ff
3 changed files with 48 additions and 189 deletions
@@ -27,18 +27,18 @@ public:
 	DescriptorManager(const fs::path & image_path);
 	~DescriptorManager();
 	void Init();
-	bool loadDescriptors();
-	bool createMutations();
-	void similarImages(string image_name, int method, int numImages);
-	void insertMutations(string image_name, int method);
-	void checkImages(int method);
+	void rankImages(string image_name, int method);
+	void rankMutations(string image_name, int method);
 	void outputMap(int a);
 	void outputMap();
+	void DescriptorManager::outputRank(string imagename, int method);
 private:
 	static const int numDescriptors = 8; 
 	static const int numMutations = 7;
 	//TODO: automagically update this?

+	bool initialized = false;
+
 	map<string, bitset<64>> features[numDescriptors]; //array of maps that will hold the descriptors
 	map<string, bitset<64>> mutatedFeatures[numDescriptors][numMutations];
 	multiset<pair<unsigned long long, string> > distances; //multiset that stores the distances