From 8356e3e6c0a04e2ca50c1803d4b592f8e0695a2d Mon Sep 17 00:00:00 2001
From: Jouni Siren <js35@sanger.ac.uk>
Date: Mon, 18 Sep 2017 15:39:22 +0100
Subject: [PATCH] Minor changes

---
 include/gbwt/dynamic_gbwt.h | 1 -
 include/gbwt/gbwt.h         | 1 -
 include/gbwt/utils.h        | 3 ++-
 merge_gbwt.cpp              | 3 +--
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/gbwt/dynamic_gbwt.h b/include/gbwt/dynamic_gbwt.h
index 26fb793..65602e0 100644
--- a/include/gbwt/dynamic_gbwt.h
+++ b/include/gbwt/dynamic_gbwt.h
@@ -40,7 +40,6 @@ class DynamicGBWT
 {
 public:
   typedef DynamicRecord::size_type size_type;
-  typedef node_type                comp_type; // Index of a record in this->bwt.
 
   const static size_type INSERT_BATCH_SIZE = 100 * MILLION; // Nodes.
   const static size_type MERGE_BATCH_SIZE = 2000;           // Sequences.
diff --git a/include/gbwt/gbwt.h b/include/gbwt/gbwt.h
index 5140f5c..46a4f58 100644
--- a/include/gbwt/gbwt.h
+++ b/include/gbwt/gbwt.h
@@ -41,7 +41,6 @@ class GBWT
 {
 public:
   typedef CompressedRecord::size_type size_type;
-  typedef node_type                   comp_type; // Index of a record in this->bwt.
 
 //------------------------------------------------------------------------------
 
diff --git a/include/gbwt/utils.h b/include/gbwt/utils.h
index d135ac7..6c96ed6 100644
--- a/include/gbwt/utils.h
+++ b/include/gbwt/utils.h
@@ -59,7 +59,8 @@ typedef std::uint64_t size_type;
 typedef std::uint32_t short_type;
 typedef std::uint8_t  byte_type;
 
-typedef size_type node_type;
+typedef size_type node_type;  // Node identifier.
+typedef size_type comp_type;  // Record identifier, compacted node identifier.
 typedef size_type rank_type;  // Rank of incoming / outgoing edge.
 
 #ifdef GBWT_SAVE_MEMORY
diff --git a/merge_gbwt.cpp b/merge_gbwt.cpp
index a6ad8c1..74d09ba 100644
--- a/merge_gbwt.cpp
+++ b/merge_gbwt.cpp
@@ -101,8 +101,7 @@ printUsage(int exit_code)
   std::cerr << "  -b N  Use batches of N sequences for merging (default "
             << DynamicGBWT::MERGE_BATCH_SIZE << ")" << std::endl;
   std::cerr << std::endl;
-  std::cerr << "Use base names for the inputs and the output. Using compressed GBWTs from input2" << std::endl;
-  std::cerr << "onwards saves memory but is slower." << std::endl;
+  std::cerr << "Use base names for the inputs and the output." << std::endl;
   std::cerr << std::endl;
 
   std::exit(exit_code);