Main cleanup

main.cpp

@@ -12,28 +12,15 @@
 using namespace std;
 using namespace Magick;
 
-//Methods:
-//6 DCT Pearson
-//5 threshold
-//4 pearson
-//3 sobel
-//2 median
-//1 numColors
-//0 averageColor
-
+enum method {avg_color, num_color, median, sobel, pearson, threshold, dct_pearson, dct_median};
 
 int main(int argc, char **argv) {
 	string imagename = "im3102.jpg";
-	int method = 0;
-	int count = 1000;
+	int method = method::median;
 	if (argc > 2) {
 		method = atoi(argv[2]);
 		imagename = argv[1];
 	}
-	if (argc > 3) {
-		count = atoi(argv[3]);
-	}
-
 	else {
 		cout << "Usage: " << endl << argv[0] << " [fileName] [methodIndex]" << endl;
 		cout << "Continuing.." << endl;
@@ -41,5 +28,7 @@ int main(int argc, char **argv) {
 	InitializeMagick(*argv);
 	DescriptorManager* manager = new DescriptorManager("test"); 
 	manager->Init();
+	manager->rankImages(imagename, method);
+	manager->outputRank(imagename, method);
 	return 0;
 }