[datasketches-characterization] branch master updated: compatibility with the latest code in datasketches-cpp master before 4.0.0 major release

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alsay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/datasketches-characterization.git


The following commit(s) were added to refs/heads/master by this push:
     new 2b3edd9  compatibility with the latest code in datasketches-cpp master before 4.0.0 major release
2b3edd9 is described below

commit 2b3edd93753d0dac75467523f5b2f1b85693d49d
Author: AlexanderSaydakov <Al...@users.noreply.github.com>
AuthorDate: Tue Nov 8 15:58:21 2022 -0800

    compatibility with the latest code in datasketches-cpp master before
    4.0.0 major release
---
 cpp/src/kll_accuracy_profile.cpp           | 4 ++--
 cpp/src/kll_merge_accuracy_profile.cpp     | 2 +-
 cpp/src/kll_sketch_accuracy_profile.cpp    | 4 ++--
 cpp/src/kll_sketch_memory_profile_impl.hpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cpp/src/kll_accuracy_profile.cpp b/cpp/src/kll_accuracy_profile.cpp
index a953449..49c42e8 100644
--- a/cpp/src/kll_accuracy_profile.cpp
+++ b/cpp/src/kll_accuracy_profile.cpp
@@ -40,14 +40,14 @@ void kll_accuracy_profile::run() {
   const unsigned num_steps = count_points(lg_min, lg_max, ppo);
   unsigned stream_length = 1 << lg_min;
   for (unsigned i = 0; i < num_steps; i++) {
-    for (unsigned i = 0; i < stream_length; i++) values[i] = i;
+    for (unsigned i = 0; i < stream_length; i++) values[i] = i + 1;
 
     for (unsigned t = 0; t < num_trials; t++) {
       const double maxRankErrorInTrial = run_trial(values, stream_length);
       rank_errors[t] = maxRankErrorInTrial;
     }
 
-    std::sort(&rank_errors[0], &rank_errors[num_trials]);
+    std::sort(rank_errors, rank_errors + num_trials);
     const unsigned error_pct_index = num_trials * error_pct / 100;
     const double rank_error = rank_errors[error_pct_index];
 
diff --git a/cpp/src/kll_merge_accuracy_profile.cpp b/cpp/src/kll_merge_accuracy_profile.cpp
index 9b9d556..05a7d1a 100644
--- a/cpp/src/kll_merge_accuracy_profile.cpp
+++ b/cpp/src/kll_merge_accuracy_profile.cpp
@@ -48,7 +48,7 @@ double kll_merge_accuracy_profile::run_trial(float* values, unsigned stream_leng
   for (unsigned i = 0; i < num_sketches; i++) sketch.merge(*sketches[i]);
 
   double max_rank_error = 0;
-  for (size_t i = 0; i < stream_length; i++) {
+  for (size_t i = 1; i <= stream_length; i++) {
     double true_rank = static_cast<double>(i) / stream_length;
     double est_rank = sketch.get_rank(i);
     max_rank_error = std::max(max_rank_error, fabs(true_rank - est_rank));
diff --git a/cpp/src/kll_sketch_accuracy_profile.cpp b/cpp/src/kll_sketch_accuracy_profile.cpp
index ece5c6b..e8b3e6b 100644
--- a/cpp/src/kll_sketch_accuracy_profile.cpp
+++ b/cpp/src/kll_sketch_accuracy_profile.cpp
@@ -35,8 +35,8 @@ double kll_sketch_accuracy_profile::run_trial(float* values, unsigned stream_len
   for (size_t i = 0; i < stream_length; i++) sketch.update(values[i]);
 
   double max_rank_error = 0;
-  for (size_t i = 0; i < stream_length; i++) {
-    double true_rank = (double) i / stream_length;
+  for (size_t i = 1; i <= stream_length; i++) {
+    double true_rank = static_cast<double>(i) / stream_length;
     double est_rank = sketch.get_rank(i);
     max_rank_error = std::max(max_rank_error, fabs(true_rank - est_rank));
   }
diff --git a/cpp/src/kll_sketch_memory_profile_impl.hpp b/cpp/src/kll_sketch_memory_profile_impl.hpp
index c9d1906..30f04a0 100644
--- a/cpp/src/kll_sketch_memory_profile_impl.hpp
+++ b/cpp/src/kll_sketch_memory_profile_impl.hpp
@@ -33,7 +33,7 @@ template<typename T>
 void kll_sketch_memory_profile<T>::run_trial(size_t lg_min_x, size_t num_points, size_t x_ppo) {
   const size_t k = 200;
 
-  typedef kll_sketch<T, std::less<T>, serde<T>, counting_allocator<T>> kll_sketch_t;
+  typedef kll_sketch<T, std::less<T>, counting_allocator<T>> kll_sketch_t;
   kll_sketch_t* s = new (counting_allocator<kll_sketch_t>().allocate(1)) kll_sketch_t(k);
 
   size_t count = 0;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org