]> ruin.nu Git - germs.git/blobdiff - src/genealgorithms.cpp
first point in points is now a dummy so indexes matches points
[germs.git] / src / genealgorithms.cpp
index d9d86a3dd8fcb651ce497180b062fa3ddc562612..04875daca3031c0803ed527b9a36742d8965289a 100644 (file)
@@ -67,6 +67,7 @@ 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){
                size_t f = 0;
                size_t s = 0;
@@ -106,13 +107,13 @@ int countCycles(const GeneOrder& go){
        for (size_t p = 1; p < go.size(); ++p){
                if (marked.find(p) != marked.end())
                        continue;
-               Interval i = intervals[points[p-1].first];
+               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;