X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=src%2Fmain.cpp;h=16e7de7768f853eb2de87fde7b7f2923c696d29b;hb=0ced9c229cf05fa677686df27eca9f167f11a87f;hp=90d3564d3d39fc08ae7fc48cb45610b146703f5d;hpb=efe42ca948704593c847996d0ae8da71d15bb75b;p=germs.git

diff --git a/src/main.cpp b/src/main.cpp
index 90d3564..16e7de7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,15 +18,31 @@ using namespace std;
 int main(int argc, char** argv){
 
 	string ann = "default.ann";
+	Model model(0);
+	bool detectModel = true;
+	bool onlyIdentify = false;
+	bool printPerm = false;
 
+	//Parse command line arguments
 	int opt;
-	while ((opt = getopt(argc, argv, "n:h")) != -1) {
+	while ((opt = getopt(argc, argv, "im:n:hp")) != -1) {
 		switch (opt) {
+			case 'm':
+				model = Model::modelFactory(optarg);
+				detectModel = false;
+				break;
 			case 'n':
 				ann = optarg;
 				break;
+			case 'i':
+				onlyIdentify = true;
+				break;
+			case 'p':
+				printPerm = true;
+				break;
 			case 'h':
 				cout << "Usage: " << argv[0] << " [OPTION] [FILE]" << endl
+					<< endl << "  -m <model> Specifies which model to use for sorting: Whirl, X, Zipper, FatX or Cloud "
 					<< endl << "  -n <ann>   Specifies which artificial neural network to use for identification. '" << ann << "' is used by default"
 					<< endl << "  -h         Prints this help message"
 					<< endl << endl
@@ -40,6 +56,7 @@ int main(int argc, char** argv){
 		}
 	}
 
+	//Open file, or stdin
 	istream* in;
 	ifstream file;
 	if (optind == argc || *argv[optind] == '-'){
@@ -52,33 +69,51 @@ int main(int argc, char** argv){
 		}
 		in = &file;
 	}
-	//TODO: Parse
+
+	//Parse the gene order permutation
 	vector<Gene> g;
 	copy(istream_iterator<int>(*in), istream_iterator<int>(),
-		     back_inserter(g));   
+	     back_inserter(g));
 	GeneOrder go(g.begin(),g.end());
 
-	//TODO: Identify
+	//Identify the model
 	ModelIdentifier mi(ann);
 	priority_queue<pair<double,Model> > pq = mi.identify(go);
-	Model model = pq.top().second;
-	//while (pq.size() > 0){
-	cout << "Model: " << model.name() << " score: " << pq.top().first << endl;
-		//pq.pop();
-	//}
+	if (detectModel){
+		model = pq.top().second;
+	}
+	while (pq.size() > 0){
+		cout << "Model: " << pq.top().second.name() << " score: " << pq.top().first << endl;
+		pq.pop();
+	}
+	cout << "Using model: " << model.name() << endl;
 
-	cout << "Distance: " << inversionDistance(go) << " : ";
-	copy(go.begin(), go.end(), ostream_iterator<int>(cout, " "));
-	cout << endl;
+	cout << "Distance: " << inversionDistance(go) << endl;
+	//copy(go.begin(), go.end(), ostream_iterator<int>(cout, " "));
+	//cout << endl;
 
-	//TODO: Chose a sorter
+	if (onlyIdentify){
+		return EXIT_SUCCESS;
+	}
+	//Sort
 	GeneSorter so;
-	//TODO: Sort
 	GeneSorter::ActionList al = so.sort(go,model);
 
+	//Print the result
+	double score = 0;
+
+	GeneOrder temp(go);
 	for (GeneSorter::ActionList::iterator sa = al.begin(); sa != al.end(); ++sa){
-		cout << "Action: " << sa->toString() << " model score: " << model.score(*sa) << endl;
+		cout << "Action: " << sa->toString() << " model score: " << model.score(*sa,temp) << endl;
+		(*sa)(temp);
+		score += model.score(*sa,temp);
+
+		if (printPerm){
+			copy(temp.begin(), temp.end(), ostream_iterator<int>(cout, " "));
+			cout << endl;
+		}
 	}
-	//TODO: Print result
+	cout << "Avg score: " << score / al.size() << endl;
+
 	return EXIT_SUCCESS;
 }