sorting without hurdles seems to work

[germs.git] / src / genealgorithms.cpp

diff --git a/src/genealgorithms.cpp b/src/genealgorithms.cpp
index 67c504e77b3f9bdfad9589236e8f65f8e2b2cd5d..ed68b67ab4b798483da9003dbb37478165ef760c 100644 (file)
--- a/src/genealgorithms.cpp
+++ b/src/genealgorithms.cpp
@@ -173,18 +173,37 @@ std::vector<Component> findComponents(const GeneOrder& go){
        return components;
 }
 
+int sign2(Gene g){
+       if (g < 0)
+               return -1;
+       return 1;
+}
 /**
  * 
  */
 std::vector<Interval> findIntervals(const GeneOrder& go){
-       vector<Interval> intervals(go.size()-1,Interval(go.size(),go.size()));
+       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){
                        size_t i = abs(*g);
-                       if (i < go.size() - 1)
+                       if (i < go.size() - 1){
                                intervals[i].first = n + (*g >= 0 ? 1 : 0);
-                       if (i > 0)
+
+                               if (intervals[i].second == max)
+                                       intervals[i].oriented = *g < 0;
+                               else
+                                       intervals[i].oriented ^=  *g < 0;
+                       }
+                       if (i > 0){
                                intervals[i-1].second = n + (*g < 0 ? 1 : 0);
+
+                               if (intervals[i-1].first == max)
+                                       intervals[i-1].oriented = *g < 0;
+                               else
+                                       intervals[i-1].oriented ^=  *g < 0;
+                       }
+
        }
        return intervals;
 }
@@ -194,7 +213,7 @@ std::vector<Interval> findIntervals(const GeneOrder& go){
  */
 std::vector<Interval> findIntervalsAtPoints(const vector<Interval>& intervals){
        size_t max = intervals.size()+1;
-       vector<Interval> points(max,Interval(max,max));
+       vector<Interval> points(max,Interval(max,max,false));
        size_t n = 0;
        for (vector<Interval>::const_iterator i = intervals.begin(); i != intervals.end(); ++i, ++n){
                if (points[i->first].first == max){