first point in points is now a dummy so indexes matches points

[germs.git] / src / genealgorithms.cpp

diff --git a/src/genealgorithms.cpp b/src/genealgorithms.cpp
index ec3a92ea1890f1d9e36554e10086ef4e695c06f3..04875daca3031c0803ed527b9a36742d8965289a 100644 (file)
--- a/src/genealgorithms.cpp
+++ b/src/genealgorithms.cpp
@@ -67,8 +67,8 @@ struct FindP{
 
 std::vector<Interval> findIntervalsAtPoints(const vector<Interval>& intervals){
        vector<Interval> points;
+       points.push_back(Interval(intervals.size(),intervals.size())); //Dummy interval to match point and index
        for (size_t p = 1; p <= intervals.size(); ++p){
-               cout << endl << "Point " << p << " : ";
                size_t f = 0;
                size_t s = 0;
                bool found = false;
@@ -93,7 +93,6 @@ std::vector<Interval> findIntervalsAtPoints(const vector<Interval>& intervals){
                                }
                        }
                }
-               cout << f << ":" << s << endl;
                points.push_back(Interval(f,s));
        }
        return points;
@@ -104,17 +103,17 @@ int countCycles(const GeneOrder& go){
        int cycles = 0;
        set<size_t> marked;
        vector<Interval> intervals = findIntervals(go);
-       vector<Interval> points;
+       vector<Interval> points = findIntervalsAtPoints(intervals);
        for (size_t p = 1; p < go.size(); ++p){
                if (marked.find(p) != marked.end())
                        continue;
-               Interval i = intervals[points[p-1].first];
-               while (marked.find(p) != marked.end()){
+               Interval i = intervals[points[p].first];
+               while (marked.find(p) == marked.end()){
                        marked.insert(p);
-                       if (i == intervals[points[p-1].first])
-                               i = intervals[points[p-1].second];
+                       if (i == intervals[points[p].first])
+                               i = intervals[points[p].second];
                        else
-                               i = intervals[points[p-1].first];
+                               i = intervals[points[p].first];
 
                        if (p == i.first)
                                p = i.second;