Easier way to swap index in GBWTBuilder

jltsiren · Nov 9, 2017 · 38240bb · 38240bb
1 parent 7b91e2a
commit 38240bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/dynamic_gbwt.cpp b/dynamic_gbwt.cpp
@@ -669,7 +669,7 @@ DynamicGBWT::insert(text_buffer_type& text, size_type batch_size, bool both_orie
 
   // Create a builder using this index.
   GBWTBuilder builder(text.width(), batch_size);
-  builder.index.swap(*this);
+  builder.swapIndex(*this);
 
   // Insert all sequences.
   std::vector<node_type> sequence;
@@ -682,7 +682,7 @@ DynamicGBWT::insert(text_buffer_type& text, size_type batch_size, bool both_orie
 
   // Finish the construction and get the index contents back.
   builder.finish();
-  this->swap(builder.index);
+  builder.swapIndex(*this);
 
   if(Verbosity::level >= Verbosity::BASIC)
   {
@@ -859,6 +859,12 @@ GBWTBuilder::~GBWTBuilder()
   if(this->builder.joinable()) { this->builder.join(); }
 }
 
+void
+GBWTBuilder::swapIndex(DynamicGBWT& another_index)
+{
+  this->index.swap(another_index);
+}
+
 void
 GBWTBuilder::insert(std::vector<node_type>& sequence, bool both_orientations)
 {

diff --git a/include/gbwt/dynamic_gbwt.h b/include/gbwt/dynamic_gbwt.h
@@ -271,6 +271,8 @@ class GBWTBuilder
   GBWTBuilder(size_type node_width, size_type batch_size = DynamicGBWT::INSERT_BATCH_SIZE);
   ~GBWTBuilder();
 
+  void swapIndex(DynamicGBWT& another_index);
+
   void insert(std::vector<node_type>& sequence, bool both_orientations = false);
   void finish();