adding countCycles, findComponents, findIntervals declaration, with initial tests

[germs.git] / src / genealgorithms.cpp

diff --git a/src/genealgorithms.cpp b/src/genealgorithms.cpp
index 154df354bc346592f53a1373b49bbc1c72a0b79d..7dc832f252c208900b92c234879c8f09b5a93c24 100644 (file)
--- a/src/genealgorithms.cpp
+++ b/src/genealgorithms.cpp
@@ -22,31 +22,15 @@
 #include "geneorder.h"
 
 #include <algorithm>
+#include <set>
 #include <cstdlib>
 using namespace std;
 
 std::pair<int,int> longestSequences(const GeneOrder& go){
+       vector<vector<int> > v = robinsonSchensted(go);
+       return pair<int,int>(v[0].size(),v.size());
 }
 
-
-/*
-robSche2 :: [Int] -> [[Int]] -> [[Int]]
-robSche2 [] ys = ys
-robSche2 (x:xs) ys = robSche2 xs $ robSche4 x ys
-
-robSche3 :: Int -> [Int] -> (Maybe Int,[Int])
-robSche3 x ys = let yless = [y | y <- ys, y < x] in
-       let ymore = [y | y <- ys, y > x] in
-               case ymore of
-                       [] -> (Nothing, yless++[x])
-                       (y:ys) -> (Just y, yless++(x:ys))
-
-robSche4 :: Int -> [[Int]] -> [[Int]]
-robSche4 x [] = [[x]]
-robSche4 x (y:ys) = case robSche3 x y of
-       (Nothing, y) -> y:ys
-       (Just x, y) -> y:robSche4 x ys
-*/
 std::vector<std::vector<int> > robinsonSchensted(const GeneOrder& go){
        vector<vector<int> > v;
        for (GeneOrder::iterator i = go.begin(); i != go.end(); ++i){
@@ -70,3 +54,21 @@ std::vector<std::vector<int> > robinsonSchensted(const GeneOrder& go){
        }
        return v;
 }
+
+int countCycles(const GeneOrder& go){
+       int cycles = 0;
+       set<size_t> marked;
+       for (size_t p = 1; p < go.size() - 1; ++p){
+               if (marked.find(p) != marked.end())
+                       continue;
+       }
+       return cycles;
+}
+
+std::vector<Component> findComponents(const GeneOrder& go){
+       return vector<Component>();
+}
+
+std::vector<Interval> findIntervals(const GeneOrder& go){
+       return vector<Interval>();
+}