don't really need print the gene order

[germs.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 90d3564d3d39fc08ae7fc48cb45610b146703f5d..1ead839eee2502e3be6283e27e4c7701aa2466e3 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -67,18 +67,21 @@ int main(int argc, char** argv){
                //pq.pop();
        //}
 
-       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
        GeneSorter so;
        //TODO: Sort
        GeneSorter::ActionList al = so.sort(go,model);
 
+       double score = 0;
        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,go) << endl;
+               score += model.score(*sa,go);
        }
+       cout << "Avg score: " << score / al.size() << endl;
        //TODO: Print result
        return EXIT_SUCCESS;
 }