datasketches 0.2.6 → 0.3.0

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

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

data/vendor/datasketches-cpp/req/test/req_sketch_custom_type_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sstream>
 
 #include <req_sketch.hpp>
@@ -26,7 +26,7 @@
 
 namespace datasketches {
 
-using req_test_type_sketch = req_sketch<test_type, test_type_less, test_type_serde, test_allocator<test_type>>;
+using req_test_type_sketch = req_sketch<test_type, test_type_less, test_allocator<test_type>>;
 using alloc = test_allocator<test_type>;
 
 TEST_CASE("req sketch custom type", "[req_sketch]") {
@@ -35,26 +35,26 @@ TEST_CASE("req sketch custom type", "[req_sketch]") {
   test_allocator_total_bytes = 0;
 
   SECTION("compact level zero") {
-    req_test_type_sketch sketch(4, true, 0);
+    req_test_type_sketch sketch(4, true, 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);
 
     for (int i = 0; i < 24; ++i) sketch.update(i);
     //std::cout << sketch.to_string(true);
 
     REQUIRE(sketch.is_estimation_mode());
     REQUIRE(sketch.get_n() > sketch.get_num_retained());
-    REQUIRE(sketch.get_min_value().get_value() == 0);
-    REQUIRE(sketch.get_max_value().get_value() == 23);
+    REQUIRE(sketch.get_min_item().get_value() == 0);
+    REQUIRE(sketch.get_max_item().get_value() == 23);
   }
 
   SECTION("merge small") {
-    req_test_type_sketch sketch1(4, true, 0);
+    req_test_type_sketch sketch1(4, true, test_type_less(), 0);
     sketch1.update(1);
 
-    req_test_type_sketch sketch2(4, true, 0);
+    req_test_type_sketch sketch2(4, true, test_type_less(), 0);
     sketch2.update(2);
 
     sketch2.merge(sketch1);
@@ -63,15 +63,15 @@ TEST_CASE("req sketch custom type", "[req_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") {
-    req_test_type_sketch sketch1(4, true, 0);
+    req_test_type_sketch sketch1(4, true, test_type_less(), 0);
     for (int i = 0; i < 24; ++i) sketch1.update(i);
 
-    req_test_type_sketch sketch2(4, true, 0);
+    req_test_type_sketch sketch2(4, true, test_type_less(), 0);
     for (int i = 0; i < 24; ++i) sketch2.update(i);
 
     sketch2.merge(sketch1);
@@ -80,28 +80,28 @@ TEST_CASE("req sketch custom type", "[req_sketch]") {
 
     REQUIRE(sketch2.is_estimation_mode());
     REQUIRE(sketch2.get_n() > sketch2.get_num_retained());
-    REQUIRE(sketch2.get_min_value().get_value() == 0);
-    REQUIRE(sketch2.get_max_value().get_value() == 23);
+    REQUIRE(sketch2.get_min_item().get_value() == 0);
+    REQUIRE(sketch2.get_max_item().get_value() == 23);
   }
 
   SECTION("serialize deserialize") {
-    req_test_type_sketch sketch1(12, true, 0);
+    req_test_type_sketch sketch1(12, true, 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 = req_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 = req_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_quantile(0.5).get_value() == sketch1.get_quantile(0.5).get_value());
     REQUIRE(sketch2.get_rank(0) == sketch1.get_rank(0));
     REQUIRE(sketch2.get_rank(n) == sketch1.get_rank(n));
@@ -109,13 +109,13 @@ TEST_CASE("req sketch custom type", "[req_sketch]") {
   }
 
   SECTION("moving merge") {
-    req_test_type_sketch sketch1(4, true, 0);
+    req_test_type_sketch sketch1(4, true, test_type_less(), 0);
     for (int i = 0; i < 10; i++) sketch1.update(i);
-    req_test_type_sketch sketch2(4, true, 0);
+    req_test_type_sketch sketch2(4, true, 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);
   }
 

data/vendor/datasketches-cpp/req/test/req_sketch_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <req_sketch.hpp>
 
@@ -43,19 +43,16 @@ TEST_CASE("req sketch: empty", "[req_sketch]") {
   REQUIRE_FALSE(sketch.is_estimation_mode());
   REQUIRE(sketch.get_n() == 0);
   REQUIRE(sketch.get_num_retained() == 0);
-  REQUIRE(std::isnan(sketch.get_rank(0)));
-  REQUIRE(std::isnan(sketch.get_rank(std::numeric_limits<float>::infinity())));
-  REQUIRE(std::isnan(sketch.get_min_value()));
-  REQUIRE(std::isnan(sketch.get_max_value()));
-  REQUIRE(std::isnan(sketch.get_quantile(0)));
-  REQUIRE(std::isnan(sketch.get_quantile(0.5)));
-  REQUIRE(std::isnan(sketch.get_quantile(1)));
+  REQUIRE_THROWS_AS(sketch.get_min_item(), std::runtime_error);
+  REQUIRE_THROWS_AS(sketch.get_max_item(), std::runtime_error);
+  REQUIRE_THROWS_AS(sketch.get_rank(0), std::runtime_error);
+  REQUIRE_THROWS_AS(sketch.get_quantile(0), std::runtime_error);
   const double ranks[3] {0, 0.5, 1};
-  REQUIRE(sketch.get_quantiles(ranks, 3).size() == 0);
+  REQUIRE_THROWS_AS(sketch.get_quantiles(ranks, 3), std::runtime_error);
 
   const float split_points[1] {0};
-  REQUIRE(sketch.get_CDF(split_points, 1).empty());
-  REQUIRE(sketch.get_PMF(split_points, 1).empty());
+  REQUIRE_THROWS_AS(sketch.get_CDF(split_points, 1), std::runtime_error);
+  REQUIRE_THROWS_AS(sketch.get_PMF(split_points, 1), std::runtime_error);
 }
 
 TEST_CASE("req sketch: single value, lra", "[req_sketch]") {
@@ -66,13 +63,13 @@ TEST_CASE("req sketch: single value, lra", "[req_sketch]") {
   REQUIRE_FALSE(sketch.is_estimation_mode());
   REQUIRE(sketch.get_n() == 1);
   REQUIRE(sketch.get_num_retained() == 1);
-  REQUIRE(sketch.get_rank(1.0f) == 0);
-  REQUIRE(sketch.get_rank<true>(1.0f) == 1);
-  REQUIRE(sketch.get_rank(1.1f) == 1);
+  REQUIRE(sketch.get_rank(1.0f, false) == 0);
+  REQUIRE(sketch.get_rank(1.0f) == 1);
+  REQUIRE(sketch.get_rank(1.1f, false) == 1);
   REQUIRE(sketch.get_rank(std::numeric_limits<float>::infinity()) == 1);
-  REQUIRE(sketch.get_quantile(0) == 1);
-  REQUIRE(sketch.get_quantile(0.5) == 1);
-  REQUIRE(sketch.get_quantile(1) == 1);
+  REQUIRE(sketch.get_quantile(0, false) == 1);
+  REQUIRE(sketch.get_quantile(0.5, false) == 1);
+  REQUIRE(sketch.get_quantile(1, false) == 1);
 
   const double ranks[3] {0, 0.5, 1};
   auto quantiles = sketch.get_quantiles(ranks, 3);
@@ -82,11 +79,16 @@ TEST_CASE("req sketch: single value, lra", "[req_sketch]") {
   REQUIRE(quantiles[2] == 1);
 
   unsigned count = 0;
-  for (auto it: sketch) {
-    REQUIRE(it.second == 1);
+  for (auto pair: sketch) {
+    REQUIRE(pair.second == 1);
     ++count;
   }
   REQUIRE(count == 1);
+
+  // iterator dereferencing
+  auto it = sketch.begin();
+  REQUIRE(it->first == 1.0f);
+  REQUIRE((*it).first == 1.0f);
 }
 
 TEST_CASE("req sketch: repeated values", "[req_sketch]") {
@@ -101,10 +103,10 @@ TEST_CASE("req sketch: repeated values", "[req_sketch]") {
   REQUIRE_FALSE(sketch.is_estimation_mode());
   REQUIRE(sketch.get_n() == 6);
   REQUIRE(sketch.get_num_retained() == 6);
-  REQUIRE(sketch.get_rank(1.0f) == 0);
-  REQUIRE(sketch.get_rank<true>(1.0f) == 0.5);
-  REQUIRE(sketch.get_rank(2.0f) == 0.5);
-  REQUIRE(sketch.get_rank<true>(2.0f) == 1);
+  REQUIRE(sketch.get_rank(1.0f, false) == 0);
+  REQUIRE(sketch.get_rank(1.0f) == 0.5);
+  REQUIRE(sketch.get_rank(2.0f, false) == 0.5);
+  REQUIRE(sketch.get_rank(2.0f) == 1);
 }
 
 TEST_CASE("req sketch: exact mode", "[req_sketch]") {
@@ -115,48 +117,48 @@ TEST_CASE("req sketch: exact mode", "[req_sketch]") {
   REQUIRE(sketch.get_n() == 10);
   REQUIRE(sketch.get_num_retained() == 10);
 
-  // like KLL
-  REQUIRE(sketch.get_rank(1.0f) == 0);
-  REQUIRE(sketch.get_rank(2.0f) == 0.1);
-  REQUIRE(sketch.get_rank(6.0f) == 0.5);
-  REQUIRE(sketch.get_rank(9.0f) == 0.8);
-  REQUIRE(sketch.get_rank(10.0f) == 0.9);
+  // exclusive
+  REQUIRE(sketch.get_rank(1.0f, false) == 0);
+  REQUIRE(sketch.get_rank(2.0f, false) == 0.1);
+  REQUIRE(sketch.get_rank(6.0f, false) == 0.5);
+  REQUIRE(sketch.get_rank(9.0f, false) == 0.8);
+  REQUIRE(sketch.get_rank(10.0f, false) == 0.9);
 
   // inclusive
-  REQUIRE(sketch.get_rank<true>(1.0f) == 0.1);
-  REQUIRE(sketch.get_rank<true>(2.0f) == 0.2);
-  REQUIRE(sketch.get_rank<true>(5.0f) == 0.5);
-  REQUIRE(sketch.get_rank<true>(9.0f) == 0.9);
-  REQUIRE(sketch.get_rank<true>(10.0f) == 1);
+  REQUIRE(sketch.get_rank(1.0f) == 0.1);
+  REQUIRE(sketch.get_rank(2.0f) == 0.2);
+  REQUIRE(sketch.get_rank(5.0f) == 0.5);
+  REQUIRE(sketch.get_rank(9.0f) == 0.9);
+  REQUIRE(sketch.get_rank(10.0f) == 1);
+
+  // exclusive
+  REQUIRE(sketch.get_quantile(0, false) == 1);
+  REQUIRE(sketch.get_quantile(0.1, false) == 2);
+  REQUIRE(sketch.get_quantile(0.5, false) == 6);
+  REQUIRE(sketch.get_quantile(0.9, false) == 10);
+  REQUIRE(sketch.get_quantile(1, false) == 10);
 
-  // like KLL
+  // inclusive
   REQUIRE(sketch.get_quantile(0) == 1);
-  REQUIRE(sketch.get_quantile(0.1) == 2);
-  REQUIRE(sketch.get_quantile(0.5) == 6);
-  REQUIRE(sketch.get_quantile(0.9) == 10);
+  REQUIRE(sketch.get_quantile(0.1) == 1);
+  REQUIRE(sketch.get_quantile(0.5) == 5);
+  REQUIRE(sketch.get_quantile(0.9) == 9);
   REQUIRE(sketch.get_quantile(1) == 10);
 
-  // inclusive
-  REQUIRE(sketch.get_quantile<true>(0) == 1);
-  REQUIRE(sketch.get_quantile<true>(0.1) == 1);
-  REQUIRE(sketch.get_quantile<true>(0.5) == 5);
-  REQUIRE(sketch.get_quantile<true>(0.9) == 9);
-  REQUIRE(sketch.get_quantile<true>(1) == 10);
-
   const double ranks[3] {0, 0.5, 1};
   auto quantiles = sketch.get_quantiles(ranks, 3);
   REQUIRE(quantiles.size() == 3);
   REQUIRE(quantiles[0] == 1);
-  REQUIRE(quantiles[1] == 6);
+  REQUIRE(quantiles[1] == 5);
   REQUIRE(quantiles[2] == 10);
 
   const float splits[3] {2, 6, 9};
-  auto cdf = sketch.get_CDF(splits, 3);
+  auto cdf = sketch.get_CDF(splits, 3, false);
   REQUIRE(cdf[0] == 0.1);
   REQUIRE(cdf[1] == 0.5);
   REQUIRE(cdf[2] == 0.8);
   REQUIRE(cdf[3] == 1);
-  auto pmf = sketch.get_PMF(splits, 3);
+  auto pmf = sketch.get_PMF(splits, 3, false);
   REQUIRE(pmf[0] == Approx(0.1).margin(1e-8));
   REQUIRE(pmf[1] == Approx(0.4).margin(1e-8));
   REQUIRE(pmf[2] == Approx(0.3).margin(1e-8));
@@ -175,18 +177,18 @@ TEST_CASE("req sketch: estimation mode", "[req_sketch]") {
   REQUIRE(sketch.get_n() == n);
 //  std::cout << sketch.to_string(true);
   REQUIRE(sketch.get_num_retained() < n);
-  REQUIRE(sketch.get_rank(0) == 0);
-  REQUIRE(sketch.get_rank(static_cast<float>(n)) == 1);
-  REQUIRE(sketch.get_rank(n / 2.0f) == Approx(0.5).margin(0.01));
-  REQUIRE(sketch.get_rank(n - 1.0f) == Approx(1).margin(0.01));
-  REQUIRE(sketch.get_min_value() == 0);
-  REQUIRE(sketch.get_max_value() == n - 1);
+  REQUIRE(sketch.get_rank(0, false) == 0);
+  REQUIRE(sketch.get_rank(static_cast<float>(n), false) == 1);
+  REQUIRE(sketch.get_rank(n / 2.0f, false) == Approx(0.5).margin(0.01));
+  REQUIRE(sketch.get_rank(n - 1.0f, false) == Approx(1).margin(0.01));
+  REQUIRE(sketch.get_min_item() == 0);
+  REQUIRE(sketch.get_max_item() == n - 1);
   REQUIRE(sketch.get_rank_lower_bound(0.5, 1) < 0.5);
   REQUIRE(sketch.get_rank_upper_bound(0.5, 1) > 0.5);
 
   unsigned count = 0;
-  for (auto it: sketch) {
-    REQUIRE(it.second >= 1);
+  for (auto pair: sketch) {
+    REQUIRE(pair.second >= 1);
     ++count;
   }
   REQUIRE(count == sketch.get_num_retained());
@@ -203,8 +205,8 @@ TEST_CASE("req sketch: stream serialize-deserialize empty", "[req_sketch]") {
   REQUIRE(sketch2.is_estimation_mode() == sketch.is_estimation_mode());
   REQUIRE(sketch2.get_num_retained() == sketch.get_num_retained());
   REQUIRE(sketch2.get_n() == sketch.get_n());
-  REQUIRE(std::isnan(sketch2.get_min_value()));
-  REQUIRE(std::isnan(sketch2.get_max_value()));
+  REQUIRE_THROWS_AS(sketch2.get_min_item(), std::runtime_error);
+  REQUIRE_THROWS_AS(sketch2.get_max_item(), std::runtime_error);
 }
 
 TEST_CASE("req sketch: byte serialize-deserialize empty", "[req_sketch]") {
@@ -218,8 +220,8 @@ TEST_CASE("req sketch: byte serialize-deserialize empty", "[req_sketch]") {
   REQUIRE(sketch2.is_estimation_mode() == sketch.is_estimation_mode());
   REQUIRE(sketch2.get_num_retained() == sketch.get_num_retained());
   REQUIRE(sketch2.get_n() == sketch.get_n());
-  REQUIRE(std::isnan(sketch2.get_min_value()));
-  REQUIRE(std::isnan(sketch2.get_max_value()));
+  REQUIRE_THROWS_AS(sketch2.get_min_item(), std::runtime_error);
+  REQUIRE_THROWS_AS(sketch2.get_max_item(), std::runtime_error);
 }
 
 TEST_CASE("req sketch: stream serialize-deserialize single item", "[req_sketch]") {
@@ -234,8 +236,8 @@ TEST_CASE("req sketch: stream serialize-deserialize single item", "[req_sketch]"
   REQUIRE(sketch2.is_estimation_mode() == sketch.is_estimation_mode());
   REQUIRE(sketch2.get_num_retained() == sketch.get_num_retained());
   REQUIRE(sketch2.get_n() == sketch.get_n());
-  REQUIRE(sketch2.get_min_value() == sketch.get_min_value());
-  REQUIRE(sketch2.get_max_value() == sketch.get_max_value());
+  REQUIRE(sketch2.get_min_item() == sketch.get_min_item());
+  REQUIRE(sketch2.get_max_item() == sketch.get_max_item());
 }
 
 TEST_CASE("req sketch: byte serialize-deserialize single item", "[req_sketch]") {
@@ -251,8 +253,8 @@ TEST_CASE("req sketch: byte serialize-deserialize single item", "[req_sketch]")
   REQUIRE(sketch2.is_estimation_mode() == sketch.is_estimation_mode());
   REQUIRE(sketch2.get_num_retained() == sketch.get_num_retained());
   REQUIRE(sketch2.get_n() == sketch.get_n());
-  REQUIRE(sketch2.get_min_value() == sketch.get_min_value());
-  REQUIRE(sketch2.get_max_value() == sketch.get_max_value());
+  REQUIRE(sketch2.get_min_item() == sketch.get_min_item());
+  REQUIRE(sketch2.get_max_item() == sketch.get_max_item());
 }
 
 TEST_CASE("req sketch: stream serialize-deserialize exact mode", "[req_sketch]") {
@@ -269,8 +271,8 @@ TEST_CASE("req sketch: stream serialize-deserialize exact mode", "[req_sketch]")
   REQUIRE(sketch2.is_estimation_mode() == sketch.is_estimation_mode());
   REQUIRE(sketch2.get_num_retained() == sketch.get_num_retained());
   REQUIRE(sketch2.get_n() == sketch.get_n());
-  REQUIRE(sketch2.get_min_value() == sketch.get_min_value());
-  REQUIRE(sketch2.get_max_value() == sketch.get_max_value());
+  REQUIRE(sketch2.get_min_item() == sketch.get_min_item());
+  REQUIRE(sketch2.get_max_item() == sketch.get_max_item());
 }
 
 TEST_CASE("req sketch: byte serialize-deserialize exact mode", "[req_sketch]") {
@@ -288,8 +290,8 @@ TEST_CASE("req sketch: byte serialize-deserialize exact mode", "[req_sketch]") {
   REQUIRE(sketch2.is_estimation_mode() == sketch.is_estimation_mode());
   REQUIRE(sketch2.get_num_retained() == sketch.get_num_retained());
   REQUIRE(sketch2.get_n() == sketch.get_n());
-  REQUIRE(sketch2.get_min_value() == sketch.get_min_value());
-  REQUIRE(sketch2.get_max_value() == sketch.get_max_value());
+  REQUIRE(sketch2.get_min_item() == sketch.get_min_item());
+  REQUIRE(sketch2.get_max_item() == sketch.get_max_item());
 }
 
 TEST_CASE("req sketch: stream serialize-deserialize estimation mode", "[req_sketch]") {
@@ -306,8 +308,8 @@ TEST_CASE("req sketch: stream serialize-deserialize estimation mode", "[req_sket
   REQUIRE(sketch2.is_estimation_mode() == sketch.is_estimation_mode());
   REQUIRE(sketch2.get_num_retained() == sketch.get_num_retained());
   REQUIRE(sketch2.get_n() == sketch.get_n());
-  REQUIRE(sketch2.get_min_value() == sketch.get_min_value());
-  REQUIRE(sketch2.get_max_value() == sketch.get_max_value());
+  REQUIRE(sketch2.get_min_item() == sketch.get_min_item());
+  REQUIRE(sketch2.get_max_item() == sketch.get_max_item());
 }
 
 TEST_CASE("req sketch: byte serialize-deserialize estimation mode", "[req_sketch]") {
@@ -324,8 +326,8 @@ TEST_CASE("req sketch: byte serialize-deserialize estimation mode", "[req_sketch
   REQUIRE(sketch2.is_estimation_mode() == sketch.is_estimation_mode());
   REQUIRE(sketch2.get_num_retained() == sketch.get_num_retained());
   REQUIRE(sketch2.get_n() == sketch.get_n());
-  REQUIRE(sketch2.get_min_value() == sketch.get_min_value());
-  REQUIRE(sketch2.get_max_value() == sketch.get_max_value());
+  REQUIRE(sketch2.get_min_item() == sketch.get_min_item());
+  REQUIRE(sketch2.get_max_item() == sketch.get_max_item());
 }
 
 TEST_CASE("req sketch: serialize deserialize stream and bytes equivalence", "[req_sketch]") {
@@ -350,8 +352,8 @@ TEST_CASE("req sketch: serialize deserialize stream and bytes equivalence", "[re
   REQUIRE(sketch2.is_estimation_mode() == sketch.is_estimation_mode());
   REQUIRE(sketch2.get_num_retained() == sketch.get_num_retained());
   REQUIRE(sketch2.get_n() == sketch.get_n());
-  REQUIRE(sketch2.get_min_value() == sketch.get_min_value());
-  REQUIRE(sketch2.get_max_value() == sketch.get_max_value());
+  REQUIRE(sketch2.get_min_item() == sketch.get_min_item());
+  REQUIRE(sketch2.get_max_item() == sketch.get_max_item());
 }
 
 TEST_CASE("req sketch: stream deserialize from Java - empty", "[req_sketch]") {
@@ -363,8 +365,8 @@ TEST_CASE("req sketch: stream deserialize from Java - empty", "[req_sketch]") {
   REQUIRE_FALSE(sketch.is_estimation_mode());
   REQUIRE(sketch.get_n() == 0);
   REQUIRE(sketch.get_num_retained() == 0);
-  REQUIRE(std::isnan(sketch.get_min_value()));
-  REQUIRE(std::isnan(sketch.get_max_value()));
+  REQUIRE_THROWS_AS(sketch.get_min_item(), std::runtime_error);
+  REQUIRE_THROWS_AS(sketch.get_max_item(), std::runtime_error);
 }
 
 TEST_CASE("req sketch: stream deserialize from Java - single item", "[req_sketch]") {
@@ -376,10 +378,10 @@ TEST_CASE("req sketch: stream deserialize from Java - single item", "[req_sketch
   REQUIRE_FALSE(sketch.is_estimation_mode());
   REQUIRE(sketch.get_n() == 1);
   REQUIRE(sketch.get_num_retained() == 1);
-  REQUIRE(sketch.get_min_value() == 1);
-  REQUIRE(sketch.get_max_value() == 1);
-  REQUIRE(sketch.get_rank(1.0f) == 0);
-  REQUIRE(sketch.get_rank<true>(1.0f) == 1);
+  REQUIRE(sketch.get_min_item() == 1);
+  REQUIRE(sketch.get_max_item() == 1);
+  REQUIRE(sketch.get_rank(1.0f, false) == 0);
+  REQUIRE(sketch.get_rank(1.0f) == 1);
 }
 
 TEST_CASE("req sketch: stream deserialize from Java - raw items", "[req_sketch]") {
@@ -391,9 +393,9 @@ TEST_CASE("req sketch: stream deserialize from Java - raw items", "[req_sketch]"
   REQUIRE_FALSE(sketch.is_estimation_mode());
   REQUIRE(sketch.get_n() == 4);
   REQUIRE(sketch.get_num_retained() == 4);
-  REQUIRE(sketch.get_min_value() == 0);
-  REQUIRE(sketch.get_max_value() == 3);
-  REQUIRE(sketch.get_rank(2.0f) == 0.5);
+  REQUIRE(sketch.get_min_item() == 0);
+  REQUIRE(sketch.get_max_item() == 3);
+  REQUIRE(sketch.get_rank(2.0f, false) == 0.5);
 }
 
 TEST_CASE("req sketch: stream deserialize from Java - exact mode", "[req_sketch]") {
@@ -405,9 +407,9 @@ TEST_CASE("req sketch: stream deserialize from Java - exact mode", "[req_sketch]
   REQUIRE_FALSE(sketch.is_estimation_mode());
   REQUIRE(sketch.get_n() == 100);
   REQUIRE(sketch.get_num_retained() == 100);
-  REQUIRE(sketch.get_min_value() == 0);
-  REQUIRE(sketch.get_max_value() == 99);
-  REQUIRE(sketch.get_rank(50.0f) == 0.5);
+  REQUIRE(sketch.get_min_item() == 0);
+  REQUIRE(sketch.get_max_item() == 99);
+  REQUIRE(sketch.get_rank(50.0f, false) == 0.5);
 }
 
 TEST_CASE("req sketch: stream deserialize from Java - estimation mode", "[req_sketch]") {
@@ -419,9 +421,9 @@ TEST_CASE("req sketch: stream deserialize from Java - estimation mode", "[req_sk
   REQUIRE(sketch.is_estimation_mode());
   REQUIRE(sketch.get_n() == 10000);
   REQUIRE(sketch.get_num_retained() == 2942);
-  REQUIRE(sketch.get_min_value() == 0);
-  REQUIRE(sketch.get_max_value() == 9999);
-  REQUIRE(sketch.get_rank(5000.0f) == 0.5);
+  REQUIRE(sketch.get_min_item() == 0);
+  REQUIRE(sketch.get_max_item() == 9999);
+  REQUIRE(sketch.get_rank(5000.0f, false) == 0.5);
 }
 
 TEST_CASE("req sketch: merge into empty", "[req_sketch]") {
@@ -431,11 +433,11 @@ TEST_CASE("req sketch: merge into empty", "[req_sketch]") {
   for (size_t i = 0; i < 1000; ++i) sketch2.update(static_cast<float>(i));
 
   sketch1.merge(sketch2);
-  REQUIRE(sketch1.get_min_value() == 0);
-  REQUIRE(sketch1.get_max_value() == 999);
-  REQUIRE(sketch1.get_quantile(0.25) == Approx(250).margin(3));
-  REQUIRE(sketch1.get_quantile(0.5) == Approx(500).margin(3));
-  REQUIRE(sketch1.get_quantile(0.75) == Approx(750).margin(3));
+  REQUIRE(sketch1.get_min_item() == 0);
+  REQUIRE(sketch1.get_max_item() == 999);
+  REQUIRE(sketch1.get_quantile(0.25) == Approx(250).epsilon(0.01));
+  REQUIRE(sketch1.get_quantile(0.5) == Approx(500).epsilon(0.01));
+  REQUIRE(sketch1.get_quantile(0.75) == Approx(750).epsilon(0.01));
   REQUIRE(sketch1.get_rank(500.0f) == Approx(0.5).margin(0.01));
 }
 
@@ -447,11 +449,11 @@ TEST_CASE("req sketch: merge", "[req_sketch]") {
   for (size_t i = 1000; i < 2000; ++i) sketch2.update(static_cast<float>(i));
 
   sketch1.merge(sketch2);
-  REQUIRE(sketch1.get_min_value() == 0);
-  REQUIRE(sketch1.get_max_value() == 1999);
-  REQUIRE(sketch1.get_quantile(0.25) == Approx(500).margin(3));
-  REQUIRE(sketch1.get_quantile(0.5) == Approx(1000).margin(1));
-  REQUIRE(sketch1.get_quantile(0.75) == Approx(1500).margin(1));
+  REQUIRE(sketch1.get_min_item() == 0);
+  REQUIRE(sketch1.get_max_item() == 1999);
+  REQUIRE(sketch1.get_quantile(0.25) == Approx(500).epsilon(0.01));
+  REQUIRE(sketch1.get_quantile(0.5) == Approx(1000).epsilon(0.01));
+  REQUIRE(sketch1.get_quantile(0.75) == Approx(1500).epsilon(0.01));
   REQUIRE(sketch1.get_rank(1000.0f) == Approx(0.5).margin(0.01));
 }
 
@@ -469,9 +471,9 @@ TEST_CASE("req sketch: merge multiple", "[req_sketch]") {
   sketch.merge(sketch1);
   sketch.merge(sketch2);
   sketch.merge(sketch3);
-  REQUIRE(sketch.get_min_value() == 0);
-  REQUIRE(sketch.get_max_value() == 119);
-  REQUIRE(sketch.get_quantile(0.5) == Approx(60).margin(3));
+  REQUIRE(sketch.get_min_item() == 0);
+  REQUIRE(sketch.get_max_item() == 119);
+  REQUIRE(sketch.get_quantile(0.5) == Approx(60).epsilon(0.02));
   REQUIRE(sketch.get_rank(60.0f) == Approx(0.5).margin(0.01));
 }
 
@@ -503,8 +505,8 @@ TEST_CASE("req sketch: type conversion - several levels", "[req_sketch]") {
   REQUIRE(req_float.get_n() == req_double.get_n());
   REQUIRE(req_float.get_num_retained() == req_double.get_num_retained());
 
-  auto sv_float = req_float.get_sorted_view(false);
-  auto sv_double = req_double.get_sorted_view(false);
+  auto sv_float = req_float.get_sorted_view();
+  auto sv_double = req_double.get_sorted_view();
   auto sv_float_it = sv_float.begin();
   auto sv_double_it = sv_double.begin();
   while (sv_float_it != sv_float.end()) {
@@ -551,6 +553,17 @@ TEST_CASE("req sketch: type conversion - custom types") {
   REQUIRE(sb.get_n() == 3);
 }
 
+TEST_CASE("get_rank equivalence") {
+  req_sketch<int> sketch(12);
+  const size_t n = 1000;
+  for (size_t i = 0; i < n; ++i) sketch.update(i);
+  REQUIRE(sketch.get_n() == n);
+  auto view = sketch.get_sorted_view();
+  for (size_t i = 0; i < n; ++i) {
+    REQUIRE(sketch.get_rank(i) == view.get_rank(i));
+  }
+}
+
 //TEST_CASE("for manual comparison with Java") {
 //  req_sketch<float> sketch(12, false);
 //  for (size_t i = 0; i < 100000; ++i) sketch.update(i);