Refactoring for the ages

This commit is contained in:
2019-06-23 21:30:08 +02:00
parent 997ea91cb4
commit 8a78f03814
5 changed files with 189 additions and 376 deletions
+9 -7
View File
@@ -42,28 +42,30 @@ class DescriptorManager {
public:
DescriptorManager();
DescriptorManager(const fs::path & image_path);
~DescriptorManager();
void LoadFeatures(string image_path, string image_name);
void LoadMutationFeatures(string image_path, string image_name, int mutation);
Image* GetMutated(Image* image, string image_name, int method);
void Init();
void SaveFeatures();
void LoadFeatures();
void SaveToDisk();
void LoadFromDisk();
void rankImages(string image_name, int method);
multiset<pair<unsigned long long, string>> rankMutations(string image_name, int method);
multiset<pair<uint64_t, string>> rankMutations(string image_name, int method);
void runExperiments();
void generatePreviews(string imagename);
void outputMap(int a);
void outputMap();
void outputRank(string imagename, int method);
private:
static const int numDescriptors = 1;
static const int numDescriptors = 8;
static const int numMutations = 8;
//TODO: automagically update this?
bool initialized = false;
int numImages;
Image* current_image = NULL; //for caching purposes
map<string, uint64_t> features[numDescriptors]; //array of maps that will hold the descriptors
map<string, uint64_t> mutatedFeatures[numDescriptors][numMutations];
multiset<pair<unsigned long long, string> > distances; //multiset that stores the distances
multiset<pair<uint64_t, string> > distances; //multiset that stores the distances
fs::path img_path; //where the images are
Descriptor* descriptor_types[numDescriptors];
Mutation* mutators[numMutations];