clean up

Author: tzaeschke

CHANGELOG.md

@@ -10,15 +10,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added B+tree multimap for internal (future) use. [#93](https://github.com/tzaeschke/phtree-cpp/issues/93)
 
 ### Changed
-- Rewrote relocate(). This should be much cleaner now and slightly faster. [#98](https://github.com/tzaeschke/phtree-cpp/pull/98)
+- Rewrote relocate(). This should be much cleaner now and slightly faster. 
+  [#98](https://github.com/tzaeschke/phtree-cpp/pull/98), [#99](https://github.com/tzaeschke/phtree-cpp/pull/99)
+  
 - Cleaned up HandleCollision() and key comparison functions. [#97](https://github.com/tzaeschke/phtree-cpp/pull/97)
 - Improved performance by eliminating memory indirection for DIM > 3. 
   This was enabled by referencing "Node" directly in "Entry" which was enabled by
   implanting an indirection in array_map. [#96](https://github.com/tzaeschke/phtree-cpp/pull/96)
 - Improved performance of window queries by executing them partially as point queries.
   This works best for point datasets, and somewhat for box datasets with "include" queries.
   There is no benefit for "intersection" queries. [#88](https://github.com/tzaeschke/phtree-cpp/issues/88)
-- Improved benchmarks for insert and query to use a more compact format. [#91](https://github.com/tzaeschke/phtree-cpp/pull/91)
+- Improved benchmarks for insert and query to use a more compact format. 
+  [#91](https://github.com/tzaeschke/phtree-cpp/pull/91)
 - Improved performance of window queries by optimizing calculation of min/max masks.
   Improved performance of queries and updates by changing bit-width of min/max masks and
   hc_pos_t. [#95](https://github.com/tzaeschke/phtree-cpp/pull/95)

include/phtree/common/common.h

@@ -103,21 +103,6 @@ static bit_width_t NumberOfDivergingBits(
     return MAX_BIT_WIDTH<SCALAR> - CountLeadingZeros(diff2);
 }
 
-//template <dimension_t DIM, typename SCALAR>
-//static bit_width_t NumberOfDivergingBits2(
-//    const PhPoint<DIM, SCALAR>& v1, const PhPoint<DIM, SCALAR>& v2) {
-//    // write all differences to diff, we just check diff afterwards
-//    SCALAR diff = 0;
-//    //bit_mask_t<SCALAR> diff = 0;
-//    for (dimension_t i = 0; i < DIM; ++i) {
-//        diff |= v1[i] ^ v2[i];
-//    }
-//    bit_mask_t<SCALAR> diff2 = reinterpret_cast<bit_mask_t<SCALAR>&>(diff);
-//    assert(CountLeadingZeros(diff2) <= MAX_BIT_WIDTH<SCALAR>);
-//    return MAX_BIT_WIDTH<SCALAR> - CountLeadingZeros(diff2);
-//}
-
-
 template <dimension_t DIM, typename SCALAR>
 static bool KeyEquals(
     const PhPoint<DIM, SCALAR>& key_a, const PhPoint<DIM, SCALAR>& key_b, bit_width_t ignore_bits) {
@@ -127,26 +112,6 @@ static bool KeyEquals(
     }
     return diff >> ignore_bits == 0;
 }
-//template <dimension_t DIM, typename SCALAR>
-//static bool KeyEquals0(
-//    const PhPoint<DIM, SCALAR>& key_a, const PhPoint<DIM, SCALAR>& key_b, SCALAR mask) {
-//    for (dimension_t i = 0; i < DIM; ++i) {
-//        if (((key_a[i] ^ key_b[i]) & mask) != 0) {
-//            return false;
-//        }
-//    }
-//    return true;
-//}
-//
-//template <dimension_t DIM, typename SCALAR>
-//static bool KeyEquals1(
-//    const PhPoint<DIM, SCALAR>& key_a, const PhPoint<DIM, SCALAR>& key_b, SCALAR mask) {
-//    SCALAR sum = 0;
-//    for (dimension_t i = 0; i < DIM; ++i) {
-//        sum |= (key_a[i] ^ key_b[i]);
-//    }
-//    return (sum & mask) == 0;
-//}
 
 // ************************************************************************
 // String helpers

include/phtree/v16/entry.h

@@ -177,11 +177,6 @@ class Entry {
         kd_key_ = key;
     }
 
-    void SetValue(T&& value) noexcept {
-        assert(union_type_ == VALUE);
-        value_ = std::move(value);
-    }
-
     void SetNode(NodeT&& node, bit_width_t postfix_len) noexcept {
         postfix_len_ = static_cast<std::uint16_t>(postfix_len);
         DestroyUnion();

include/phtree/v16/phtree_v16.h

@@ -595,7 +595,6 @@ class PhTreeV16 {
         return std::make_pair(iter1, iter2);
     }
 
-  public:
     /*
      * Iterates over all entries in the tree. The optional filter allows filtering entries and nodes
      * (=sub-trees) before returning / traversing them. By default, all entries are returned. Filter
@@ -775,26 +774,6 @@ class PhTreeV16 {
         return {parent, entry_iter};
     }
 
-    std::pair<EntryT*, EntryIteratorC<DIM, EntryT>> find_starting_node(
-        const KeyT& key1, const KeyT& key2, bit_width_t& max_conflicting_bits) {
-        auto& prefix = key1;
-        max_conflicting_bits = NumberOfDivergingBits(key1, key2);
-        EntryT* parent = &root_;
-        if (max_conflicting_bits > root_.GetNodePostfixLen()) {
-            // Abort early if we have no shared prefix in the query
-            return {&root_, root_.GetNode().Entries().end()};
-        }
-        EntryIterator<DIM, EntryT> entry_iter =
-            root_.GetNode().FindPrefix(prefix, max_conflicting_bits, root_.GetNodePostfixLen());
-        while (entry_iter != parent->GetNode().Entries().end() && entry_iter->second.IsNode() &&
-               entry_iter->second.GetNodePostfixLen() >= max_conflicting_bits) {
-            parent = &entry_iter->second;
-            entry_iter = parent->GetNode().FindPrefix(
-                prefix, max_conflicting_bits, parent->GetNodePostfixLen());
-        }
-        return {parent, entry_iter};
-    }
-
     size_t num_entries_;
     // Contract: root_ contains a Node with 0 or more entries. The root node is the only Node
     // that is allowed to have less than two entries.

test/phtree_test.cc

@@ -668,7 +668,6 @@ TEST(PhTreeTest, TestUpdateWithRelocateIf) {
             TestPoint<dim> pNew{pOld[0] + delta, pOld[1] + delta, pOld[2] + delta};
             if ((delta > 0.0 && tree.find(pNew) != tree.end()) || (i % 2 != 0)) {
                 // Skip this, there is already another entry
-                std::cout << "x = " << x << " i=" << i << std::endl;
                 ASSERT_EQ(0, tree.relocate_if(pOld, pNew, pred));
             } else {
                 ASSERT_EQ(1, tree.relocate_if(pOld, pNew, pred));