From fb72bd6f588b623f730e9af93b5e9763a4dd6719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Pettersen?= Date: Tue, 5 Nov 2024 11:52:44 +0000 Subject: [PATCH] remove score limit also adjust X variant to combine values tested separately --- .../wand_stopwords/MicroBmSearcher.java | 24 ++----------------- .../wand_stopwords/wand_stopwords.rb | 18 -------------- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/tests/performance/wand_stopwords/MicroBmSearcher.java b/tests/performance/wand_stopwords/MicroBmSearcher.java index 294a16a2b..68fd5d245 100644 --- a/tests/performance/wand_stopwords/MicroBmSearcher.java +++ b/tests/performance/wand_stopwords/MicroBmSearcher.java @@ -102,18 +102,6 @@ public Result search(Query weakAndQuery, Execution execution) { execution.fill(weakAndResultA02); var weakAndSetA02 = getHitIds(weakAndResultA02); - Query weakAndQueryS20 = changeRoot(weakAndQuery, new WeakAndItem()); - weakAndQueryS20.properties().set("rankproperty.vespa.matching.weakand.stop_word_score_limit", "0.20"); - Result weakAndResultS20 = execution.search(weakAndQueryS20); - execution.fill(weakAndResultS20); - var weakAndSetS20 = getHitIds(weakAndResultS20); - - Query weakAndQueryS05 = changeRoot(weakAndQuery, new WeakAndItem()); - weakAndQueryS05.properties().set("rankproperty.vespa.matching.weakand.stop_word_score_limit", "0.05"); - Result weakAndResultS05 = execution.search(weakAndQueryS05); - execution.fill(weakAndResultS05); - var weakAndSetS05 = getHitIds(weakAndResultS05); - Query weakAndQueryD20 = changeRoot(weakAndQuery, new WeakAndItem()); weakAndQueryD20.properties().set("rankproperty.vespa.matching.weakand.stop_word_drop_limit", "0.20"); Result weakAndResultD20 = execution.search(weakAndQueryD20); @@ -127,8 +115,8 @@ public Result search(Query weakAndQuery, Execution execution) { var weakAndSetD05 = getHitIds(weakAndResultD05); Query weakAndQueryX = changeRoot(weakAndQuery, new WeakAndItem()); - weakAndQueryX.properties().set("rankproperty.vespa.matching.weakand.stop_word_adjust_limit", "0.01"); - weakAndQueryX.properties().set("rankproperty.vespa.matching.weakand.stop_word_drop_limit", "0.30"); + weakAndQueryX.properties().set("rankproperty.vespa.matching.weakand.stop_word_adjust_limit", "0.02"); + weakAndQueryX.properties().set("rankproperty.vespa.matching.weakand.stop_word_drop_limit", "0.20"); Result weakAndResultX = execution.search(weakAndQueryX); execution.fill(weakAndResultX); var weakAndSetX = getHitIds(weakAndResultX); @@ -137,8 +125,6 @@ public Result search(Query weakAndQuery, Execution execution) { double weakAndTime = timeQuery(weakAndQuery, execution); double weakAndTimeA10 = timeQuery(weakAndQueryA10, execution); double weakAndTimeA02 = timeQuery(weakAndQueryA02, execution); - double weakAndTimeS20 = timeQuery(weakAndQueryS20, execution); - double weakAndTimeS05 = timeQuery(weakAndQueryS05, execution); double weakAndTimeD20 = timeQuery(weakAndQueryD20, execution); double weakAndTimeD05 = timeQuery(weakAndQueryD05, execution); double weakAndTimeX = timeQuery(weakAndQueryX, execution); @@ -150,8 +136,6 @@ public Result search(Query weakAndQuery, Execution execution) { meta.setField("weakAndQuality", quality(orSet, weakAndSet)); meta.setField("weakAndQualityA10", quality(orSet, weakAndSetA10)); meta.setField("weakAndQualityA02", quality(orSet, weakAndSetA02)); - meta.setField("weakAndQualityS20", quality(orSet, weakAndSetS20)); - meta.setField("weakAndQualityS05", quality(orSet, weakAndSetS05)); meta.setField("weakAndQualityD20", quality(orSet, weakAndSetD20)); meta.setField("weakAndQualityD05", quality(orSet, weakAndSetD05)); meta.setField("weakAndQualityX", quality(orSet, weakAndSetX)); @@ -160,8 +144,6 @@ public Result search(Query weakAndQuery, Execution execution) { meta.setField("weakAndHits", weakAndResult.getTotalHitCount()); meta.setField("weakAndHitsA10", weakAndResultA10.getTotalHitCount()); meta.setField("weakAndHitsA02", weakAndResultA02.getTotalHitCount()); - meta.setField("weakAndHitsS20", weakAndResultS20.getTotalHitCount()); - meta.setField("weakAndHitsS05", weakAndResultS05.getTotalHitCount()); meta.setField("weakAndHitsD20", weakAndResultD20.getTotalHitCount()); meta.setField("weakAndHitsD05", weakAndResultD05.getTotalHitCount()); meta.setField("weakAndHitsX", weakAndResultX.getTotalHitCount()); @@ -170,8 +152,6 @@ public Result search(Query weakAndQuery, Execution execution) { meta.setField("weakAndTime", weakAndTime); meta.setField("weakAndTimeA10", weakAndTimeA10); meta.setField("weakAndTimeA02", weakAndTimeA02); - meta.setField("weakAndTimeS20", weakAndTimeS20); - meta.setField("weakAndTimeS05", weakAndTimeS05); meta.setField("weakAndTimeD20", weakAndTimeD20); meta.setField("weakAndTimeD05", weakAndTimeD05); meta.setField("weakAndTimeX", weakAndTimeX); diff --git a/tests/performance/wand_stopwords/wand_stopwords.rb b/tests/performance/wand_stopwords/wand_stopwords.rb index ddc8232fc..0666555e3 100644 --- a/tests/performance/wand_stopwords/wand_stopwords.rb +++ b/tests/performance/wand_stopwords/wand_stopwords.rb @@ -71,8 +71,6 @@ def measure_wand_quality waQ = [] waA10Q = [] waA02Q = [] - waS20Q = [] - waS05Q = [] waD20Q = [] waD05Q = [] waXQ = [] @@ -81,8 +79,6 @@ def measure_wand_quality waH = [] waA10H = [] waA02H = [] - waS20H = [] - waS05H = [] waD20H = [] waD05H = [] waXH = [] @@ -91,8 +87,6 @@ def measure_wand_quality waT = [] waA10T = [] waA02T = [] - waS20T = [] - waS05T = [] waD20T = [] waD05T = [] waXT = [] @@ -110,8 +104,6 @@ def measure_wand_quality waQ.append(h.field['weakAndQuality']) waA10Q.append(h.field['weakAndQualityA10']) waA02Q.append(h.field['weakAndQualityA02']) - waS20Q.append(h.field['weakAndQualityS20']) - waS05Q.append(h.field['weakAndQualityS05']) waD20Q.append(h.field['weakAndQualityD20']) waD05Q.append(h.field['weakAndQualityD05']) waXQ.append(h.field['weakAndQualityX']) @@ -120,8 +112,6 @@ def measure_wand_quality waH.append(h.field['weakAndHits']) waA10H.append(h.field['weakAndHitsA10']) waA02H.append(h.field['weakAndHitsA02']) - waS20H.append(h.field['weakAndHitsS20']) - waS05H.append(h.field['weakAndHitsS05']) waD20H.append(h.field['weakAndHitsD20']) waD05H.append(h.field['weakAndHitsD05']) waXH.append(h.field['weakAndHitsX']) @@ -130,8 +120,6 @@ def measure_wand_quality waT.append(h.field['weakAndTime']) waA10T.append(h.field['weakAndTimeA10']) waA02T.append(h.field['weakAndTimeA02']) - waS20T.append(h.field['weakAndTimeS20']) - waS05T.append(h.field['weakAndTimeS05']) waD20T.append(h.field['weakAndTimeD20']) waD05T.append(h.field['weakAndTimeD05']) waXT.append(h.field['weakAndTimeX']) @@ -151,8 +139,6 @@ def measure_wand_quality process("WeakAnd-recall", "recall@100", waQ) process("WeakAnd-A10-recall", "recall@100", waA10Q) process("WeakAnd-A2-recall", "recall@100", waA02Q) - process("WeakAnd-S20-recall", "recall@100", waS20Q) - process("WeakAnd-S5-recall", "recall@100", waS05Q) process("WeakAnd-D20-recall", "recall@100", waD20Q) process("WeakAnd-D5-recall", "recall@100", waD05Q) process("WeakAnd-X-recall", "recall@100", waXQ) @@ -161,8 +147,6 @@ def measure_wand_quality process("WeakAnd-hits", "hits", waH) process("WeakAnd-A10-hits", "hits", waA10H) process("WeakAnd-A2-hits", "hits", waA02H) - process("WeakAnd-S20-hits", "hits", waS20H) - process("WeakAnd-S5-hits", "hits", waS05H) process("WeakAnd-D20-hits", "hits", waD20H) process("WeakAnd-D5-hits", "hits", waD05H) process("WeakAnd-X-hits", "hits", waXH) @@ -172,8 +156,6 @@ def measure_wand_quality process("WeakAnd-ms", "latency", waT) process("WeakAnd-A10-ms", "latency", waA10T) process("WeakAnd-A2-ms", "latency", waA02T) - process("WeakAnd-S20-ms", "latency", waS20T) - process("WeakAnd-S5-ms", "latency", waS05T) process("WeakAnd-D20-ms", "latency", waD20T) process("WeakAnd-D5-ms", "latency", waD05T) process("WeakAnd-X-ms", "latency", waXT)