From 63b203bc3ec9c17b02781c9b62e446fb981699d4 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 19 May 2020 13:41:49 -0500
Subject: [PATCH] fix stability test with correct data

---
 .../shared/distributions/CSVFrequencySampler.java      | 10 +++-------
 .../java/io/virtdata/IntegratedAliasMethodTests.java   |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java
index 0f1b2da8a..7fcd8e31e 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java
@@ -49,12 +49,9 @@ import java.util.function.LongFunction;
 @ThreadSafeMapper
 public class CSVFrequencySampler implements LongFunction<String> {
 
-    private final String filename;
-    private final String columnName;
-
     private final String[] lines;
     private final AliasSamplerDoubleInt sampler;
-    private Hash hash;
+    private final Hash hash;
 
     /**
      * Create a sampler of strings from the given CSV file. The CSV file must have plain CSV headers
@@ -64,8 +61,7 @@ public class CSVFrequencySampler implements LongFunction<String> {
      */
     @Example({"CSVFrequencySampler('values.csv','modelno')","Read values.csv, count the frequency of values in 'modelno' column, and sample from this column proportionally"})
     public CSVFrequencySampler(String filename, String columnName) {
-        this.filename = filename;
-        this.columnName = columnName;
+        String filename1 = filename;
 
         this.hash=new Hash();
 
@@ -86,7 +82,7 @@ public class CSVFrequencySampler implements LongFunction<String> {
         }
         int i = 0;
         for (String value : values) {
-            frequencies.add(new EvProbD(i++,Double.valueOf(freq.getCount(value))));
+            frequencies.add(new EvProbD(i++, (double) freq.getCount(value)));
         }
         sampler = new AliasSamplerDoubleInt(frequencies);
         lines = values.toArray(new String[0]);
diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java
index 124703ddf..b785af536 100644
--- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java
+++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java
@@ -20,7 +20,7 @@ public class IntegratedAliasMethodTests {
     public void testCSVFrequencySampler() {
         CSVFrequencySampler names= new CSVFrequencySampler("data/countries", "COUNTRY_CODE" );
         String n = names.apply(23);
-        assertThat(n).isEqualTo("CZ");
+        assertThat(n).isEqualTo("TK");
     }
 
     @Test
@@ -31,6 +31,6 @@ public class IntegratedAliasMethodTests {
                 ','
         );
         String n = names.apply(23);
-        assertThat(n).isEqualTo("CZ");
+        assertThat(n).isEqualTo("TK");
     }
 }