1 files changed, 5 insertions, 22 deletions
diff --git a/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp b/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp
index 33b249572f0..5b8fa79b8af 100644
--- a/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp
@@ -318,11 +318,6 @@ OrBlueprint::calculate_flow_stats(uint32_t) const {
             OrFlow::cost_of(get_children(), true) + flow::heap_cost(est, get_children().size())};
 }
 
-double
-OrBlueprint::estimate_self_cost(InFlow in_flow) const noexcept {
-    return in_flow.strict() ? flow::heap_cost(estimate(), get_children().size()) : 0.0;
-}
-
 Blueprint::HitEstimate
 OrBlueprint::combine(const std::vector<HitEstimate> &data) const
 {
@@ -436,11 +431,6 @@ WeakAndBlueprint::calculate_flow_stats(uint32_t docid_limit) const {
             OrFlow::cost_of(get_children(), true) + flow::heap_cost(est, get_children().size())};
 }
 
-double
-WeakAndBlueprint::estimate_self_cost(InFlow in_flow) const noexcept {
-    return in_flow.strict() ? flow::heap_cost(estimate(), get_children().size()) : 0.0;
-}
-
 Blueprint::HitEstimate
 WeakAndBlueprint::combine(const std::vector<HitEstimate> &data) const
 {
@@ -492,7 +482,9 @@ WeakAndBlueprint::createIntermediateSearch(MultiSearch::Children sub_searches,
                            _weights[i],
                            getChild(i).getState().estimate().estHits);
     }
-    return WeakAndSearch::create(terms, _n, strict());
+    return (_idf_range == 0.0)
+        ? WeakAndSearch::create(terms, wand::TermFrequencyScorer(), _n, strict())
+        : WeakAndSearch::create(terms, wand::Bm25TermFrequencyScorer(get_docid_limit(), _idf_range), _n, strict());
 }
 
 SearchIterator::UP
@@ -517,11 +509,6 @@ NearBlueprint::calculate_flow_stats(uint32_t) const {
             AndFlow::cost_of(get_children(), true) + childCnt() * est};
 }
 
-double
-NearBlueprint::estimate_self_cost(InFlow) const noexcept {
-    return childCnt() * estimate();
-}
-
 Blueprint::HitEstimate
 NearBlueprint::combine(const std::vector<HitEstimate> &data) const
 {
@@ -587,11 +574,6 @@ ONearBlueprint::calculate_flow_stats(uint32_t) const {
             AndFlow::cost_of(get_children(), true) + childCnt() * est};
 }
 
-double
-ONearBlueprint::estimate_self_cost(InFlow) const noexcept {
-    return childCnt() * estimate();
-}
-
 Blueprint::HitEstimate
 ONearBlueprint::combine(const std::vector<HitEstimate> &data) const
 {
@@ -756,7 +738,8 @@ SourceBlenderBlueprint::calculate_flow_stats(uint32_t) const {
         my_cost = std::max(my_cost, child->cost());
         my_strict_cost = std::max(my_strict_cost, child->strict_cost());
     }
-    return {OrFlow::estimate_of(get_children()), my_cost, my_strict_cost};
+    double my_est = OrFlow::estimate_of(get_children());
+    return {my_est, my_cost + 1.0, my_strict_cost + my_est};
 }
 
 Blueprint::HitEstimate