diff options
author | Arne Juul <arnej@vespa.ai> | 2023-10-16 07:00:53 +0000 |
---|---|---|
committer | Arne Juul <arnej@vespa.ai> | 2023-10-16 07:00:53 +0000 |
commit | 1b7332116c17f4ece6e93a8b46777492dc1deb08 (patch) | |
tree | f875d138deaf306a4b6da2a4ec3e9aef40f7cfdf /searchlib/src | |
parent | 90c59bfc313263a238c464b21221d1ede8bf997a (diff) |
fix some trailing whitespace
Diffstat (limited to 'searchlib/src')
5 files changed, 10 insertions, 10 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/ExpressionFunction.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/ExpressionFunction.java index 7df08d7d356..093e65b2e4d 100755 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/ExpressionFunction.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/ExpressionFunction.java @@ -212,7 +212,7 @@ public class ExpressionFunction { public String toString() { return "function '" + name + "'"; } - + /** * An instance of a serialization of this function, using a particular serialization context (by {@link * ExpressionFunction#expand}) diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java index d88bd03b7d4..d1cb77fb1b4 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java @@ -21,7 +21,7 @@ import java.util.Optional; * @author bratseth */ public class SerializationContext extends FunctionReferenceContext { - + /** Serialized form of functions indexed by name */ private final Map<String, String> serializedFunctions; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/tensor/EvaluateTensorConformance.java b/searchlib/src/main/java/com/yahoo/searchlib/tensor/EvaluateTensorConformance.java index dcdf2f532e4..69c8a091cce 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/tensor/EvaluateTensorConformance.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/tensor/EvaluateTensorConformance.java @@ -71,7 +71,7 @@ public class EvaluateTensorConformance { System.exit(1); } } - + private boolean testCase(String test, int count) { boolean wasOk = false; try { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java index e9b1e3bda0d..8af77ec1cdd 100755 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java @@ -61,7 +61,7 @@ public class RankingExpressionTestCase { assertParse("query(var1) + query(var2) - query(var3) * (query(var4) / query(var5))", " $var1 + $var2 - $var3 *($var4 / $var5)"); assertParse("if (if (f1.out < query(p1), 0, 1) < if (f2.out < query(p2), 0, 1), f3.out, query(p3))", "if(if(f1.out<$p1,0,1)<if(f2.out<$p2,0,1),f3.out,$p3)"); } - + @Test public void testProgrammaticBuilding() throws ParseException { ReferenceNode input = new ReferenceNode("input"); @@ -147,14 +147,14 @@ public class RankingExpressionTestCase { "10 + 8 * 1977"), "cox", functions ); } - + @Test public void testTensorSerialization() { - assertSerialization("map(constant(tensor0), f(a)(cos(a)))", + assertSerialization("map(constant(tensor0), f(a)(cos(a)))", "map(constant(tensor0), f(a)(cos(a)))"); - assertSerialization("map(constant(tensor0), f(a)(cos(a))) + join(attribute(tensor1), map(reduce(map(attribute(tensor1), f(a)(a * a)), sum, x), f(a)(sqrt(a))), f(a,b)(a / b))", + assertSerialization("map(constant(tensor0), f(a)(cos(a))) + join(attribute(tensor1), map(reduce(map(attribute(tensor1), f(a)(a * a)), sum, x), f(a)(sqrt(a))), f(a,b)(a / b))", "map(constant(tensor0), f(a)(cos(a))) + l2_normalize(attribute(tensor1), x)"); - assertSerialization("join(reduce(join(reduce(join(constant(tensor0), attribute(tensor1), f(a,b)(a * b)), sum, x), attribute(tensor1), f(a,b)(a * b)), sum, y), query(tensor2), f(a,b)(a + b))", + assertSerialization("join(reduce(join(reduce(join(constant(tensor0), attribute(tensor1), f(a,b)(a * b)), sum, x), attribute(tensor1), f(a,b)(a * b)), sum, y), query(tensor2), f(a,b)(a + b))", "xw_plus_b(matmul(constant(tensor0), attribute(tensor1), x), attribute(tensor1), query(tensor2), y)"); assertSerialization("tensor(x{}):{{x:a}:(1 + 2 + 3),{x:b}:(if (1 > 2, 3, 4)),{x:c}:(reduce(tensor0 * tensor1, sum))}", "tensor(x{}):{ {x:a}:1+2+3, {x:b}:if(1>2,3,4), {x:c}:sum(tensor0*tensor1) }"); @@ -378,7 +378,7 @@ public class RankingExpressionTestCase { // (but not the same one due to primitivization) RankingExpression reparsedExpression = new RankingExpression(serializedExpression); // Serializing the primitivized expression should yield the same expression again - String reserializedExpression = + String reserializedExpression = reparsedExpression.getRankProperties(new SerializationContext()).values().iterator().next(); assertEquals(expectedSerialization, reserializedExpression); } diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationBenchmark.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationBenchmark.java index 955ca05ce37..f0ce613e27f 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationBenchmark.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationBenchmark.java @@ -209,7 +209,7 @@ public class EvaluationBenchmark { if (Math.abs(a-b) >= Math.abs((a+b)/100000000) ) throw new RuntimeException("Expected value " + a + " but optimized evaluation produced " + b); } - + private final String gbdt = "if (LW_NEWS_SEARCHES_RATIO < 1.72971, 0.0697159, if (LW_USERS < 0.10496, if (SEARCHES < 0.0329127, 0.151257, 0.117501), if (SUGG_OVERLAP < 18.5, 0.0897622, 0.0756903))) + \n" + "if (LW_NEWS_SEARCHES_RATIO < 1.73156, if (NEWS_USERS < 0.0737993, -0.00481646, 0.00110018), if (LW_USERS < 0.0844616, 0.0488919, if (SUGG_OVERLAP < 32.5, 0.0136917, 9.85328E-4))) + \n" + |