Update dfuds tree

CMakeLists.txt

@@ -247,6 +247,10 @@ if(PIXIE_BENCHMARKS)
             benchmark
             benchmark_main
             ${PIXIE_DIAGNOSTICS_LIBS})
+    if(PIXIE_THIRD_PARTY_BACKENDS)
+        target_include_directories(dfuds_tree_benchmarks
+                PRIVATE ${sdsl_lite_SOURCE_DIR}/include)
+    endif()
 
     add_executable(alignment_comparison
         src/benchmarks/alignment_comparison.cpp)

include/pixie/dfuds_tree.h

@@ -12,10 +12,11 @@ namespace pixie {
  * @brief A tree class based on the depth-first unary degree sequence (DFUDS)
  * representation
  */
+template <typename RMMTree>
 class DFUDSTree {
  private:
   const size_t num_bits_;
-  RmMTree rmm_;
+  RMMTree rmm_;
 
  public:
   struct Node {
@@ -152,12 +153,4 @@ std::vector<uint64_t> adj_to_dfuds(
   return dfuds;
 }
 
-bool operator==(const AdjListNode& a, const DFUDSTree::Node& b) {
-  return a.number == b.number;
-}
-
-bool operator==(const DFUDSTree::Node& b, const AdjListNode& a) {
-  return a.number == b.number;
-}
-
 }  // namespace pixie

src/benchmarks/dfuds_tree_benchmarks.cpp

@@ -4,9 +4,17 @@
 
 #include <random>
 
-using Node = pixie::DFUDSTree::Node;
+#ifdef SDSL_SUPPORT
+#pragma message("SDSL_SUPPORT enabled")
+#include "pixie/rmm_tree_sdsl.h"
+using DFUDSTree = pixie::DFUDSTree<pixie::SdslRmMTree>;
+#else
+#pragma message("SDSL_SUPPORT disabled")
+using DFUDSTree = pixie::DFUDSTree<pixie::RmMTree>;
+#endif
+
+using Node = DFUDSTree::Node;
 using pixie::adj_to_dfuds;
-using pixie::DFUDSTree;
 
 /**
  * DFS with O(1) extra memory

src/tests/dfuds_tree_tests.cpp

@@ -6,9 +6,17 @@
 #include <random>
 #include <stack>
 
-using Node = pixie::DFUDSTree::Node;
+using DFUDSTree = pixie::DFUDSTree<pixie::RmMTree>;
+using Node = DFUDSTree::Node;
 using pixie::adj_to_dfuds;
-using pixie::DFUDSTree;
+
+bool operator==(const AdjListNode& a, const DFUDSTree::Node& b) {
+  return a.number == b.number;
+}
+
+bool operator==(const DFUDSTree::Node& b, const AdjListNode& a) {
+  return a.number == b.number;
+}
 
 TEST(DfudsTreeTest, Basic) {
   std::vector<std::vector<size_t>> adj = {{0, 1}, {0, 2}, {1, 3}, {2, 4}, {3}};