summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-01-23 08:29:25 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-01-23 08:29:25 +0000
commita9b274069da27015e499b1ca16a52a76c36c130b (patch)
treebdeffaa395c45cd90f900c3f50807437df25cad3 /searchlib
parent53e31ed9798ddf616f0431888cec0673dbf7bdba (diff)
Undo syntax layout changes
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp b/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp
index c902eefe6a3..45d9ddb3763 100644
--- a/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp
+++ b/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp
@@ -60,7 +60,8 @@ struct SumAggregator : Aggregator {
double get() const override { return value; }
};
-Aggregator::UP create_aggregator(const vespalib::string &name) {
+Aggregator::UP
+create_aggregator(const vespalib::string &name) {
if (name == "max") {
return Aggregator::UP(new MaxAggregator());
}
@@ -196,7 +197,8 @@ struct State {
//-----------------------------------------------------------------------------
-class ElementSimilarityExecutor : public fef::FeatureExecutor {
+class ElementSimilarityExecutor : public fef::FeatureExecutor
+{
private:
typedef fef::TermFieldMatchData::PositionsIterator ITR;
@@ -378,7 +380,8 @@ ElementSimilarityBlueprint::visitDumpFeatures(const fef::IIndexEnvironment &env,
const fef::FieldInfo &field = *env.getField(i);
if ((field.type() == fef::FieldType::INDEX) &&
(field.collection() != CollectionType::SINGLE) &&
- (!field.isFilter())) {
+ (!field.isFilter()))
+ {
fef::FeatureNameBuilder fnb;
fnb.baseName(getBaseName()).parameter(field.name());
auto outputs = get_outputs(env.getProperties(), fnb.buildName());
@@ -391,7 +394,8 @@ ElementSimilarityBlueprint::visitDumpFeatures(const fef::IIndexEnvironment &env,
}
bool
-ElementSimilarityBlueprint::setup(const fef::IIndexEnvironment &env, const fef::ParameterList &params) {
+ElementSimilarityBlueprint::setup(const fef::IIndexEnvironment &env, const fef::ParameterList &params)
+{
const fef::FieldInfo *field = params[0].asField();
_field_id = field->id();
fef::FeatureNameBuilder fnb;
@@ -427,7 +431,8 @@ ElementSimilarityBlueprint::setup(const fef::IIndexEnvironment &env, const fef::
}
fef::FeatureExecutor &
-ElementSimilarityBlueprint::createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const {
+ElementSimilarityBlueprint::createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const
+{
std::vector<OutputSpec> output_specs;
for (const auto &output: _outputs) {
output_specs.emplace_back(output->compile_token->get().get_function<5>(),