datasketches 0.2.6 → 0.3.0

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

@@ -17,7 +17,7 @@
 
 add_executable(quantiles_test)
 
-target_link_libraries(quantiles_test quantiles common common_test)
+target_link_libraries(quantiles_test quantiles common common_test_lib)
 
 set_target_properties(quantiles_test PROPERTIES
   CXX_STANDARD 11

data/vendor/datasketches-cpp/quantiles/test/kolmogorov_smirnov_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <random>
 

data/vendor/datasketches-cpp/quantiles/test/quantiles_compatibility_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <cmath>
 #include <sstream>
 #include <fstream>
@@ -52,7 +52,7 @@ static void quantiles_decode_and_check(uint16_t k, uint64_t n, const std::string
   std::string filename = testBinaryInputPath + filestr.str();
 
   is.open(filename, std::ios::binary);
-  auto sketch_stream = quantiles_double_sketch::deserialize(is, serde<double>(), 0);
+  auto sketch_stream = quantiles_double_sketch::deserialize(is, serde<double>(), std::less<double>(), 0);
   is.close();
   REQUIRE(sketch_stream.get_quantile(median_rank) == expected_median);
 
@@ -62,7 +62,8 @@ static void quantiles_decode_and_check(uint16_t k, uint64_t n, const std::string
     (std::istreambuf_iterator<char>(infile)),
     (std::istreambuf_iterator<char>()));
   infile.close();
-  auto sketch_bytes = quantiles_double_sketch::deserialize(bytes.data(), bytes.size(), serde<double>(), 0);
+  auto sketch_bytes = quantiles_double_sketch::deserialize(bytes.data(), bytes.size(), serde<double>(),
+      std::less<double>(), 0);
   REQUIRE(sketch_bytes.get_quantile(median_rank) == expected_median);
 }
 
@@ -73,50 +74,50 @@ TEST_CASE("quantiles compatibility", "[quantiles_compatibility]") {
 
   SECTION("Qk128_n50_v0.3.0.sk") {
     // file: Qk128_n50_v0.3.0.sk
-    // median: 26.0
-    quantiles_decode_and_check(128, 50, "0.3.0", 26.0);
+    // median: 25
+    quantiles_decode_and_check(128, 50, "0.3.0", 25);
   }
 
   SECTION("Qk128_n1000_v0.3.0.sk") {
     // file: Qk128_n1000_v0.3.0.sk
-    // median: 501.0
-    quantiles_decode_and_check(128, 1000, "0.3.0", 501.0);
+    // median: ~500
+    quantiles_decode_and_check(128, 1000, "0.3.0", 497);
   }
 
   SECTION("Qk128_n50_v0.6.0.sk") {
     // file: Qk128_n50_v0.6.0.sk
-    // median: 26.0
-    quantiles_decode_and_check(128, 50, "0.6.0", 26.0);
+    // median: 25
+    quantiles_decode_and_check(128, 50, "0.6.0", 25);
   }
 
   SECTION("Qk128_n1000_v0.6.0.sk") {
     // file: Qk128_n1000_v0.6.0.sk
-    // median: 501.0
-    quantiles_decode_and_check(128, 1000, "0.6.0", 501.0);
+    // median: ~500
+    quantiles_decode_and_check(128, 1000, "0.6.0", 497);
   }
 
   SECTION("Qk128_n50_v0.8.0.sk") {
     // file: Qk128_n50_v0.8.0.sk
-    // median: 26.0
-    quantiles_decode_and_check(128, 50, "0.8.0", 26.0);
+    // median: 25
+    quantiles_decode_and_check(128, 50, "0.8.0", 25);
   }
 
   SECTION("Qk128_n1000_v0.8.0.sk") {
     // file: Qk128_n1000_v0.8.0.sk
-    // median: 501.0
-    quantiles_decode_and_check(128, 1000, "0.8.0", 501.0);
+    // median: ~500
+    quantiles_decode_and_check(128, 1000, "0.8.0", 497);
   }
 
   SECTION("Qk128_n50_v0.8.3.sk") {
     // file: Qk128_n50_v0.8.3.sk
-    // median: 26.0
-    quantiles_decode_and_check(128, 50, "0.8.3", 26.0);
+    // median: 25
+    quantiles_decode_and_check(128, 50, "0.8.3", 25);
   }
 
   SECTION("Qk128_n1000_v0.8.3.sk") {
     // file: Qk128_n1000_v0.8.3.sk
-    // median: 501.0
-    quantiles_decode_and_check(128, 1000, "0.8.3", 501.0);
+    // median: ~500
+    quantiles_decode_and_check(128, 1000, "0.8.3", 497);
   }
 
   // cleanup