X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=src%2Fgenealgorithms.cpp;h=d9d86a3dd8fcb651ce497180b062fa3ddc562612;hb=6724d50f2d36dccd383d95d36f7fe328b2692bc0;hp=eecdf3fea92bd8048c6c47fd1ef466d5e4698c67;hpb=6be4116d6211ac4ba4c68dc2ab28f1bc5d77068e;p=germs.git

diff --git a/src/genealgorithms.cpp b/src/genealgorithms.cpp
index eecdf3f..d9d86a3 100644
--- a/src/genealgorithms.cpp
+++ b/src/genealgorithms.cpp
@@ -56,12 +56,70 @@ std::vector<std::vector<int> > robinsonSchensted(const GeneOrder& go){
 	return v;
 }
 
+struct FindP{
+	size_t p;
+	FindP(size_t p) : p(p) {}
+	bool operator()(Interval i){
+		return (i.first == p || i.second == p);
+	}
+};
+
+
+std::vector<Interval> findIntervalsAtPoints(const vector<Interval>& intervals){
+	vector<Interval> points;
+	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;
+
+}
+
 int countCycles(const GeneOrder& go){
 	int cycles = 0;
 	set<size_t> marked;
-	for (size_t p = 1; p < go.size() - 1; ++p){
+	vector<Interval> intervals = findIntervals(go);
+	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()){
+			marked.insert(p);
+			if (i == intervals[points[p-1].first])
+				i = intervals[points[p-1].second];
+			else
+				i = intervals[points[p-1].first];
+
+			if (p == i.first)
+				p = i.second;
+			else
+				p = i.first;
+		}
+		++cycles;
 	}
 	return cycles;
 }
@@ -70,7 +128,10 @@ std::vector<Component> findComponents(const GeneOrder& go){
 	return vector<Component>();
 }
 
-//TODO: Think of a better than O(n^2) implementation
+/**
+ * TODO: Think of a better than O(n^2) implementation
+ * Possibly move it to GeneOrder too
+ */
 std::vector<Interval> findIntervals(const GeneOrder& go){
 	vector<Interval> intervals;
 	for (size_t i = 0; i < go.size() - 1; ++i){
@@ -100,3 +161,4 @@ std::vector<Interval> findIntervals(const GeneOrder& go){
 	}
 	return intervals;
 }
+