renamed a function and removed some debug output

diff --git a/src/genesorter.cpp b/src/genesorter.cpp
index 03f19db1d8949ced3f18cb229671b590cb19acc0..d73f176eb01465b2b717283b59015167f921cc7a 100644 (file)
--- a/src/genesorter.cpp
+++ b/src/genesorter.cpp
@@ -35,7 +35,6 @@ GeneSorter::ActionList GeneSorter::sort(const GeneOrder& go){
        ActionList al;
        GeneOrder temp(go);
        while(inversionDistance(temp) > 0){
-               cout << "AL: " << al.size() << " : ";
                cout << "Distance: " << inversionDistance(temp) << " : ";
                copy(temp.begin(), temp.end(), ostream_iterator<int>(cout, " "));
                cout << endl;
@@ -43,7 +42,6 @@ GeneSorter::ActionList GeneSorter::sort(const GeneOrder& go){
                if (safe.size() > 0){
                        safe[0](temp);
                        al.push_back(safe[0]);
-                       cout << "AL: " << al.size() << " : ";
                }else
                        return ActionList(); //TODO: Need to handle hurdles.
        }
@@ -69,7 +67,7 @@ GeneSorter::ActionList GeneSorter::safeActions(const GeneOrder& go){
        for (size_t i = 0; i < intervals.size(); ++i){
                if (intervals[i].oriented && intervals[i].first != intervals[i].second){
                        SortAction sa(new ReverseAction(intervals[i]));
-                       size_t score = scoreActions(go,sa);
+                       size_t score = scoreAction(go,sa);
                        cout << "Inversion: " << min(intervals[i].first,intervals[i].second) << ":" << max(intervals[i].first,intervals[i].second)-1 << " Score: " << score <<  endl;
                        pq.push(pair<size_t,SortAction>(score,sa));
                }                               
@@ -81,7 +79,7 @@ GeneSorter::ActionList GeneSorter::safeActions(const GeneOrder& go){
        return al;
 }
 
-size_t GeneSorter::scoreActions(const GeneOrder& go, SortAction& sa){
+size_t GeneSorter::scoreAction(const GeneOrder& go, SortAction& sa){
        GeneOrder temp(go);
        sa(temp);
        vector<Interval> intervals = findIntervals(temp);

diff --git a/src/genesorter.h b/src/genesorter.h
index 4380e9957479625140f95c858f3245e54942731f..e06bedf9e31e2611af5ebe4b7c086ffd280381e1 100644 (file)
--- a/src/genesorter.h
+++ b/src/genesorter.h
@@ -46,7 +46,10 @@ class GeneSorter{
                 */
                ActionList safeActions(const GeneOrder& go1);
 
-               size_t scoreActions(const GeneOrder& go, SortAction& sa);
+               /**
+                * Calculates the score for an action given a gene order
+                */
+               size_t scoreAction(const GeneOrder& go, SortAction& sa);
 
                ~GeneSorter(){};
 };