};
-std::vector<Interval> findIntervalsAtPoints(const vector<Interval>& intervals){
- vector<Interval> points;
- for (size_t p = 1; p <= intervals.size(); ++p){
- cout << endl << "Point " << p << " : ";
- size_t f = 0;
- size_t s = 0;
- bool found = false;
- size_t n = 0;
- for (vector<Interval>::const_iterator i = intervals.begin(); i != intervals.end(); ++i, ++n){
- if (i->first == p){
- if (!found){
- f = n;
- found = true;
- }else{
- s = n;
- break;
- }
- }
- if (i->second == p){
- if (!found){
- f = n;
- found = true;
- }else{
- s = n;
- break;
- }
- }
- }
- cout << f << ":" << s << endl;
- points.push_back(Interval(f,s));
- }
- return points;
-
-}
-
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;
return intervals;
}
+/**
+ * TODO: Think of a better than O(n^2) implementation.
+ * Possibly move to cache result
+ */
+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;
+ bool found = false;
+ size_t n = 0;
+ for (vector<Interval>::const_iterator i = intervals.begin(); i != intervals.end(); ++i, ++n){
+ if (i->first == p){
+ if (!found){
+ f = n;
+ found = true;
+ }else{
+ s = n;
+ break;
+ }
+ }
+ if (i->second == p){
+ if (!found){
+ f = n;
+ found = true;
+ }else{
+ s = n;
+ break;
+ }
+ }
+ }
+ points.push_back(Interval(f,s));
+ }
+ return points;
+
+}