Merge pull request #1 from petergjoel/move_semantics

Move semantics

Author: petergjoel

CMakeLists.txt

@@ -6,6 +6,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+option(PTRIE_BuildTests "Build the unit tests when BUILD_TESTING is enabled." ON)
 
 project(ptrie VERSION 1.0.0 LANGUAGES CXX)
 if(NOT CMAKE_BUILD_TYPE)
@@ -18,14 +19,16 @@ set(CMAKE_CXX_STANDARD 17)
 #actual library
 add_subdirectory(src)
 
-#benchmark
-add_subdirectory(benchmark)
+if(BUILD_TESTING AND PTRIE_BuildTests)
+	#benchmark
+	add_subdirectory(benchmark)
 
-#testing
-add_subdirectory(test)
-enable_testing()
-add_test(NAME Wrapper   COMMAND Wrapper)
-add_test(NAME Set       COMMAND Set)
-add_test(NAME Delete    COMMAND Delete)
-add_test(NAME StableSet COMMAND StableSet)
-add_test(NAME Map       COMMAND Map)
+	#testing
+	add_subdirectory(test)
+	enable_testing()
+	add_test(NAME Wrapper   COMMAND Wrapper)
+	add_test(NAME Set       COMMAND Set)
+	add_test(NAME Delete    COMMAND Delete)
+	add_test(NAME StableSet COMMAND StableSet)
+	add_test(NAME Map       COMMAND Map)
+endif()

benchmark/benchmark.cpp

@@ -17,13 +17,13 @@
 // Created by Peter G. Jensen on 12/9/16.
 
 #include <iostream>
-#include <ptrie.h>
+#include <ptrie/ptrie.h>
 #include <stdlib.h>
 #include <sparsehash/sparse_hash_set>
 #include <sparsehash/dense_hash_set>
 #include <tbb/concurrent_unordered_set.h>
 #include <random>
-#include <ptrie_stable.h>
+#include <ptrie/ptrie_stable.h>
 #include <chrono>
 #include <unordered_set>
 #include "MurmurHash2.h"
@@ -261,4 +261,4 @@ int main(int argc, const char** argv)
     }
 
     return 0;
-}
+}

benchmark/int_benchmark.cpp

@@ -17,13 +17,13 @@
 // Created by Peter G. Jensen on 24/12/16.
 
 #include <iostream>
-#include <ptrie.h>
+#include <ptrie/ptrie.h>
 #include <stdlib.h>
 #include <sparsehash/sparse_hash_set>
 #include <sparsehash/dense_hash_set>
 #include <tbb/concurrent_unordered_set.h>
 #include <random>
-#include <ptrie.h>
+#include <ptrie/ptrie.h>
 #include <chrono>
 #include <unordered_set>
 #include <vector>

src/CMakeLists.txt

@@ -4,11 +4,11 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 
-add_library(ptrie binarywrapper.h binarywrapper.cpp ${HEADER_FILES})
+add_library(ptrie ptrie/binarywrapper.h ptrie/binarywrapper.cpp ${HEADER_FILES})
 target_include_directories (ptrie PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 install(TARGETS ptrie
         LIBRARY DESTINATION lib
         ARCHIVE DESTINATION lib)
-install (FILES  binarywrapper.h linked_bucket.h ptrie.h ptrie_map.h ptrie_stable.h DESTINATION include/ptrie)
+install (FILES  ptrie/binarywrapper.h ptrie/linked_bucket.h ptrie/ptrie.h ptrie/ptrie_map.h ptrie/ptrie_stable.h DESTINATION include/ptrie)
 

src/binarywrapper.cpp src/ptrie/binarywrapper.cppsrc/binarywrapper.cpp renamed to src/ptrie/binarywrapper.cpp

@@ -176,14 +176,16 @@ namespace ptrie {
         returntype_t exists(const uchar* data, size_t length);
         bool         erase (binarywrapper_t wrapper);
         bool         erase (const uchar* data, size_t length);
-
+        set(set&&) = default;
+        set& operator=(set&&) = default;
 
     };
 
     template<PTRIETPL>
     set<HEAPBOUND, SPLITBOUND, ALLOCSIZE, T, I>::~set() {
         std::stack<fwdnode_t*> stack;
-        stack.push(_root.get());
+        if(_root != nullptr)
+            stack.push(_root.get());
         while(!stack.empty())
         {
             fwdnode_t* next = stack.top();

src/binarywrapper.h src/ptrie/binarywrapper.hsrc/binarywrapper.h renamed to src/ptrie/binarywrapper.h

@@ -43,6 +43,8 @@ namespace ptrie {
 #endif
     public:
         using pt::set_stable;
+        map(map&&) = default;
+        map& operator=(map&&) = default;
         T& get_data(I index);
 
     };

src/linked_bucket.h src/ptrie/linked_bucket.hsrc/linked_bucket.h renamed to src/ptrie/linked_bucket.h

@@ -48,7 +48,10 @@ namespace ptrie {
         {
             this->_entries = std::make_unique<linked_bucket_t<typename pt::entry_t, ALLOCSIZE>>(1);
         }
-
+        
+        set_stable(set_stable&&) = default;
+        set_stable& operator=(set_stable&&) = default;
+        
         size_t size() const {
             return this->_entries->size();
         }