Merge branch 'master' of github.com:jts/sga

Conflicts: src/GraphDiff/GraphCompare.cpp src/SGA/Makefile.am src/SGA/sga.cpp
jts · May 6, 2013 · a260c50 · a260c50
2 parents 9e6b48c + 867335b
commit a260c50
Show file tree

Hide file tree

Showing 72 changed files with 1,287 additions and 6,616 deletions.
diff --git a/src/Algorithm/ClusterProcess.cpp b/src/Algorithm/ClusterProcess.cpp
@@ -42,6 +42,10 @@ ClusterResult ClusterProcess::process(const SequenceWorkItem& item)
         }
     }
 
+    // Add sequences to be used to stop extension, if requested
+    if(m_parameters.pLimitKmers != NULL)
+        cluster.setLimitKmers(m_parameters.pLimitKmers, m_parameters.limitK);
+
     // Run the clustering process
     cluster.run(m_parameters.maxClusterSize, 0);
 

diff --git a/src/Algorithm/HapgenProcess.cpp b/src/Algorithm/HapgenProcess.cpp
diff --git a/src/Algorithm/HapgenProcess.h b/src/Algorithm/HapgenProcess.h