datasketches 0.1.2 → 0.2.0

data/vendor/datasketches-cpp/tuple/CMakeLists.txt

@@ -29,7 +29,7 @@ target_include_directories(tuple
     $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>
 )
 
-target_link_libraries(tuple INTERFACE common)
+target_link_libraries(tuple INTERFACE common theta)
 target_compile_features(tuple INTERFACE cxx_std_11)
 
 set(tuple_HEADERS "")
@@ -37,23 +37,11 @@ list(APPEND tuple_HEADERS "include/tuple_sketch.hpp;include/tuple_sketch_impl.hp
 list(APPEND tuple_HEADERS "include/tuple_union.hpp;include/tuple_union_impl.hpp")
 list(APPEND tuple_HEADERS "include/tuple_intersection.hpp;include/tuple_intersection_impl.hpp")
 list(APPEND tuple_HEADERS "include/tuple_a_not_b.hpp;include/tuple_a_not_b_impl.hpp")
+list(APPEND tuple_HEADERS "include/tuple_jaccard_similarity.hpp")
 list(APPEND tuple_HEADERS "include/array_of_doubles_sketch.hpp;include/array_of_doubles_sketch_impl.hpp")
 list(APPEND tuple_HEADERS "include/array_of_doubles_union.hpp;include/array_of_doubles_union_impl.hpp")
 list(APPEND tuple_HEADERS "include/array_of_doubles_intersection.hpp;include/array_of_doubles_intersection_impl.hpp")
 list(APPEND tuple_HEADERS "include/array_of_doubles_a_not_b.hpp;include/array_of_doubles_a_not_b_impl.hpp")
-list(APPEND tuple_HEADERS "include/theta_update_sketch_base.hpp;include/theta_update_sketch_base_impl.hpp")
-list(APPEND tuple_HEADERS "include/theta_union_base.hpp;include/theta_union_base_impl.hpp")
-list(APPEND tuple_HEADERS "include/theta_intersection_base.hpp;include/theta_intersection_base_impl.hpp")
-list(APPEND tuple_HEADERS "include/theta_set_difference_base.hpp;include/theta_set_difference_base_impl.hpp")
-list(APPEND tuple_HEADERS "include/theta_sketch_experimental.hpp;include/theta_sketch_experimental_impl.hpp")
-list(APPEND tuple_HEADERS "include/theta_union_experimental.hpp;include/theta_union_experimental_impl.hpp")
-list(APPEND tuple_HEADERS "include/theta_intersection_experimental.hpp;include/theta_intersection_experimental_impl.hpp")
-list(APPEND tuple_HEADERS "include/theta_a_not_b_experimental.hpp;include/theta_a_not_b_experimental_impl.hpp")
-list(APPEND tuple_HEADERS "include/bounds_on_ratios_in_sampled_sets.hpp")
-list(APPEND tuple_HEADERS "include/bounds_on_ratios_in_theta_sketched_sets.hpp")
-list(APPEND tuple_HEADERS "include/jaccard_similarity.hpp")
-list(APPEND tuple_HEADERS "include/theta_comparators.hpp")
-list(APPEND tuple_HEADERS "include/theta_cnstants.hpp")
 
 install(TARGETS tuple
   EXPORT ${PROJECT_NAME}
@@ -72,6 +60,7 @@ target_sources(tuple
     ${CMAKE_CURRENT_SOURCE_DIR}/include/tuple_intersection_impl.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/tuple_a_not_b.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/tuple_a_not_b_impl.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/tuple_jaccard_similarity.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/array_of_doubles_sketch.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/array_of_doubles_sketch_impl.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/array_of_doubles_union.hpp
@@ -80,25 +69,4 @@ target_sources(tuple
     ${CMAKE_CURRENT_SOURCE_DIR}/include/array_of_doubles_intersection_impl.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/array_of_doubles_a_not_b.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/array_of_doubles_a_not_b_impl.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_update_sketch_base.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_update_sketch_base_impl.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_union_base.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_union_base_impl.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_intersection_base.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_intersection_base_impl.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_set_difference_base.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_set_difference_base_impl.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_sketch_experimental.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_sketch_experimental_impl.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_union_experimental.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_union_experimental_impl.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_intersection_experimental.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_intersection_experimental_impl.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_a_not_b_experimental.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_a_not_b_experimental_impl.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/bounds_on_ratios_in_sampled_sets.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/bounds_on_ratios_in_theta_sketched_sets.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/jaccard_similarity.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_comparators.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/theta_constants.hpp
 )

data/vendor/datasketches-cpp/tuple/include/tuple_jaccard_similarity.hpp

@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+#ifndef TUPLE_JACCARD_SIMILARITY_HPP_
+#define TUPLE_JACCARD_SIMILARITY_HPP_
+
+#include "theta_jaccard_similarity_base.hpp"
+#include "tuple_union.hpp"
+#include "tuple_intersection.hpp"
+
+namespace datasketches {
+
+template<
+  typename Summary,
+  typename IntersectionPolicy,
+  typename UnionPolicy = default_union_policy<Summary>,
+  typename Allocator = std::allocator<Summary>>
+using tuple_jaccard_similarity = jaccard_similarity_base<tuple_union<Summary, UnionPolicy, Allocator>, tuple_intersection<Summary, IntersectionPolicy, Allocator>, pair_extract_key<uint64_t, Summary>>;
+
+} /* namespace datasketches */
+
+# endif

data/vendor/datasketches-cpp/tuple/include/tuple_sketch.hpp

@@ -31,7 +31,17 @@ namespace datasketches {
 template<typename S, typename A> class tuple_sketch;
 template<typename S, typename U, typename P, typename A> class update_tuple_sketch;
 template<typename S, typename A> class compact_tuple_sketch;
-template<typename A> class theta_sketch_experimental;
+template<typename A> class theta_sketch_alloc;
+
+template<typename K, typename V>
+struct pair_extract_key {
+  K& operator()(std::pair<K, V>& entry) const {
+    return entry.first;
+  }
+  const K& operator()(const std::pair<K, V>& entry) const {
+    return entry.first;
+  }
+};
 
 template<
   typename Summary,
@@ -143,7 +153,8 @@ public:
   virtual const_iterator end() const = 0;
 
 protected:
-  virtual void print_specifics(std::basic_ostream<char>& os) const = 0;
+  using ostrstream = std::basic_ostringstream<char, std::char_traits<char>, AllocChar<Allocator>>;
+  virtual void print_specifics(ostrstream& os) const = 0;
 
   static uint16_t get_seed_hash(uint64_t seed);
 
@@ -333,7 +344,8 @@ protected:
   // for builder
   update_tuple_sketch(uint8_t lg_cur_size, uint8_t lg_nom_size, resize_factor rf, uint64_t theta, uint64_t seed, const Policy& policy, const Allocator& allocator);
 
-  virtual void print_specifics(std::basic_ostream<char>& os) const;
+  using ostrstream = typename Base::ostrstream;
+  virtual void print_specifics(ostrstream& os) const;
 };
 
 // compact sketch
@@ -372,7 +384,7 @@ public:
   compact_tuple_sketch& operator=(const compact_tuple_sketch&) = default;
   compact_tuple_sketch& operator=(compact_tuple_sketch&&) = default;
 
-  compact_tuple_sketch(const theta_sketch_experimental<AllocU64>& other, const Summary& summary, bool ordered = true);
+  compact_tuple_sketch(const theta_sketch_alloc<AllocU64>& other, const Summary& summary, bool ordered = true);
 
   virtual Allocator get_allocator() const;
   virtual bool is_empty() const;
@@ -444,22 +456,25 @@ protected:
   // for deserialize
   class deleter_of_summaries {
   public:
-    deleter_of_summaries(uint32_t num, bool destroy): num(num), destroy(destroy) {}
-    void set_destroy(bool destroy) { this->destroy = destroy; }
-    void operator() (Summary* ptr) const {
+    deleter_of_summaries(uint32_t num, bool destroy, const Allocator& allocator):
+      allocator_(allocator), num_(num), destroy_(destroy) {}
+    void set_destroy(bool destroy) { destroy_ = destroy; }
+    void operator() (Summary* ptr) {
       if (ptr != nullptr) {
-        if (destroy) {
-          for (uint32_t i = 0; i < num; ++i) ptr[i].~Summary();
+        if (destroy_) {
+          for (uint32_t i = 0; i < num_; ++i) ptr[i].~Summary();
         }
-        Allocator().deallocate(ptr, num);
+        allocator_.deallocate(ptr, num_);
       }
     }
   private:
-    uint32_t num;
-    bool destroy;
+    Allocator allocator_;
+    uint32_t num_;
+    bool destroy_;
   };
 
-  virtual void print_specifics(std::basic_ostream<char>& os) const;
+  using ostrstream = typename Base::ostrstream;
+  virtual void print_specifics(ostrstream& os) const;
 
 };
 

data/vendor/datasketches-cpp/tuple/include/tuple_sketch_impl.hpp

@@ -53,7 +53,7 @@ double tuple_sketch<S, A>::get_upper_bound(uint8_t num_std_devs) const {
 
 template<typename S, typename A>
 string<A> tuple_sketch<S, A>::to_string(bool detail) const {
-  std::basic_ostringstream<char, std::char_traits<char>, AllocChar<A>> os;
+  ostrstream os;
   os << "### Tuple sketch summary:" << std::endl;
   os << "   num retained entries : " << get_num_retained() << std::endl;
   os << "   seed hash            : " << get_seed_hash() << std::endl;
@@ -238,7 +238,7 @@ compact_tuple_sketch<S, A> update_tuple_sketch<S, U, P, A>::compact(bool ordered
 }
 
 template<typename S, typename U, typename P, typename A>
-void update_tuple_sketch<S, U, P, A>::print_specifics(std::basic_ostream<char>& os) const {
+void update_tuple_sketch<S, U, P, A>::print_specifics(ostrstream& os) const {
   os << "   lg nominal size      : " << (int) map_.lg_nom_size_ << std::endl;
   os << "   lg current size      : " << (int) map_.lg_cur_size_ << std::endl;
   os << "   resize factor        : " << (1 << map_.rf_) << std::endl;
@@ -279,7 +279,7 @@ entries_(std::move(other.entries_))
 {}
 
 template<typename S, typename A>
-compact_tuple_sketch<S, A>::compact_tuple_sketch(const theta_sketch_experimental<AllocU64>& other, const S& summary, bool ordered):
+compact_tuple_sketch<S, A>::compact_tuple_sketch(const theta_sketch_alloc<AllocU64>& other, const S& summary, bool ordered):
 is_empty_(other.is_empty()),
 is_ordered_(other.is_ordered() || ordered),
 seed_hash_(other.get_seed_hash()),
@@ -470,7 +470,7 @@ compact_tuple_sketch<S, A> compact_tuple_sketch<S, A>::deserialize(std::istream&
   std::vector<Entry, AllocEntry> entries(alloc);
   if (!is_empty) {
     entries.reserve(num_entries);
-    std::unique_ptr<S, deleter_of_summaries> summary(alloc.allocate(1), deleter_of_summaries(1, false));
+    std::unique_ptr<S, deleter_of_summaries> summary(alloc.allocate(1), deleter_of_summaries(1, false, allocator));
     for (size_t i = 0; i < num_entries; ++i) {
       uint64_t key;
       is.read(reinterpret_cast<char*>(&key), sizeof(uint64_t));
@@ -533,7 +533,7 @@ compact_tuple_sketch<S, A> compact_tuple_sketch<S, A>::deserialize(const void* b
   std::vector<Entry, AllocEntry> entries(alloc);
   if (!is_empty) {
     entries.reserve(num_entries);
-    std::unique_ptr<S, deleter_of_summaries> summary(alloc.allocate(1), deleter_of_summaries(1, false));
+    std::unique_ptr<S, deleter_of_summaries> summary(alloc.allocate(1), deleter_of_summaries(1, false, allocator));
     for (size_t i = 0; i < num_entries; ++i) {
       uint64_t key;
       ptr += copy_from_mem(ptr, &key, sizeof(key));
@@ -567,7 +567,7 @@ auto compact_tuple_sketch<S, A>::end() const -> const_iterator {
 }
 
 template<typename S, typename A>
-void compact_tuple_sketch<S, A>::print_specifics(std::basic_ostream<char>&) const {}
+void compact_tuple_sketch<S, A>::print_specifics(ostrstream&) const {}
 
 // builder
 

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

@@ -43,11 +43,6 @@ target_sources(tuple_test
     tuple_union_test.cpp
     tuple_intersection_test.cpp
     tuple_a_not_b_test.cpp
-    array_of_doubles_sketch_test.cpp
-    theta_sketch_experimental_test.cpp
-    theta_union_experimental_test.cpp
-    theta_intersection_experimental_test.cpp
-    theta_a_not_b_experimental_test.cpp
-    theta_jaccard_similarity_test.cpp
     tuple_jaccard_similarity_test.cpp
+    array_of_doubles_sketch_test.cpp
 )

data/vendor/datasketches-cpp/tuple/test/tuple_a_not_b_test.cpp

@@ -21,7 +21,7 @@
 
 #include <catch.hpp>
 #include <tuple_a_not_b.hpp>
-#include <theta_sketch_experimental.hpp>
+#include <theta_sketch.hpp>
 
 namespace datasketches {
 
@@ -102,9 +102,6 @@ TEST_CASE("tuple a-not-b: exact mode half overlap", "[tuple_a_not_b]") {
   REQUIRE(result.get_estimate() == 500.0);
 }
 
-// needed until promotion of experimental to replace existing theta sketch
-using update_theta_sketch = update_theta_sketch_experimental<>;
-
 TEST_CASE("mixed a-not-b: exact mode half overlap", "[tuple_a_not_b]") {
   auto a = update_tuple_sketch<float>::builder().build();
   int value = 0;

data/vendor/datasketches-cpp/tuple/test/tuple_intersection_test.cpp

@@ -21,7 +21,7 @@
 
 #include <catch.hpp>
 #include <tuple_intersection.hpp>
-#include <theta_sketch_experimental.hpp>
+#include <theta_sketch.hpp>
 
 namespace datasketches {
 
@@ -136,9 +136,6 @@ TEST_CASE("tuple intersection: exact mode disjoint", "[tuple_intersection]") {
   }
 }
 
-// needed until promotion of experimental to replace existing theta sketch
-using update_theta_sketch = update_theta_sketch_experimental<>;
-
 TEST_CASE("mixed intersection: exact mode half overlap", "[tuple_intersection]") {
   auto sketch1 = update_tuple_sketch<float>::builder().build();
   int value = 0;

data/vendor/datasketches-cpp/tuple/test/tuple_jaccard_similarity_test.cpp

@@ -20,7 +20,8 @@
 #include <iostream>
 
 #include <catch.hpp>
-#include <jaccard_similarity.hpp>
+
+#include "tuple_jaccard_similarity.hpp"
 
 namespace datasketches {
 

data/vendor/datasketches-cpp/tuple/test/tuple_sketch_allocation_test.cpp

@@ -51,7 +51,7 @@ TEST_CASE("tuple sketch with test allocator: estimation mode", "[tuple_sketch]")
   test_allocator_total_bytes = 0;
   test_allocator_net_allocations = 0;
   {
-    auto update_sketch = update_tuple_sketch_test::builder().build();
+    auto update_sketch = update_tuple_sketch_test::builder(test_type_replace_policy(), test_allocator<test_type>(0)).build();
     for (int i = 0; i < 10000; ++i) update_sketch.update(i, 1);
     for (int i = 0; i < 10000; ++i) update_sketch.update(i, 2);
     REQUIRE(!update_sketch.is_empty());
@@ -77,7 +77,7 @@ TEST_CASE("tuple sketch with test allocator: estimation mode", "[tuple_sketch]")
     REQUIRE(count == update_sketch.get_num_retained());
 
     auto bytes = compact_sketch.serialize(0, test_type_serde());
-    auto deserialized_sketch = compact_tuple_sketch_test::deserialize(bytes.data(), bytes.size(), DEFAULT_SEED, test_type_serde());
+    auto deserialized_sketch = compact_tuple_sketch_test::deserialize(bytes.data(), bytes.size(), DEFAULT_SEED, test_type_serde(), test_allocator<test_type>(0));
     REQUIRE(deserialized_sketch.get_estimate() == compact_sketch.get_estimate());
 
     // update sketch copy

data/vendor/datasketches-cpp/tuple/test/tuple_union_test.cpp

@@ -21,7 +21,7 @@
 
 #include <catch.hpp>
 #include <tuple_union.hpp>
-#include <theta_sketch_experimental.hpp>
+#include <theta_sketch.hpp>
 
 namespace datasketches {
 
@@ -37,9 +37,6 @@ TEST_CASE("tuple_union float: empty", "[tuple union]") {
   REQUIRE(result.get_estimate() == 0);
 }
 
-// needed until promotion of experimental to replace existing theta sketch
-using update_theta_sketch = update_theta_sketch_experimental<>;
-
 TEST_CASE("tupe_union float: empty theta sketch", "[tuple union]") {
   auto update_sketch = update_theta_sketch::builder().build();
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datasketches
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 4.0.2
 description:
 email: andrew@chartkick.com
 executables: []
@@ -37,6 +37,7 @@ files:
 - README.md
 - ext/datasketches/cpc_wrapper.cpp
 - ext/datasketches/ext.cpp
+- ext/datasketches/ext.h
 - ext/datasketches/extconf.rb
 - ext/datasketches/fi_wrapper.cpp
 - ext/datasketches/hll_wrapper.cpp
@@ -65,6 +66,7 @@ files:
 - vendor/datasketches-cpp/common/test/CMakeLists.txt
 - vendor/datasketches-cpp/common/test/catch.hpp
 - vendor/datasketches-cpp/common/test/catch_runner.cpp
+- vendor/datasketches-cpp/common/test/integration_test.cpp
 - vendor/datasketches-cpp/common/test/test_allocator.cpp
 - vendor/datasketches-cpp/common/test/test_allocator.hpp
 - vendor/datasketches-cpp/common/test/test_runner.cpp
@@ -86,6 +88,7 @@ files:
 - vendor/datasketches-cpp/cpc/include/u32_table_impl.hpp
 - vendor/datasketches-cpp/cpc/test/CMakeLists.txt
 - vendor/datasketches-cpp/cpc/test/compression_test.cpp
+- vendor/datasketches-cpp/cpc/test/cpc_sketch_allocation_test.cpp
 - vendor/datasketches-cpp/cpc/test/cpc_sketch_test.cpp
 - vendor/datasketches-cpp/cpc/test/cpc_union_test.cpp
 - vendor/datasketches-cpp/fi/CMakeLists.txt
@@ -177,6 +180,7 @@ files:
 - vendor/datasketches-cpp/python/src/fi_wrapper.cpp
 - vendor/datasketches-cpp/python/src/hll_wrapper.cpp
 - vendor/datasketches-cpp/python/src/kll_wrapper.cpp
+- vendor/datasketches-cpp/python/src/req_wrapper.cpp
 - vendor/datasketches-cpp/python/src/theta_wrapper.cpp
 - vendor/datasketches-cpp/python/src/vector_of_kll.cpp
 - vendor/datasketches-cpp/python/src/vo_wrapper.cpp
@@ -185,9 +189,26 @@ files:
 - vendor/datasketches-cpp/python/tests/fi_test.py
 - vendor/datasketches-cpp/python/tests/hll_test.py
 - vendor/datasketches-cpp/python/tests/kll_test.py
+- vendor/datasketches-cpp/python/tests/req_test.py
 - vendor/datasketches-cpp/python/tests/theta_test.py
 - vendor/datasketches-cpp/python/tests/vector_of_kll_test.py
 - vendor/datasketches-cpp/python/tests/vo_test.py
+- vendor/datasketches-cpp/req/CMakeLists.txt
+- vendor/datasketches-cpp/req/include/req_common.hpp
+- vendor/datasketches-cpp/req/include/req_compactor.hpp
+- vendor/datasketches-cpp/req/include/req_compactor_impl.hpp
+- vendor/datasketches-cpp/req/include/req_quantile_calculator.hpp
+- vendor/datasketches-cpp/req/include/req_quantile_calculator_impl.hpp
+- vendor/datasketches-cpp/req/include/req_sketch.hpp
+- vendor/datasketches-cpp/req/include/req_sketch_impl.hpp
+- vendor/datasketches-cpp/req/test/CMakeLists.txt
+- vendor/datasketches-cpp/req/test/req_float_empty_from_java.sk
+- vendor/datasketches-cpp/req/test/req_float_estimation_from_java.sk
+- vendor/datasketches-cpp/req/test/req_float_exact_from_java.sk
+- vendor/datasketches-cpp/req/test/req_float_raw_items_from_java.sk
+- vendor/datasketches-cpp/req/test/req_float_single_item_from_java.sk
+- vendor/datasketches-cpp/req/test/req_sketch_custom_type_test.cpp
+- vendor/datasketches-cpp/req/test/req_sketch_test.cpp
 - vendor/datasketches-cpp/sampling/CMakeLists.txt
 - vendor/datasketches-cpp/sampling/include/var_opt_sketch.hpp
 - vendor/datasketches-cpp/sampling/include/var_opt_sketch_impl.hpp
@@ -195,6 +216,7 @@ files:
 - vendor/datasketches-cpp/sampling/include/var_opt_union_impl.hpp
 - vendor/datasketches-cpp/sampling/test/CMakeLists.txt
 - vendor/datasketches-cpp/sampling/test/binaries_from_java.txt
+- vendor/datasketches-cpp/sampling/test/var_opt_allocation_test.cpp
 - vendor/datasketches-cpp/sampling/test/var_opt_sketch_test.cpp
 - vendor/datasketches-cpp/sampling/test/var_opt_union_test.cpp
 - vendor/datasketches-cpp/sampling/test/varopt_sketch_long_sampling.sk
@@ -202,20 +224,36 @@ files:
 - vendor/datasketches-cpp/sampling/test/varopt_union_double_sampling.sk
 - vendor/datasketches-cpp/setup.py
 - vendor/datasketches-cpp/theta/CMakeLists.txt
+- vendor/datasketches-cpp/theta/include/bounds_on_ratios_in_sampled_sets.hpp
+- vendor/datasketches-cpp/theta/include/bounds_on_ratios_in_theta_sketched_sets.hpp
 - vendor/datasketches-cpp/theta/include/theta_a_not_b.hpp
 - vendor/datasketches-cpp/theta/include/theta_a_not_b_impl.hpp
+- vendor/datasketches-cpp/theta/include/theta_comparators.hpp
+- vendor/datasketches-cpp/theta/include/theta_constants.hpp
+- vendor/datasketches-cpp/theta/include/theta_helpers.hpp
 - vendor/datasketches-cpp/theta/include/theta_intersection.hpp
+- vendor/datasketches-cpp/theta/include/theta_intersection_base.hpp
+- vendor/datasketches-cpp/theta/include/theta_intersection_base_impl.hpp
 - vendor/datasketches-cpp/theta/include/theta_intersection_impl.hpp
+- vendor/datasketches-cpp/theta/include/theta_jaccard_similarity.hpp
+- vendor/datasketches-cpp/theta/include/theta_jaccard_similarity_base.hpp
+- vendor/datasketches-cpp/theta/include/theta_set_difference_base.hpp
+- vendor/datasketches-cpp/theta/include/theta_set_difference_base_impl.hpp
 - vendor/datasketches-cpp/theta/include/theta_sketch.hpp
 - vendor/datasketches-cpp/theta/include/theta_sketch_impl.hpp
 - vendor/datasketches-cpp/theta/include/theta_union.hpp
+- vendor/datasketches-cpp/theta/include/theta_union_base.hpp
+- vendor/datasketches-cpp/theta/include/theta_union_base_impl.hpp
 - vendor/datasketches-cpp/theta/include/theta_union_impl.hpp
+- vendor/datasketches-cpp/theta/include/theta_update_sketch_base.hpp
+- vendor/datasketches-cpp/theta/include/theta_update_sketch_base_impl.hpp
 - vendor/datasketches-cpp/theta/test/CMakeLists.txt
 - vendor/datasketches-cpp/theta/test/theta_a_not_b_test.cpp
 - vendor/datasketches-cpp/theta/test/theta_compact_empty_from_java.sk
 - vendor/datasketches-cpp/theta/test/theta_compact_estimation_from_java.sk
 - vendor/datasketches-cpp/theta/test/theta_compact_single_item_from_java.sk
 - vendor/datasketches-cpp/theta/test/theta_intersection_test.cpp
+- vendor/datasketches-cpp/theta/test/theta_jaccard_similarity_test.cpp
 - vendor/datasketches-cpp/theta/test/theta_sketch_test.cpp
 - vendor/datasketches-cpp/theta/test/theta_union_test.cpp
 - vendor/datasketches-cpp/theta/test/theta_update_empty_from_java.sk
@@ -229,32 +267,11 @@ files:
 - vendor/datasketches-cpp/tuple/include/array_of_doubles_sketch_impl.hpp
 - vendor/datasketches-cpp/tuple/include/array_of_doubles_union.hpp
 - vendor/datasketches-cpp/tuple/include/array_of_doubles_union_impl.hpp
-- vendor/datasketches-cpp/tuple/include/bounds_on_ratios_in_sampled_sets.hpp
-- vendor/datasketches-cpp/tuple/include/bounds_on_ratios_in_theta_sketched_sets.hpp
-- vendor/datasketches-cpp/tuple/include/jaccard_similarity.hpp
-- vendor/datasketches-cpp/tuple/include/theta_a_not_b_experimental.hpp
-- vendor/datasketches-cpp/tuple/include/theta_a_not_b_experimental_impl.hpp
-- vendor/datasketches-cpp/tuple/include/theta_comparators.hpp
-- vendor/datasketches-cpp/tuple/include/theta_constants.hpp
-- vendor/datasketches-cpp/tuple/include/theta_helpers.hpp
-- vendor/datasketches-cpp/tuple/include/theta_intersection_base.hpp
-- vendor/datasketches-cpp/tuple/include/theta_intersection_base_impl.hpp
-- vendor/datasketches-cpp/tuple/include/theta_intersection_experimental.hpp
-- vendor/datasketches-cpp/tuple/include/theta_intersection_experimental_impl.hpp
-- vendor/datasketches-cpp/tuple/include/theta_set_difference_base.hpp
-- vendor/datasketches-cpp/tuple/include/theta_set_difference_base_impl.hpp
-- vendor/datasketches-cpp/tuple/include/theta_sketch_experimental.hpp
-- vendor/datasketches-cpp/tuple/include/theta_sketch_experimental_impl.hpp
-- vendor/datasketches-cpp/tuple/include/theta_union_base.hpp
-- vendor/datasketches-cpp/tuple/include/theta_union_base_impl.hpp
-- vendor/datasketches-cpp/tuple/include/theta_union_experimental.hpp
-- vendor/datasketches-cpp/tuple/include/theta_union_experimental_impl.hpp
-- vendor/datasketches-cpp/tuple/include/theta_update_sketch_base.hpp
-- vendor/datasketches-cpp/tuple/include/theta_update_sketch_base_impl.hpp
 - vendor/datasketches-cpp/tuple/include/tuple_a_not_b.hpp
 - vendor/datasketches-cpp/tuple/include/tuple_a_not_b_impl.hpp
 - vendor/datasketches-cpp/tuple/include/tuple_intersection.hpp
 - vendor/datasketches-cpp/tuple/include/tuple_intersection_impl.hpp
+- vendor/datasketches-cpp/tuple/include/tuple_jaccard_similarity.hpp
 - vendor/datasketches-cpp/tuple/include/tuple_sketch.hpp
 - vendor/datasketches-cpp/tuple/include/tuple_sketch_impl.hpp
 - vendor/datasketches-cpp/tuple/include/tuple_union.hpp
@@ -266,14 +283,6 @@ files:
 - vendor/datasketches-cpp/tuple/test/aod_2_compact_exact_from_java.sk
 - vendor/datasketches-cpp/tuple/test/aod_3_compact_empty_from_java.sk
 - vendor/datasketches-cpp/tuple/test/array_of_doubles_sketch_test.cpp
-- vendor/datasketches-cpp/tuple/test/theta_a_not_b_experimental_test.cpp
-- vendor/datasketches-cpp/tuple/test/theta_compact_empty_from_java.sk
-- vendor/datasketches-cpp/tuple/test/theta_compact_estimation_from_java.sk
-- vendor/datasketches-cpp/tuple/test/theta_compact_single_item_from_java.sk
-- vendor/datasketches-cpp/tuple/test/theta_intersection_experimental_test.cpp
-- vendor/datasketches-cpp/tuple/test/theta_jaccard_similarity_test.cpp
-- vendor/datasketches-cpp/tuple/test/theta_sketch_experimental_test.cpp
-- vendor/datasketches-cpp/tuple/test/theta_union_experimental_test.cpp
 - vendor/datasketches-cpp/tuple/test/tuple_a_not_b_test.cpp
 - vendor/datasketches-cpp/tuple/test/tuple_intersection_test.cpp
 - vendor/datasketches-cpp/tuple/test/tuple_jaccard_similarity_test.cpp