started a refactoring with Model class to score different sort actions

[germs.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 34ac34fbfc54cfa749900b90d337cd3a4b9be66f..153aff40e608bce08a91bfe77a4980f017379ca8 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,8 +12,7 @@ using namespace std;
 #include "modelidentifier.h"
 #include "genesorter.h"
 #include "sortaction.h"
-
-typedef pair<ModelIdentifier::Model,double> modelpair;
+#include "model.h"
 
 int main(int argc, char** argv){
 
@@ -60,10 +59,10 @@ int main(int argc, char** argv){
 
        //TODO: Identify
        ModelIdentifier mi(ann);
-       map<ModelIdentifier::Model,double> scores = mi.identify(go);
-       for (map<ModelIdentifier::Model,double>::iterator m = scores.begin();
-                       m != scores.end(); ++m){
-               cout << "Model: " << m->first << " score: " << m->second << endl;
+       priority_queue<pair<double,Model> > pq = mi.identify(go);
+       while (pq.size() > 0){
+               cout << "Model: " << pq.top().second.name() << " score: " << pq.top().first << endl;
+               pq.pop();
        }
 
        //TODO: Chose a sorter