diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-19 21:51:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-19 21:51:54 +0200 |
commit | d650e313d11cfe0f2f4ce07f5fc8cf616a264739 (patch) | |
tree | bdece4b85a956fe44701d6339241e15272459508 /searchlib/src/tests/ranksetup | |
parent | c536a7dedb8257d9a56fb350bf24b796e26712e8 (diff) |
Revert "Havardpe/reuse termwise vector in second phase"
Diffstat (limited to 'searchlib/src/tests/ranksetup')
-rw-r--r-- | searchlib/src/tests/ranksetup/ranksetup_test.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/searchlib/src/tests/ranksetup/ranksetup_test.cpp b/searchlib/src/tests/ranksetup/ranksetup_test.cpp index 7a26180eed2..c2ef8f3a46b 100644 --- a/searchlib/src/tests/ranksetup/ranksetup_test.cpp +++ b/searchlib/src/tests/ranksetup/ranksetup_test.cpp @@ -87,7 +87,6 @@ private: const RankEnvironment & _rankEnv; MatchDataLayout _layout; std::unique_ptr<RankSetup> _rs; - MatchData::UP _match_data; RankProgram::UP _firstPhaseProgram; RankProgram::UP _secondPhaseProgram; @@ -101,7 +100,7 @@ public: RankExecutor::RankExecutor(const vespalib::string &initRank, const vespalib::string &finalRank, const RankEnvironment &rankEnv) : _initRank(initRank), _finalRank(finalRank), _rankEnv(rankEnv), _layout(), - _rs(), _match_data(), _firstPhaseProgram(), _secondPhaseProgram() + _rs(), _firstPhaseProgram(), _secondPhaseProgram() {} RankExecutor::~RankExecutor() {} @@ -122,13 +121,12 @@ RankExecutor::setup() if (!_rs->compile()) { return false; } - _match_data = _layout.createMatchData(); _firstPhaseProgram = _rs->create_first_phase_program(); - _firstPhaseProgram->setup(*_match_data, _rankEnv.queryEnvironment()); + _firstPhaseProgram->setup(_layout, _rankEnv.queryEnvironment()); if (!_finalRank.empty()) { _secondPhaseProgram = _rs->create_second_phase_program(); - _secondPhaseProgram->setup(*_match_data, _rankEnv.queryEnvironment()); + _secondPhaseProgram->setup(_layout, _rankEnv.queryEnvironment()); } return true; } @@ -156,7 +154,6 @@ private: const RankEnvironment & _rankEnv; RankSetup _setup; MatchDataLayout _layout; - MatchData::UP _match_data; RankProgram::UP _rankProgram; public: @@ -172,7 +169,6 @@ FeatureDumper::FeatureDumper(const RankEnvironment & rankEnv) : _rankEnv(rankEnv), _setup(_rankEnv.factory(), _rankEnv.indexEnvironment()), _layout(), - _match_data(), _rankProgram() {} FeatureDumper::~FeatureDumper() {} @@ -195,9 +191,8 @@ FeatureDumper::setup() return false; } - _match_data = _layout.createMatchData(); _rankProgram = _setup.create_dump_program(); - _rankProgram->setup(*_match_data, _rankEnv.queryEnvironment()); + _rankProgram->setup(_layout, _rankEnv.queryEnvironment()); return true; } @@ -785,13 +780,12 @@ RankSetupTest::testFeatureNormalization() { // RANK context MatchDataLayout layout; QueryEnvironment queryEnv; - MatchData::UP match_data = layout.createMatchData(); RankProgram::UP firstPhaseProgram = rankSetup.create_first_phase_program(); RankProgram::UP secondPhaseProgram = rankSetup.create_second_phase_program(); RankProgram::UP summaryProgram = rankSetup.create_summary_program(); - firstPhaseProgram->setup(*match_data, queryEnv); - secondPhaseProgram->setup(*match_data, queryEnv); - summaryProgram->setup(*match_data, queryEnv); + firstPhaseProgram->setup(layout, queryEnv); + secondPhaseProgram->setup(layout, queryEnv); + summaryProgram->setup(layout, queryEnv); EXPECT_APPROX(2.0, Utils::getScoreFeature(*firstPhaseProgram, 1), 0.001); EXPECT_APPROX(4.0, Utils::getScoreFeature(*secondPhaseProgram, 1), 0.001); @@ -837,9 +831,8 @@ RankSetupTest::testFeatureNormalization() { // DUMP context MatchDataLayout layout; QueryEnvironment queryEnv; - MatchData::UP match_data = layout.createMatchData(); RankProgram::UP rankProgram = rankSetup.create_dump_program(); - rankProgram->setup(*match_data, queryEnv); + rankProgram->setup(layout, queryEnv); { // dump seed features std::map<vespalib::string, feature_t> actual = Utils::getSeedFeatures(*rankProgram, 1); |