datasketches 0.2.7 → 0.3.0

data/vendor/datasketches-cpp/kll/test/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 add_executable(kll_test)
 
-target_link_libraries(kll_test kll common_test)
+target_link_libraries(kll_test kll common_test_lib)
 
 set_target_properties(kll_test PROPERTIES
   CXX_STANDARD 11

data/vendor/datasketches-cpp/kll/test/kll_sketch_custom_type_test.cpp

@@ -26,7 +26,7 @@
 
 namespace datasketches {
 
-using kll_test_type_sketch = kll_sketch<test_type, test_type_less, test_type_serde, test_allocator<test_type>>;
+using kll_test_type_sketch = kll_sketch<test_type, test_type_less, test_allocator<test_type>>;
 using alloc = test_allocator<test_type>;
 
 TEST_CASE("kll sketch custom type", "[kll_sketch]") {
@@ -35,11 +35,11 @@ TEST_CASE("kll sketch custom type", "[kll_sketch]") {
   test_allocator_total_bytes = 0;
 
   SECTION("compact level zero") {
-    kll_test_type_sketch sketch(8, 0);
+    kll_test_type_sketch sketch(8, test_type_less(), 0);
     REQUIRE_THROWS_AS(sketch.get_quantile(0), std::runtime_error);
-    REQUIRE_THROWS_AS(sketch.get_min_value(), std::runtime_error);
-    REQUIRE_THROWS_AS(sketch.get_max_value(), std::runtime_error);
-    REQUIRE(sketch.get_serialized_size_bytes() == 8);
+    REQUIRE_THROWS_AS(sketch.get_min_item(), std::runtime_error);
+    REQUIRE_THROWS_AS(sketch.get_max_item(), std::runtime_error);
+    REQUIRE(sketch.get_serialized_size_bytes(test_type_serde()) == 8);
 
     sketch.update(1);
     sketch.update(2);
@@ -55,15 +55,15 @@ TEST_CASE("kll sketch custom type", "[kll_sketch]") {
 
     REQUIRE(sketch.is_estimation_mode());
     REQUIRE(sketch.get_n() > sketch.get_num_retained());
-    REQUIRE(sketch.get_min_value().get_value() == 1);
-    REQUIRE(sketch.get_max_value().get_value() == 9);
+    REQUIRE(sketch.get_min_item().get_value() == 1);
+    REQUIRE(sketch.get_max_item().get_value() == 9);
   }
 
   SECTION("merge small") {
-    kll_test_type_sketch sketch1(8, 0);
+    kll_test_type_sketch sketch1(8, test_type_less(), 0);
     sketch1.update(1);
 
-    kll_test_type_sketch sketch2(8, 0);
+    kll_test_type_sketch sketch2(8, test_type_less(), 0);
     sketch2.update(2);
 
     sketch2.merge(sketch1);
@@ -72,12 +72,12 @@ TEST_CASE("kll sketch custom type", "[kll_sketch]") {
 
     REQUIRE_FALSE(sketch2.is_estimation_mode());
     REQUIRE(sketch2.get_num_retained() == sketch2.get_n());
-    REQUIRE(sketch2.get_min_value().get_value() == 1);
-    REQUIRE(sketch2.get_max_value().get_value() == 2);
+    REQUIRE(sketch2.get_min_item().get_value() == 1);
+    REQUIRE(sketch2.get_max_item().get_value() == 2);
   }
 
   SECTION("merge higher levels") {
-    kll_test_type_sketch sketch1(8, 0);
+    kll_test_type_sketch sketch1(8, test_type_less(), 0);
     sketch1.update(1);
     sketch1.update(2);
     sketch1.update(3);
@@ -88,7 +88,7 @@ TEST_CASE("kll sketch custom type", "[kll_sketch]") {
     sketch1.update(8);
     sketch1.update(9);
 
-    kll_test_type_sketch sketch2(8, 0);
+    kll_test_type_sketch sketch2(8, test_type_less(), 0);
     sketch2.update(10);
     sketch2.update(11);
     sketch2.update(12);
@@ -105,28 +105,28 @@ TEST_CASE("kll sketch custom type", "[kll_sketch]") {
 
     REQUIRE(sketch2.is_estimation_mode());
     REQUIRE(sketch2.get_n() > sketch2.get_num_retained());
-    REQUIRE(sketch2.get_min_value().get_value() == 1);
-    REQUIRE(sketch2.get_max_value().get_value() == 18);
+    REQUIRE(sketch2.get_min_item().get_value() == 1);
+    REQUIRE(sketch2.get_max_item().get_value() == 18);
   }
 
   SECTION("serialize deserialize") {
-    kll_test_type_sketch sketch1(200, 0);
+    kll_test_type_sketch sketch1(200, test_type_less(), 0);
 
     const int n = 1000;
     for (int i = 0; i < n; i++) sketch1.update(i);
 
     std::stringstream s(std::ios::in | std::ios::out | std::ios::binary);
-    sketch1.serialize(s);
-    REQUIRE((size_t) s.tellp() == sketch1.get_serialized_size_bytes());
-    auto sketch2 = kll_test_type_sketch::deserialize(s, alloc(0));
-    REQUIRE((size_t) s.tellg() == sketch2.get_serialized_size_bytes());
+    sketch1.serialize(s, test_type_serde());
+    REQUIRE((size_t) s.tellp() == sketch1.get_serialized_size_bytes(test_type_serde()));
+    auto sketch2 = kll_test_type_sketch::deserialize(s, test_type_serde(), test_type_less(), 0);
+    REQUIRE((size_t) s.tellg() == sketch2.get_serialized_size_bytes(test_type_serde()));
     REQUIRE(s.tellg() == s.tellp());
     REQUIRE(sketch2.is_empty() == sketch1.is_empty());
     REQUIRE(sketch2.is_estimation_mode() == sketch1.is_estimation_mode());
     REQUIRE(sketch2.get_n() == sketch1.get_n());
     REQUIRE(sketch2.get_num_retained() == sketch1.get_num_retained());
-    REQUIRE(sketch2.get_min_value().get_value() == sketch1.get_min_value().get_value());
-    REQUIRE(sketch2.get_max_value().get_value() == sketch1.get_max_value().get_value());
+    REQUIRE(sketch2.get_min_item().get_value() == sketch1.get_min_item().get_value());
+    REQUIRE(sketch2.get_max_item().get_value() == sketch1.get_max_item().get_value());
     REQUIRE(sketch2.get_normalized_rank_error(false) == sketch1.get_normalized_rank_error(false));
     REQUIRE(sketch2.get_normalized_rank_error(true) == sketch1.get_normalized_rank_error(true));
     REQUIRE(sketch2.get_quantile(0.5).get_value() == sketch1.get_quantile(0.5).get_value());
@@ -136,13 +136,13 @@ TEST_CASE("kll sketch custom type", "[kll_sketch]") {
   }
 
   SECTION("moving merge") {
-    kll_test_type_sketch sketch1(8, 0);
+    kll_test_type_sketch sketch1(8, test_type_less(), 0);
     for (int i = 0; i < 10; i++) sketch1.update(i);
-    kll_test_type_sketch sketch2(8, 0);
+    kll_test_type_sketch sketch2(8, test_type_less(), 0);
     sketch2.update(10);
     sketch2.merge(std::move(sketch1));
-    REQUIRE(sketch2.get_min_value().get_value() == 0);
-    REQUIRE(sketch2.get_max_value().get_value() == 10);
+    REQUIRE(sketch2.get_min_item().get_value() == 0);
+    REQUIRE(sketch2.get_max_item().get_value() == 10);
     REQUIRE(sketch2.get_n() == 11);
   }