Working stores cross merge with C++11

Author: geonove

ddsketch/include/dense_store.hpp

@@ -23,6 +23,7 @@
 #include <vector>
 #include "bin.hpp"
 #include "common_defs.hpp"
+#include "sparse_store.hpp"
 
 namespace datasketches {
 
@@ -107,6 +108,12 @@ class DenseStore {
   template<class Store>
   void merge(const DenseStore<Store, Allocator>& other);
 
+  /**
+    * @brief Merge a sparse store (same allocator) into this one.
+    * @param other store; its counts are added here.
+    */
+  void merge(const SparseStore<Allocator>& other);
+
   /**
    * This method serializes the store into a given stream in a binary form
    * @param os output stream

ddsketch/include/dense_store_impl.hpp

@@ -131,6 +131,13 @@ void DenseStore<Derived, Allocator>::merge(const DenseStore<OtherDerived, Alloca
   }
 }
 
+template<class Derived, typename Allocator>
+void DenseStore<Derived, Allocator>::merge(const SparseStore<Allocator>& other) {
+  for (const Bin& bin : other) {
+    add(bin);
+  }
+}
+
 template<class Derived, typename Allocator>
 typename DenseStore<Derived, Allocator>::iterator DenseStore<Derived, Allocator>::begin() const {
   if (is_empty()) {

ddsketch/include/log_like_index_mapping_impl.hpp

@@ -20,6 +20,7 @@
 #ifndef LOG_LIKE_INDEX_MAPPING_IMPL_HPP
 #define LOG_LIKE_INDEX_MAPPING_IMPL_HPP
 #include "log_like_index_mapping.hpp"
+#include <cassert>
 #include <cmath>
 #include "common_defs.hpp"
 

ddsketch/test/DDSketchTest.cpp

@@ -558,20 +558,24 @@ TEST_CASE("quantile", "[ddsketch]") {
   DDSketch<CollapsingLowestDenseStore<8, A>, LinearlyInterpolatedMapping> sk(0.01);
   std::random_device rd{};
   std::mt19937_64 gen{rd()};
-  std::normal_distribution<double> d(0.0, 1.0);
+  // std::normal_distribution<double> d(0.0, 1.0);
+  std::exponential_distribution<double> d(1.5);
+  int sample_size = 10000000;
 
   std::vector<double> values;
 
   tdigest<double, A> td(100);
-  DDSketch<CollapsingHighestDenseStore<1024, A>, LogarithmicMapping> ddsketch(0.01);
+  DDSketch<CollapsingLowestDenseStore<4096, A>, LogarithmicMapping> ddsketch(0.001);
   DDSketch<SparseStore<A>, LogarithmicMapping> sparse_sk(0.01);
-  for (size_t i = 0; i < 10000000; ++i) {
+  for (size_t i = 0; i < sample_size; ++i) {
     double val = d(gen);
+    values.push_back(val);
     ddsketch.update(val);
     sparse_sk.update(val);
     td.update(val);
   }
 
+  std::sort(values.begin(), values.end());
 
 
   std::cout << ddsketch.to_string();
@@ -582,7 +586,11 @@ TEST_CASE("quantile", "[ddsketch]") {
 
   std::cout << std::setprecision(20) << std::fixed;
   for (double q = 0.0; q <= 1.00; q += 0.01) {
-    std::cout << std::setw(4) << q << " " << std::setw(15) << ddsketch.get_quantile(q) << " " << std::setw(15) << sparse_sk.get_quantile(q) << " " << std::setw(15) << td.get_quantile(q) << " " << std::endl;
+    const double true_q =  values[(sample_size-1) * q];
+    const double ddsketch_est = std::abs(true_q - ddsketch.get_quantile(q)) / true_q;
+    const double tdigest_est = std::abs(true_q - td.get_quantile(q)) / true_q;
+    std::cout << q << " " << ddsketch_est << " " << tdigest_est << std::endl;
+    // std::cout << std::setw(4) << q << " " << values[(sample_size-1) * q] << " "  << std::setw(15) << ddsketch.get_quantile(q) << " " << std::setw(15) << sparse_sk.get_quantile(q) << " " << std::setw(15) << td.get_quantile(q) << " " << std::endl;
   }
 }
 } /* namespace datasketches */

ddsketch/test/IndexMappingTest.cpp

@@ -68,7 +68,7 @@ TEMPLATE_TEST_CASE("test index mapping accuracy", "[indexmappingtest]",
   }
 }
 
-TEMPLATE_TEST_CASE("test index mapping validity", "[indexmappingtest}",
+TEMPLATE_TEST_CASE("test index mapping validity", "[indexmappingtest]",
   LinearlyInterpolatedMapping,
   LogarithmicMapping,
   QuadraticallyInterpolatedMapping
@@ -92,7 +92,7 @@ TEMPLATE_TEST_CASE("test index mapping validity", "[indexmappingtest}",
   }
 }
 
-TEMPLATE_TEST_CASE("encode - decode", "[indexmappingtest",
+TEMPLATE_TEST_CASE("encode - decode", "[indexmappingtest]",
   LinearlyInterpolatedMapping,
   LogarithmicMapping,
   QuadraticallyInterpolatedMapping