Update mussa to build on ubuntu 10.04 with qt 4.6.2 +boost 1.40.0.1

[mussa.git] / alg / nway_other.cpp

diff --git a/alg/nway_other.cpp b/alg/nway_other.cpp
index 19aaf0d268279bb981ae5d7730d352cb2ab3f4db..08a19fd620a91af6d779eb672402ba908e1cbcff 100644 (file)
--- a/alg/nway_other.cpp
+++ b/alg/nway_other.cpp
@@ -163,7 +163,7 @@ NwayPaths::radiate_path_search(vector<vector<FLPs> > all_comparisons)
         // add path that each species iterator is pointing to
         set_path_to_cur_sp_itor_track(path, win_i, sp_itor_begin);
        
-        pathz.push_back(ConservedPath(soft_thres, path));
+        pathz.push_back(ConservedPath(win_size, soft_thres, path));
 
         // now advance the right iterator
         still_paths = advance_sp_itor_track(sp_itor_begin, 
@@ -241,7 +241,7 @@ NwayPaths::trans_path_search(vector<vector<FLPs> > all_comparisons)
 
         // if the path is transitive, save the path
         if (is_transitive_path(path, all_comparisons, soft_thres)) {
-          ConservedPath new_path(soft_thres, path);
+          ConservedPath new_path(win_size, soft_thres, path);
           pathz.push_back(new_path);
         }
 
@@ -251,7 +251,11 @@ NwayPaths::trans_path_search(vector<vector<FLPs> > all_comparisons)
                                             all_matches);
       }
     }
+    if ((win_i % 1000) == 0) {
+      emit progress("transitive refinement", win_i, window_num);
+    }
   }
+  emit progress("transitive refinement", window_num, window_num);
   //clog << "pathz=" << pathz.size()
   //     << " all_cmp=" << all_comparisons.size();
   //if (pathz.begin() != pathz.end())