From 34b78fc47e4e25841ce04f8f9626fb28bb788640 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Fri, 7 Sep 2018 21:12:30 +0200 Subject: [PATCH] ChainSearch: identify some possible problems - as implemented now, we will finally backtrack into the unfiltered base iterator - it is not possible to implement a clearFilter() operation --- src/lib/iter-chain-search.hpp | 3 +- tests/library/iter-chain-search-test.cpp | 6 --- wiki/thinkPad.ichthyo.mm | 54 ++++++++++++++++++++---- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/src/lib/iter-chain-search.hpp b/src/lib/iter-chain-search.hpp index 6c661abc5..30d0779d5 100644 --- a/src/lib/iter-chain-search.hpp +++ b/src/lib/iter-chain-search.hpp @@ -200,6 +200,7 @@ namespace iter { IterChainSearch&& clearFilter() { + //////////////////////////////////////////////////////TODO logically broken. We need also to get rid of the current expansions, while retaining the current position stepChain_.clear(); return move(*this); } @@ -208,7 +209,7 @@ namespace iter { Filter configureFilterChain (Filter const& currentFilterState) { - uint depth = currentFilterState.depth(); + uint depth = this->depth(); if (depth < stepChain_.size()) return stepChain_[depth](currentFilterState); // augmented copy else diff --git a/tests/library/iter-chain-search-test.cpp b/tests/library/iter-chain-search-test.cpp index 89f193a11..98ede36de 100644 --- a/tests/library/iter-chain-search-test.cpp +++ b/tests/library/iter-chain-search-test.cpp @@ -109,12 +109,6 @@ namespace test{ .search("tomato"); ///////////////////////////////////////////////////TODO WIP - using Searcher = decltype(search); - SHOW_TYPE (Searcher); - SHOW_TYPE (Searcher::value_type); - SHOW_TYPE (Searcher::pointer); - -// TypeDebugger guggi; // --> std::__cxx11::basic_string const& cout << "search[0]=" <<*search< - - - - + + + + - - + + - - + + @@ -31525,6 +31525,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ wir sind irgendwo im Baum, nicht auf dem Basis-Layer. +

+

+ Und der Basis-Layer steht irgendwo, nicht an der aktuellen Position. +

+ + +
+ +
+