Make SearchCluster.TopKEstimator a top level class.

2 files changed, 19 insertions, 12 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/TopKEstimatorTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/TopKEstimatorTest.java
new file mode 100644
index 00000000000..6ef28119c23
--- /dev/null
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/TopKEstimatorTest.java
@@ -0,0 +1,18 @@
+package com.yahoo.search.dispatch;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class TopKEstimatorTest {
+    @Test
+    public void requireHitsAreEstimatedAccordingToPartitionsAndProbability() {
+        TopKEstimator estimator = new TopKEstimator(30, 0.999);
+        assertEquals(91.97368471911312, estimator.estimateExactK(200, 3), 0.0);
+        assertEquals(92, estimator.estimateK(200, 3));
+        assertEquals(37.96328109101396, estimator.estimateExactK(200, 10), 0.0);
+        assertEquals(38, estimator.estimateK(200, 10));
+        assertEquals(23.815737601023095, estimator.estimateExactK(200, 20), 0.0);
+        assertEquals(24, estimator.estimateK(200, 20));
+    }
+}
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
index 840edd3a419..09024150a9a 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
@@ -8,6 +8,7 @@ import com.yahoo.net.HostName;
 import com.yahoo.prelude.Pong;
 import com.yahoo.search.cluster.ClusterMonitor;
 import com.yahoo.search.dispatch.MockSearchCluster;
+import com.yahoo.search.dispatch.TopKEstimator;
 import com.yahoo.search.result.ErrorMessage;
 import org.junit.Test;
 
@@ -27,7 +28,6 @@ import static org.junit.Assert.assertTrue;
  * @author baldersheim
  */
 public class SearchClusterTest {
-    private static final double EPSILON = 0.00000000001;
 
     static class State implements AutoCloseable{
 
@@ -335,15 +335,4 @@ public class SearchClusterTest {
         assertEquals(3, node.getLastReceivedPongId());
     }
 
-    @Test
-    public void requireHitsAreEstimatedAccordingToPartitionsAndProbability() {
-        SearchCluster.TopKEstimator estimator = new SearchCluster.TopKEstimator(30, 0.999);
-        assertEquals(91.97368471911312, estimator.estimateExactK(200, 3), EPSILON);
-        assertEquals(92, estimator.estimateK(200, 3));
-        assertEquals(37.96328109101396, estimator.estimateExactK(200, 10), EPSILON);
-        assertEquals(38, estimator.estimateK(200, 10));
-        assertEquals(23.815737601023095, estimator.estimateExactK(200, 20), EPSILON);
-        assertEquals(24, estimator.estimateK(200, 20));
-    }
-
 }