longest increasing and decreasing subsequences

[germs.git] / src / genealgorithms.cpp

diff --git a/src/genealgorithms.cpp b/src/genealgorithms.cpp
index 154df354bc346592f53a1373b49bbc1c72a0b79d..b2d7fa6132b0463ee9a1b1cdf8f240bddf1204f9 100644 (file)
--- a/src/genealgorithms.cpp
+++ b/src/genealgorithms.cpp
@@ -26,27 +26,10 @@
 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){