datasketches 0.2.7 → 0.3.0

data/vendor/datasketches-cpp/common/test/quantiles_sorted_view_test.cpp

@@ -0,0 +1,459 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <catch2/catch.hpp>
+
+#include <vector>
+#include <utility>
+
+#include <iostream>
+
+#include "quantiles_sorted_view.hpp"
+
+namespace datasketches {
+
+TEST_CASE("empty", "sorted view") {
+  auto view = quantiles_sorted_view<float, std::less<float>, std::allocator<float>>(1, std::less<float>(), std::allocator<float>());
+  REQUIRE_THROWS_AS(view.get_rank(0), std::runtime_error);
+  REQUIRE_THROWS_AS(view.get_quantile(0), std::runtime_error);
+  const float split_points[1] {0};
+  REQUIRE_THROWS_AS(view.get_CDF(split_points, 1), std::runtime_error);
+  REQUIRE_THROWS_AS(view.get_PMF(split_points, 1), std::runtime_error);
+}
+
+TEST_CASE("set 0", "sorted view") {
+  auto view = quantiles_sorted_view<float, std::less<float>, std::allocator<float>>(1, std::less<float>(), std::allocator<float>());
+    std::vector<float> l0 {10};
+    view.add(l0.begin(), l0.end(), 1);
+    view.convert_to_cummulative();
+    REQUIRE(view.size() == 1);
+
+    auto it = view.begin();
+    // using operator->
+    REQUIRE(it->first == 10);
+    REQUIRE(it->second == 1);
+    // using operator*
+    REQUIRE((*it).first == 10);
+    REQUIRE((*it).second == 1);
+    REQUIRE(it.get_weight() == 1);
+    REQUIRE(it.get_cumulative_weight() == 1);
+    REQUIRE(it.get_cumulative_weight(false) == 0);
+    ++it;
+    REQUIRE(it == view.end());
+
+    REQUIRE(view.get_rank(5, true) == 0);
+    REQUIRE(view.get_rank(10, true) == 1);
+    REQUIRE(view.get_rank(15, true) == 1);
+
+    REQUIRE(view.get_rank(5, false) == 0);
+    REQUIRE(view.get_rank(10, false) == 0);
+    REQUIRE(view.get_rank(15, false) == 1);
+
+    REQUIRE(view.get_quantile(0, true) == 10);
+    REQUIRE(view.get_quantile(0.5, true) == 10);
+    REQUIRE(view.get_quantile(1, true) == 10);
+
+    REQUIRE(view.get_quantile(0, false) == 10);
+    REQUIRE(view.get_quantile(0.5, false) == 10);
+    REQUIRE(view.get_quantile(1, false) == 10);
+}
+
+TEST_CASE("set 1", "sorted view") {
+  auto view = quantiles_sorted_view<float, std::less<float>, std::allocator<float>>(1, std::less<float>(), std::allocator<float>());
+    std::vector<float> l0 {10, 10};
+    view.add(l0.begin(), l0.end(), 1);
+    view.convert_to_cummulative();
+    REQUIRE(view.size() == 2);
+
+    auto it = view.begin();
+    REQUIRE(it->first == 10);
+    REQUIRE(it->second == 1);
+    REQUIRE(it.get_weight() == 1);
+    REQUIRE(it.get_cumulative_weight() == 1);
+    REQUIRE(it.get_cumulative_weight(false) == 0);
+    ++it;
+    REQUIRE(it->first == 10);
+    REQUIRE(it->second == 2);
+    REQUIRE(it.get_weight() == 1);
+    REQUIRE(it.get_cumulative_weight() == 2);
+    REQUIRE(it.get_cumulative_weight(false) == 1);
+    ++it;
+    REQUIRE(it == view.end());
+
+    REQUIRE(view.get_rank(5, true) == 0);
+    REQUIRE(view.get_rank(10, true) == 1);
+    REQUIRE(view.get_rank(15, true) == 1);
+
+    REQUIRE(view.get_rank(5, false) == 0);
+    REQUIRE(view.get_rank(10, false) == 0);
+    REQUIRE(view.get_rank(15, false) == 1);
+
+    REQUIRE(view.get_quantile(0, true) == 10);
+    REQUIRE(view.get_quantile(0.25, true) == 10);
+    REQUIRE(view.get_quantile(0.5, true) == 10);
+    REQUIRE(view.get_quantile(0.75, true) == 10);
+    REQUIRE(view.get_quantile(1, true) == 10);
+
+    REQUIRE(view.get_quantile(0, false) == 10);
+    REQUIRE(view.get_quantile(0.25, false) == 10);
+    REQUIRE(view.get_quantile(0.5, false) == 10);
+    REQUIRE(view.get_quantile(0.75, false) == 10);
+    REQUIRE(view.get_quantile(1, false) == 10);
+}
+
+TEST_CASE("set 2", "sorted view") {
+  auto view = quantiles_sorted_view<float, std::less<float>, std::allocator<float>>(1, std::less<float>(), std::allocator<float>());
+    std::vector<float> l1 {10, 20, 30, 40};
+    view.add(l1.begin(), l1.end(), 2);
+    view.convert_to_cummulative();
+    REQUIRE(view.size() == 4);
+
+    auto it = view.begin();
+    REQUIRE(it->first == 10);
+    REQUIRE(it->second == 2);
+    REQUIRE(it.get_weight() == 2);
+    REQUIRE(it.get_cumulative_weight() == 2);
+    REQUIRE(it.get_cumulative_weight(false) == 0);
+    ++it;
+    REQUIRE(it->first == 20);
+    REQUIRE(it->second == 4);
+    REQUIRE(it.get_weight() == 2);
+    REQUIRE(it.get_cumulative_weight() == 4);
+    REQUIRE(it.get_cumulative_weight(false) == 2);
+    ++it;
+    REQUIRE(it->first == 30);
+    REQUIRE(it->second == 6);
+    REQUIRE(it.get_weight() == 2);
+    REQUIRE(it.get_cumulative_weight() == 6);
+    REQUIRE(it.get_cumulative_weight(false) == 4);
+    ++it;
+    REQUIRE(it->first == 40);
+    REQUIRE(it->second == 8);
+    REQUIRE(it.get_weight() == 2);
+    REQUIRE(it.get_cumulative_weight() == 8);
+    REQUIRE(it.get_cumulative_weight(false) == 6);
+    ++it;
+    REQUIRE(it == view.end());
+
+    REQUIRE(view.get_rank(5, true) == 0);
+    REQUIRE(view.get_rank(10, true) == 0.25);
+    REQUIRE(view.get_rank(15, true) == 0.25);
+    REQUIRE(view.get_rank(20, true) == 0.5);
+    REQUIRE(view.get_rank(25, true) == 0.5);
+    REQUIRE(view.get_rank(30, true) == 0.75);
+    REQUIRE(view.get_rank(35, true) == 0.75);
+    REQUIRE(view.get_rank(40, true) == 1);
+    REQUIRE(view.get_rank(45, true) == 1);
+
+    REQUIRE(view.get_rank(5, false) == 0);
+    REQUIRE(view.get_rank(10, false) == 0);
+    REQUIRE(view.get_rank(15, false) == 0.25);
+    REQUIRE(view.get_rank(20, false) == 0.25);
+    REQUIRE(view.get_rank(25, false) == 0.5);
+    REQUIRE(view.get_rank(30, false) == 0.5);
+    REQUIRE(view.get_rank(35, false) == 0.75);
+    REQUIRE(view.get_rank(40, false) == 0.75);
+    REQUIRE(view.get_rank(45, false) == 1);
+
+    REQUIRE(view.get_quantile(0, true) == 10);
+    REQUIRE(view.get_quantile(0.0625, true) == 10);
+    REQUIRE(view.get_quantile(0.125, true) == 10);
+    REQUIRE(view.get_quantile(0.1875, true) == 10);
+    REQUIRE(view.get_quantile(0.25, true) == 10);
+    REQUIRE(view.get_quantile(0.3125, true) == 20);
+    REQUIRE(view.get_quantile(0.375, true) == 20);
+    REQUIRE(view.get_quantile(0.4375, true) == 20);
+    REQUIRE(view.get_quantile(0.5, true) == 20);
+    REQUIRE(view.get_quantile(0.5625, true) == 30);
+    REQUIRE(view.get_quantile(0.625, true) == 30);
+    REQUIRE(view.get_quantile(0.6875, true) == 30);
+    REQUIRE(view.get_quantile(0.75, true) == 30);
+    REQUIRE(view.get_quantile(0.8125, true) == 40);
+    REQUIRE(view.get_quantile(0.875, true) == 40);
+    REQUIRE(view.get_quantile(0.9375, true) == 40);
+    REQUIRE(view.get_quantile(1, true) == 40);
+
+    REQUIRE(view.get_quantile(0, false) == 10);
+    REQUIRE(view.get_quantile(0.0625, false) == 10);
+    REQUIRE(view.get_quantile(0.125, false) == 10);
+    REQUIRE(view.get_quantile(0.1875, false) == 10);
+    REQUIRE(view.get_quantile(0.25, false) == 20);
+    REQUIRE(view.get_quantile(0.3125, false) == 20);
+    REQUIRE(view.get_quantile(0.375, false) == 20);
+    REQUIRE(view.get_quantile(0.4375, false) == 20);
+    REQUIRE(view.get_quantile(0.5, false) == 30);
+    REQUIRE(view.get_quantile(0.5625, false) == 30);
+    REQUIRE(view.get_quantile(0.625, false) == 30);
+    REQUIRE(view.get_quantile(0.6875, false) == 30);
+    REQUIRE(view.get_quantile(0.75, false) == 40);
+    REQUIRE(view.get_quantile(0.8125, false) == 40);
+    REQUIRE(view.get_quantile(0.875, false) == 40);
+    REQUIRE(view.get_quantile(0.9375, false) == 40);
+    REQUIRE(view.get_quantile(1, false) == 40);
+}
+
+TEST_CASE("set 3", "sorted view") {
+  auto view = quantiles_sorted_view<float, std::less<float>, std::allocator<float>>(8, std::less<float>(), std::allocator<float>());
+    std::vector<float> l1 {10, 20, 20, 30, 30, 30, 40, 50};
+    view.add(l1.begin(), l1.end(), 2);
+    view.convert_to_cummulative();
+    REQUIRE(view.size() == 8);
+
+    auto it = view.begin();
+    REQUIRE(it->first == 10);
+    REQUIRE(it->second == 2);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 20);
+    REQUIRE(it->second == 4);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 20);
+    REQUIRE(it->second == 6);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 30);
+    REQUIRE(it->second == 8);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 30);
+    REQUIRE(it->second == 10);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 30);
+    REQUIRE(it->second == 12);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 40);
+    REQUIRE(it->second == 14);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 50);
+    REQUIRE(it->second == 16);
+    REQUIRE(it.get_weight() == 2);
+
+    REQUIRE(view.get_rank(5, true) == 0);
+    REQUIRE(view.get_rank(10, true) == 0.125);
+    REQUIRE(view.get_rank(15, true) == 0.125);
+    REQUIRE(view.get_rank(20, true) == 0.375);
+    REQUIRE(view.get_rank(25, true) == 0.375);
+    REQUIRE(view.get_rank(30, true) == 0.75);
+    REQUIRE(view.get_rank(35, true) == 0.75);
+    REQUIRE(view.get_rank(40, true) == 0.875);
+    REQUIRE(view.get_rank(45, true) == 0.875);
+    REQUIRE(view.get_rank(50, true) == 1);
+    REQUIRE(view.get_rank(55, true) == 1);
+
+    REQUIRE(view.get_rank(5, false) == 0);
+    REQUIRE(view.get_rank(10, false) == 0);
+    REQUIRE(view.get_rank(15, false) == 0.125);
+    REQUIRE(view.get_rank(20, false) == 0.125);
+    REQUIRE(view.get_rank(25, false) == 0.375);
+    REQUIRE(view.get_rank(30, false) == 0.375);
+    REQUIRE(view.get_rank(35, false) == 0.75);
+    REQUIRE(view.get_rank(40, false) == 0.75);
+    REQUIRE(view.get_rank(45, false) == 0.875);
+    REQUIRE(view.get_rank(50, false) == 0.875);
+    REQUIRE(view.get_rank(55, false) == 1);
+
+    REQUIRE(view.get_quantile(0, true) == 10);
+    REQUIRE(view.get_quantile(0.03125, true) == 10);
+    REQUIRE(view.get_quantile(0.0625, true) == 10);
+    REQUIRE(view.get_quantile(0.09375, true) == 10);
+    REQUIRE(view.get_quantile(0.125, true) == 10);
+    REQUIRE(view.get_quantile(0.15625, true) == 20);
+    REQUIRE(view.get_quantile(0.1875, true) == 20);
+    REQUIRE(view.get_quantile(0.21875, true) == 20);
+    REQUIRE(view.get_quantile(0.25, true) == 20);
+    REQUIRE(view.get_quantile(0.28125, true) == 20);
+    REQUIRE(view.get_quantile(0.3125, true) == 20);
+    REQUIRE(view.get_quantile(0.34375, true) == 20);
+    REQUIRE(view.get_quantile(0.375, true) == 20);
+    REQUIRE(view.get_quantile(0.40625, true) == 30);
+    REQUIRE(view.get_quantile(0.4375, true) == 30);
+    REQUIRE(view.get_quantile(0.46875, true) == 30);
+    REQUIRE(view.get_quantile(0.5, true) == 30);
+    REQUIRE(view.get_quantile(0.53125, true) == 30);
+    REQUIRE(view.get_quantile(0.5625, true) == 30);
+    REQUIRE(view.get_quantile(0.59375, true) == 30);
+    REQUIRE(view.get_quantile(0.625, true) == 30);
+    REQUIRE(view.get_quantile(0.65625, true) == 30);
+    REQUIRE(view.get_quantile(0.6875, true) == 30);
+    REQUIRE(view.get_quantile(0.71875, true) == 30);
+    REQUIRE(view.get_quantile(0.75, true) == 30);
+    REQUIRE(view.get_quantile(0.78125, true) == 40);
+    REQUIRE(view.get_quantile(0.8125, true) == 40);
+    REQUIRE(view.get_quantile(0.84375, true) == 40);
+    REQUIRE(view.get_quantile(0.875, true) == 40);
+    REQUIRE(view.get_quantile(0.90625, true) == 50);
+    REQUIRE(view.get_quantile(0.9375, true) == 50);
+    REQUIRE(view.get_quantile(0.96875, true) == 50);
+    REQUIRE(view.get_quantile(1, true) == 50);
+
+    REQUIRE(view.get_quantile(0, false) == 10);
+    REQUIRE(view.get_quantile(0.03125, false) == 10);
+    REQUIRE(view.get_quantile(0.0625, false) == 10);
+    REQUIRE(view.get_quantile(0.09375, false) == 10);
+    REQUIRE(view.get_quantile(0.125, false) == 20);
+    REQUIRE(view.get_quantile(0.15625, false) == 20);
+    REQUIRE(view.get_quantile(0.1875, false) == 20);
+    REQUIRE(view.get_quantile(0.21875, false) == 20);
+    REQUIRE(view.get_quantile(0.25, false) == 20);
+    REQUIRE(view.get_quantile(0.28125, false) == 20);
+    REQUIRE(view.get_quantile(0.3125, false) == 20);
+    REQUIRE(view.get_quantile(0.34375, false) == 20);
+    REQUIRE(view.get_quantile(0.375, false) == 30);
+    REQUIRE(view.get_quantile(0.40625, false) == 30);
+    REQUIRE(view.get_quantile(0.4375, false) == 30);
+    REQUIRE(view.get_quantile(0.46875, false) == 30);
+    REQUIRE(view.get_quantile(0.5, false) == 30);
+    REQUIRE(view.get_quantile(0.53125, false) == 30);
+    REQUIRE(view.get_quantile(0.5625, false) == 30);
+    REQUIRE(view.get_quantile(0.59375, false) == 30);
+    REQUIRE(view.get_quantile(0.625, false) == 30);
+    REQUIRE(view.get_quantile(0.65625, false) == 30);
+    REQUIRE(view.get_quantile(0.6875, false) == 30);
+    REQUIRE(view.get_quantile(0.71875, false) == 30);
+    REQUIRE(view.get_quantile(0.75, false) == 40);
+    REQUIRE(view.get_quantile(0.78125, false) == 40);
+    REQUIRE(view.get_quantile(0.8125, false) == 40);
+    REQUIRE(view.get_quantile(0.84375, false) == 40);
+    REQUIRE(view.get_quantile(0.875, false) == 50);
+    REQUIRE(view.get_quantile(0.90625, false) == 50);
+    REQUIRE(view.get_quantile(0.9375, false) == 50);
+    REQUIRE(view.get_quantile(0.96875, false) == 50);
+    REQUIRE(view.get_quantile(1, false) == 50);
+}
+
+TEST_CASE("set 4", "sorted view") {
+  auto view = quantiles_sorted_view<float, std::less<float>, std::allocator<float>>(8, std::less<float>(), std::allocator<float>());
+    std::vector<float> l1 {10, 20, 30, 40};
+    view.add(l1.begin(), l1.end(), 2);
+    std::vector<float> l0 {10, 20, 30, 40};
+    view.add(l0.begin(), l0.end(), 1);
+    view.convert_to_cummulative();
+    REQUIRE(view.size() == 8);
+
+    auto it = view.begin();
+    REQUIRE(it->first == 10);
+    REQUIRE(it->second == 2);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 10);
+    REQUIRE(it->second == 3);
+    REQUIRE(it.get_weight() == 1);
+    ++it;
+    REQUIRE(it->first == 20);
+    REQUIRE(it->second == 5);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 20);
+    REQUIRE(it->second == 6);
+    REQUIRE(it.get_weight() == 1);
+    ++it;
+    REQUIRE(it->first == 30);
+    REQUIRE(it->second == 8);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 30);
+    REQUIRE(it->second == 9);
+    REQUIRE(it.get_weight() == 1);
+    ++it;
+    REQUIRE(it->first == 40);
+    REQUIRE(it->second == 11);
+    REQUIRE(it.get_weight() == 2);
+    ++it;
+    REQUIRE(it->first == 40);
+    REQUIRE(it->second == 12);
+    REQUIRE(it.get_weight() == 1);
+
+    REQUIRE(view.get_rank(5, true) == 0);
+    REQUIRE(view.get_rank(10, true) == 0.25);
+    REQUIRE(view.get_rank(15, true) == 0.25);
+    REQUIRE(view.get_rank(20, true) == 0.5);
+    REQUIRE(view.get_rank(25, true) == 0.5);
+    REQUIRE(view.get_rank(30, true) == 0.75);
+    REQUIRE(view.get_rank(35, true) == 0.75);
+    REQUIRE(view.get_rank(40, true) == 1);
+    REQUIRE(view.get_rank(45, true) == 1);
+
+    REQUIRE(view.get_rank(5, false) == 0);
+    REQUIRE(view.get_rank(10, false) == 0);
+    REQUIRE(view.get_rank(15, false) == 0.25);
+    REQUIRE(view.get_rank(20, false) == 0.25);
+    REQUIRE(view.get_rank(25, false) == 0.5);
+    REQUIRE(view.get_rank(30, false) == 0.5);
+    REQUIRE(view.get_rank(35, false) == 0.75);
+    REQUIRE(view.get_rank(40, false) == 0.75);
+    REQUIRE(view.get_rank(45, false) == 1);
+
+    REQUIRE(view.get_quantile(0, true) == 10);
+    REQUIRE(view.get_quantile(0.0417, true) == 10);
+    REQUIRE(view.get_quantile(0.0833, true) == 10);
+    REQUIRE(view.get_quantile(0.125, true) == 10);
+    REQUIRE(view.get_quantile(0.1667, true) == 10);
+    REQUIRE(view.get_quantile(0.2083, true) == 10);
+    REQUIRE(view.get_quantile(0.25, true) == 10);
+    REQUIRE(view.get_quantile(0.2917, true) == 20);
+    REQUIRE(view.get_quantile(0.3333, true) == 20);
+    REQUIRE(view.get_quantile(0.375, true) == 20);
+    REQUIRE(view.get_quantile(0.4167, true) == 20);
+    REQUIRE(view.get_quantile(0.4583, true) == 20);
+    REQUIRE(view.get_quantile(0.5, true) == 20);
+    REQUIRE(view.get_quantile(0.5417, true) == 30);
+    REQUIRE(view.get_quantile(0.5833, true) == 30);
+    REQUIRE(view.get_quantile(0.625, true) == 30);
+    REQUIRE(view.get_quantile(0.6667, true) == 30);
+    REQUIRE(view.get_quantile(0.7083, true) == 30);
+    REQUIRE(view.get_quantile(0.75, true) == 30);
+    REQUIRE(view.get_quantile(0.7917, true) == 40);
+    REQUIRE(view.get_quantile(0.8333, true) == 40);
+    REQUIRE(view.get_quantile(0.875, true) == 40);
+    REQUIRE(view.get_quantile(0.9167, true) == 40);
+    REQUIRE(view.get_quantile(0.9583, true) == 40);
+    REQUIRE(view.get_quantile(1, true) == 40);
+
+    REQUIRE(view.get_quantile(0, false) == 10);
+    REQUIRE(view.get_quantile(0.0417, false) == 10);
+    REQUIRE(view.get_quantile(0.0833, false) == 10);
+    REQUIRE(view.get_quantile(0.125, false) == 10);
+    REQUIRE(view.get_quantile(0.1667, false) == 10);
+    REQUIRE(view.get_quantile(0.2083, false) == 10);
+    REQUIRE(view.get_quantile(0.25, false) == 20);
+    REQUIRE(view.get_quantile(0.2917, false) == 20);
+    REQUIRE(view.get_quantile(0.3333, false) == 20);
+    REQUIRE(view.get_quantile(0.375, false) == 20);
+    REQUIRE(view.get_quantile(0.4167, false) == 20);
+    REQUIRE(view.get_quantile(0.4583, false) == 20);
+    REQUIRE(view.get_quantile(0.5, false) == 30);
+    REQUIRE(view.get_quantile(0.5417, false) == 30);
+    REQUIRE(view.get_quantile(0.5833, false) == 30);
+    REQUIRE(view.get_quantile(0.625, false) == 30);
+    REQUIRE(view.get_quantile(0.6667, false) == 30);
+    REQUIRE(view.get_quantile(0.7083, false) == 30);
+    REQUIRE(view.get_quantile(0.75, false) == 40);
+    REQUIRE(view.get_quantile(0.7917, false) == 40);
+    REQUIRE(view.get_quantile(0.8333, false) == 40);
+    REQUIRE(view.get_quantile(0.875, false) == 40);
+    REQUIRE(view.get_quantile(0.9167, false) == 40);
+    REQUIRE(view.get_quantile(0.9583, false) == 40);
+    REQUIRE(view.get_quantile(1, false) == 40);
+}
+
+} /* namespace datasketches */

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

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

data/vendor/datasketches-cpp/fi/include/frequent_items_sketch.hpp

@@ -34,7 +34,7 @@ namespace datasketches {
 
 /*
  * Based on Java implementation here:
- * https://github.com/DataSketches/sketches-core/blob/master/src/main/java/com/yahoo/sketches/frequencies/ItemsSketch.java
+ * https://github.com/apache/datasketches-java/blob/master/src/main/java/org/apache/datasketches/frequencies/ItemsSketch.java
  * author Alexander Saydakov
  */
 
@@ -46,7 +46,6 @@ template<
   typename W = uint64_t,
   typename H = std::hash<T>,
   typename E = std::equal_to<T>,
-  typename S = serde<T>, // deprecated, to be removed in the next major version
   typename A = std::allocator<T>
 >
 class frequent_items_sketch {
@@ -60,11 +59,13 @@ public:
    * @param lg_max_map_size Log2 of the physical size of the internal hash map managed by this
    * sketch. The maximum capacity of this internal hash map is 0.75 times 2^lg_max_map_size.
    * Both the ultimate accuracy and size of this sketch are functions of lg_max_map_size.
-   *
    * @param lg_start_map_size Log2 of the starting physical size of the internal hash
    * map managed by this sketch.
+   * @param equal instance of Equality operator
+   * @param allocator instance of an Allocator
    */
-  explicit frequent_items_sketch(uint8_t lg_max_map_size, uint8_t lg_start_map_size = LG_MIN_MAP_SIZE, const A& allocator = A());
+  explicit frequent_items_sketch(uint8_t lg_max_map_size, uint8_t lg_start_map_size = LG_MIN_MAP_SIZE,
+      const E& equal = E(), const A& allocator = A());
 
   /**
    * Update this sketch with an item and a positive weight (frequency count).
@@ -158,7 +159,7 @@ public:
   /**
    * Returns epsilon used to compute <i>a priori</i> error.
    * This is just the value <i>3.5 / maxMapSize</i>.
-   * @param maxMapSize the planned map size to be used when constructing this sketch.
+   * @param lg_max_map_size the planned map size to be used when constructing this sketch.
    * @return epsilon used to compute <i>a priori</i> error.
    */
   static double get_epsilon(uint8_t lg_max_map_size);
@@ -167,13 +168,13 @@ public:
    * Returns the estimated <i>a priori</i> error given the max_map_size for the sketch and the
    * estimated_total_stream_weight.
    * @param lg_max_map_size the planned map size to be used when constructing this sketch.
-   * @param estimated_total_stream_weight the estimated total stream weight.
+   * @param estimated_total_weight the estimated total stream weight.
    * @return the estimated <i>a priori</i> error.
    */
   static double get_apriori_error(uint8_t lg_max_map_size, W estimated_total_weight);
 
   class row;
-  typedef typename std::vector<row, typename std::allocator_traits<A>::template rebind_alloc<row>> vector_row; // alias for users
+  using vector_row = typename std::vector<row, typename std::allocator_traits<A>::template rebind_alloc<row>>;
 
   /**
    * Returns an array of rows that include frequent items, estimates, upper and lower bounds
@@ -225,18 +226,18 @@ public:
   /**
    * Computes size needed to serialize the current state of the sketch.
    * This can be expensive since every item needs to be looked at.
-   * @param instance of a SerDe
+   * @param sd instance of a SerDe
    * @return size in bytes needed to serialize this sketch
    */
-  template<typename SerDe = S>
+  template<typename SerDe = serde<T>>
   size_t get_serialized_size_bytes(const SerDe& sd = SerDe()) const;
 
   /**
    * This method serializes the sketch into a given stream in a binary form
    * @param os output stream
-   * @param instance of a SerDe
+   * @param sd instance of a SerDe
    */
-  template<typename SerDe = S>
+  template<typename SerDe = serde<T>>
   void serialize(std::ostream& os, const SerDe& sd = SerDe()) const;
 
   // This is a convenience alias for users
@@ -249,53 +250,36 @@ public:
    * It is a blank space of a given size.
    * This header is used in Datasketches PostgreSQL extension.
    * @param header_size_bytes space to reserve in front of the sketch
-   * @param instance of a SerDe
+   * @param sd instance of a SerDe
    * @return serialized sketch as a vector of bytes
    */
-  template<typename SerDe = S>
+  template<typename SerDe = serde<T>>
   vector_bytes serialize(unsigned header_size_bytes = 0, const SerDe& sd = SerDe()) const;
 
   /**
    * This method deserializes a sketch from a given stream.
    * @param is input stream
-   * @param instance of an Allocator
-   * @return an instance of the sketch
-   *
-   * Deprecated, to be removed in the next major version
-   */
-  static frequent_items_sketch deserialize(std::istream& is, const A& allocator = A());
-
-  /**
-   * This method deserializes a sketch from a given stream.
-   * @param is input stream
-   * @param instance of a SerDe
-   * @param instance of an Allocator
+   * @param sd instance of a SerDe
+   * @param equal instance of Equality operator
+   * @param allocator instance of an Allocator
    * @return an instance of the sketch
    */
-  template<typename SerDe = S>
-  static frequent_items_sketch deserialize(std::istream& is, const SerDe& sd = SerDe(), const A& allocator = A());
-
-  /**
-   * This method deserializes a sketch from a given array of bytes.
-   * @param bytes pointer to the array of bytes
-   * @param size the size of the array
-   * @param instance of an Allocator
-   * @return an instance of the sketch
-   *
-   * Deprecated, to be removed in the next major version
-   */
-  static frequent_items_sketch deserialize(const void* bytes, size_t size, const A& allocator = A());
+  template<typename SerDe = serde<T>>
+  static frequent_items_sketch deserialize(std::istream& is, const SerDe& sd = SerDe(),
+      const E& equal = E(), const A& allocator = A());
 
   /**
    * This method deserializes a sketch from a given array of bytes.
    * @param bytes pointer to the array of bytes
    * @param size the size of the array
-   * @param instance of a SerDe
-   * @param instance of an Allocator
+   * @param sd instance of a SerDe
+   * @param equal instance of Equality operator
+   * @param allocator instance of an Allocator
    * @return an instance of the sketch
    */
-  template<typename SerDe = S>
-  static frequent_items_sketch deserialize(const void* bytes, size_t size, const SerDe& sd = SerDe(), const A& allocator = A());
+  template<typename SerDe = serde<T>>
+  static frequent_items_sketch deserialize(const void* bytes, size_t size, const SerDe& sd = SerDe(),
+      const E& equal = E(), const A& allocator = A());
 
   /**
    * Returns a human readable summary of this sketch
@@ -334,8 +318,8 @@ private:
   class items_deleter;
 };
 
-template<typename T, typename W, typename H, typename E, typename S, typename A>
-class frequent_items_sketch<T, W, H, E, S, A>::row {
+template<typename T, typename W, typename H, typename E, typename A>
+class frequent_items_sketch<T, W, H, E, A>::row {
 public:
   row(const T* item, W weight, W offset):
     item(item), weight(weight), offset(offset) {}