X-Git-Url: https://ruin.nu/git/?p=germs.git;a=blobdiff_plain;f=src%2Fgenealgorithms.cpp;h=f1e66aaa1cce5a2b9a1c3cf7b62c4c75351f4ee1;hp=ed68b67ab4b798483da9003dbb37478165ef760c;hb=4b63e18f4e100d3506ed170d4798539b08d19bc0;hpb=cc3e3bd109d72d82826629b96f8e6721d5243cf7

diff --git a/src/genealgorithms.cpp b/src/genealgorithms.cpp
index ed68b67..f1e66aa 100644
--- a/src/genealgorithms.cpp
+++ b/src/genealgorithms.cpp
@@ -182,26 +182,29 @@ int sign2(Gene g){
  * 
  */
 std::vector<Interval> findIntervals(const GeneOrder& go){
-	size_t max = go.size();
+	const size_t max = go.size();
 	vector<Interval> intervals(go.size()-1,Interval(max,max,false));
 	size_t n = 0;
-	for (GeneOrder::iterator g = go.begin(); g != go.end(); ++g, ++n){
+	const GeneOrder::iterator end = go.end();
+	for (GeneOrder::iterator g = go.begin(); g != end; ++g, ++n){
 			size_t i = abs(*g);
-			if (i < go.size() - 1){
-				intervals[i].first = n + (*g >= 0 ? 1 : 0);
+			if (i < max - 1){
+				Interval& curr = intervals[i];
+				curr.first = n + (*g >= 0 ? 1 : 0);
 
-				if (intervals[i].second == max)
-					intervals[i].oriented = *g < 0;
+				if (curr.second == max)
+					curr.oriented = *g < 0;
 				else
-					intervals[i].oriented ^=  *g < 0;
+					curr.oriented ^=  *g < 0;
 			}
 			if (i > 0){
-				intervals[i-1].second = n + (*g < 0 ? 1 : 0);
+				Interval& prev = intervals[i-1];
+				prev.second = n + (*g < 0 ? 1 : 0);
 
-				if (intervals[i-1].first == max)
-					intervals[i-1].oriented = *g < 0;
+				if (prev.first == max)
+					prev.oriented = *g < 0;
 				else
-					intervals[i-1].oriented ^=  *g < 0;
+					prev.oriented ^=  *g < 0;
 			}
 
 	}