summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorArne Juul <arnej@yahoo-inc.com>2018-06-21 11:52:19 +0000
committerArne Juul <arnej@yahoo-inc.com>2018-06-25 11:09:23 +0000
commit529f073074afd9eebc3a0841cf9b374dc6501732 (patch)
tree4df6305992e0c506471a20c8a3a3b0c2f545e5e9 /container-search
parenta5fcfcf14cbc5778af9480f3b4efb93138020499 (diff)
stop using DoubleFormatter
* also, update expected results in those places where slight differences in Double formatting was seen.
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/search/result/Relevance.java4
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml6
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml2
4 files changed, 6 insertions, 8 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/result/Relevance.java b/container-search/src/main/java/com/yahoo/search/result/Relevance.java
index 7737b01cc14..69d49dc33ed 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Relevance.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Relevance.java
@@ -1,8 +1,6 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.search.result;
-import com.yahoo.text.DoubleFormatter;
-
/**
* A relevance double value. These values should always be normalized between 0 and 1 (where 1 means perfect),
* however, this is not enforced.
@@ -47,7 +45,7 @@ public class Relevance implements Comparable<Relevance> {
*/
@Override
public String toString() {
- return DoubleFormatter.stringValue(score);
+ return String.valueOf(score);
}
/** Compares relevancy values with */
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml
index cb63af526a0..4272e54aeec 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml
@@ -64,10 +64,10 @@
<hit relevance="0.2" source="source5">
<id>source5-5</id>
</hit>
- <hit relevance="0.1666666666666667" source="source5">
+ <hit relevance="0.16666666666666666" source="source5">
<id>source5-6</id>
</hit>
- <hit relevance="0.1428571428571428" source="source5">
+ <hit relevance="0.14285714285714285" source="source5">
<id>source5-7</id>
</hit>
</section>
@@ -87,7 +87,7 @@
<hit relevance="0.2" source="source4">
<id>source4-5</id>
</hit>
- <hit relevance="0.1666666666666667" source="source4">
+ <hit relevance="0.16666666666666666" source="source4">
<id>source4-6</id>
</hit>
</section>
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml
index 1b8b5a71e35..623918c8739 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml
@@ -64,7 +64,7 @@
<hit relevance="0.2" source="source4">
<id>source4-5</id>
</hit>
- <hit relevance="0.1666666666666667" source="source4">
+ <hit relevance="0.16666666666666666" source="source4">
<id>source4-6</id>
</hit>
</section>
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml
index eb2e458ac6d..73b62afd6c1 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml
@@ -57,7 +57,7 @@
<hit relevance="0.2" source="source4">
<id>source4-5</id>
</hit>
- <hit relevance="0.1666666666666667" source="source4">
+ <hit relevance="0.16666666666666666" source="source4">
<id>source4-6</id>
</hit>
</section>