Version 0.3

jltsiren · Nov 26, 2017 · 5116b20 · 5116b20
1 parent 5e333bb
commit 5116b20
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/include/gbwt/dynamic_gbwt.h b/include/gbwt/dynamic_gbwt.h
@@ -87,8 +87,6 @@ class DynamicGBWT
   /*
     Insert the sequences from the other GBWT into this. Use batch size 0 to insert all
     sequences at once.
-
-    FIXME Special case when the node ids do not overlap.
   */
   void merge(const GBWT& source, size_type batch_size = MERGE_BATCH_SIZE);
 

diff --git a/include/gbwt/gbwt.h b/include/gbwt/gbwt.h
@@ -49,9 +49,11 @@ class GBWT
   GBWT();
   GBWT(const GBWT& source);
   GBWT(GBWT&& source);
-  GBWT(const std::vector<GBWT>& sources);
   ~GBWT();
 
+  // Merge the sources, assuming that node ids do not overlap.
+  GBWT(const std::vector<GBWT>& sources);
+
   void swap(GBWT& another);
   GBWT& operator=(const GBWT& source);
   GBWT& operator=(GBWT&& source);

diff --git a/include/gbwt/utils.h b/include/gbwt/utils.h
@@ -203,7 +203,7 @@ struct Version
   static void print(std::ostream& out, const std::string& tool_name, bool verbose = false, size_type new_lines = 2);
 
   const static size_type MAJOR_VERSION = 0;
-  const static size_type MINOR_VERSION = 2;
+  const static size_type MINOR_VERSION = 3;
   const static size_type PATCH_VERSION = 0;
 
   const static size_type GBWT_VERSION  = 1;

diff --git a/merge_gbwt.cpp b/merge_gbwt.cpp
@@ -69,9 +69,10 @@ main(int argc, char** argv)
 
   Version::print(std::cout, tool_name);
 
+  printHeader("Algorithm"); std::cout << (fast_merging ? "fast" : "insert") << std::endl;
   printHeader("Input files"); std::cout << input_files << std::endl;
   printHeader("Output name"); std::cout << output << std::endl;
-  printHeader("Batch size"); std::cout << batch_size << std::endl;
+  if(!fast_merging) { printHeader("Batch size"); std::cout << batch_size << std::endl; }
   std::cout << std::endl;
 
   double start = readTimer();