Revert chunk-size increase, which decreased speed for large scale dat…

…asets (>10B points). Bump version to 1.1.
connormanning · May 15, 2017 · 8b01c42 · 8b01c42
1 parent ca97e8a
commit 8b01c42
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,8 +3,15 @@ cmake_minimum_required(VERSION 2.8.8)
 project(entwine)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 
-set(ENTWINE_API_VERSION "1")
-set(ENTWINE_BUILD_VERSION "1.0.0")
+set(ENTWINE_VERSION_MAJOR 1 CACHE STRING "Entwine major version" FORCE)
+set(ENTWINE_VERSION_MINOR 1 CACHE STRING "Entwine minor version" FORCE)
+set(ENTWINE_VERSION_PATCH 0 CACHE STRING "Entwine patch version" FORCE)
+set(ENTWINE_VERSION_STRING
+    "${ENTWINE_VERSION_MAJOR}.${ENTWINE_VERSION_MINOR}.${ENTWINE_VERSION_PATCH}"
+    CACHE STRING "Entwine version string" FORCE)
+
+set(ENTWINE_API_VERSION "2")
+set(ENTWINE_BUILD_VERSION ${ENTWINE_VERSION_STRING})
 
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
     MESSAGE("Defaulting to release mode")
@@ -21,13 +28,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
     add_definitions(${CMAKE_CXX_FLAGS} "-fPIC")
 endif()
 
-set(ENTWINE_VERSION_MAJOR 1 CACHE STRING "Entwine major version" FORCE)
-set(ENTWINE_VERSION_MINOR 0 CACHE STRING "Entwine major version" FORCE)
-set(ENTWINE_VERSION_PATCH 0 CACHE STRING "Entwine major version" FORCE)
-set(ENTWINE_VERSION_STRING
-    "${ENTWINE_VERSION_MAJOR}.${ENTWINE_VERSION_MINOR}.${ENTWINE_VERSION_PATCH}"
-    CACHE STRING "Entwine version string" FORCE)
-
 set(entwine_defs_hpp_in
     "${CMAKE_CURRENT_SOURCE_DIR}/entwine/types/defs.hpp.in")
 set(entwine_defs_hpp

diff --git a/entwine/tree/config-parser.cpp b/entwine/tree/config-parser.cpp
@@ -69,9 +69,9 @@ Json::Value ConfigParser::defaults()
 
     if (!shallow)
     {
-        json["pointsPerChunk"] = std::pow(4, 10);
+        json["pointsPerChunk"] = std::pow(4, 9);
         json["nullDepth"] = 7;
-        json["baseDepth"] = 11;
+        json["baseDepth"] = 10;
     }
     else
     {