IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

post-merge fix-ups

Browse Source
This commit is contained in:
Jonathan Shook
2021-06-22 11:10:42 -05:00
parent beea2fdbf6 6403fcaf7f
commit a80e6d599b
339 changed files with 1331 additions and 1251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
virtdata-lib-curves4/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>4.15.48-SNAPSHOT</version>
<version>4.15.51-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@@ -22,13 +22,13 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>4.15.48-SNAPSHOT</version>
<version>4.15.51-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-basics</artifactId>
<version>4.15.48-SNAPSHOT</version>
<version>4.15.51-SNAPSHOT</version>
</dependency>
</dependencies>

2
virtdata-lib-curves4/src/main/java/org/apache/commons/math4/stat/descriptive/moment/SemiVariance.java
View File

@@ -340,7 +340,7 @@ public class SemiVariance extends AbstractUnivariateStatistic implements Seriali
/**
* boolean value UPSIDE <-> true
*/
private boolean direction;
private final boolean direction;
/**
* Create a Direction with the given value.

2
virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java
View File

@@ -1,7 +1,7 @@
package io.nosqlbench.virtdata.library.curves4.continuous;
import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Enumerated;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
import java.util.stream.LongStream;

2
virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java
View File

@@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.curves4.continuous;
import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Levy;
import org.assertj.core.data.Offset;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

4
virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java
View File

@@ -2,7 +2,7 @@ package io.nosqlbench.virtdata.library.curves4.continuous;
import io.nosqlbench.virtdata.core.bindings.DataMapper;
import io.nosqlbench.virtdata.core.bindings.VirtData;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
@@ -78,7 +78,7 @@ public class RealDistributionsConcurrencyTests {
private final Object signal;
private final int slot;
private final String mapperSpec;
private int size;
private final int size;
public RealDistributionCallable(int slot, int size, String mapperSpec, Object signal) {
this.slot = slot;

14
virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java
View File

@@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Normal;
import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Uniform;
import org.apache.commons.math4.stat.descriptive.DescriptiveStatistics;
import org.assertj.core.data.Offset;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.util.Formatter;
import java.util.Locale;
@@ -18,7 +18,7 @@ public class RealDistributionsValuesTest {
@Test
public void testComputedNormal() {
RunData runData = iterateMapperDouble(new Normal(10.0,2.0,"compute"), 1000000);
System.out.println(runData.toString());
System.out.println(runData);
assertThat(runData.getFractionalPercentile(0.5D))
.isCloseTo(10.0D, Offset.offset(0.01D));
assertThat(runData.getFractionalPercentile(0.4D))
@@ -30,7 +30,7 @@ public class RealDistributionsValuesTest {
@Test
public void testInterpolatedNormal() {
RunData runData = iterateMapperDouble(new Normal(10.0,2.0,"interpolate"), 1000000);
System.out.println(runData.toString());
System.out.println(runData);
assertThat(runData.getFractionalPercentile(0.5D))
.isCloseTo(10.0D, Offset.offset(0.01D));
assertThat(runData.getFractionalPercentile(0.4D))
@@ -48,7 +48,7 @@ public class RealDistributionsValuesTest {
.isCloseTo(50.0D, Offset.offset(1.0D));
assertThat(runData.getFractionalPercentile(0.78D))
.isCloseTo(78.0D, Offset.offset(1.0D));
System.out.println(runData.toString());
System.out.println(runData);
}
@Test
@@ -60,7 +60,7 @@ public class RealDistributionsValuesTest {
.isCloseTo(50.0D, Offset.offset(1.0D));
assertThat(runData.getFractionalPercentile(0.78D))
.isCloseTo(78.0D, Offset.offset(1.0D));
System.out.println(runData.toString());
System.out.println(runData);
}
@Test
@@ -77,7 +77,7 @@ public class RealDistributionsValuesTest {
private RunData iterateMapperDouble(LongToDoubleFunction mapper, int iterations) {
assertThat(mapper).isNotNull();
double samples[] = new double[iterations];
double[] samples = new double[iterations];
long time_generating = System.nanoTime();
for (int i = 0; i < iterations; i++) {
@@ -120,7 +120,7 @@ public class RealDistributionsValuesTest {
f.format("iterations: %d\n", iterations);
f.format("iterations/ms: %5f\n", (iterations/ms));
for (int i = 10; i < 100; i += 10) {
double pctile = (double) i;
double pctile = i;
f.format("pctile %4d %4f\n", i, s1.getPercentile(pctile));
}
return sb.toString();

10
virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java
View File

@@ -3,8 +3,8 @@ package io.nosqlbench.virtdata.library.curves4.discrete;
import io.nosqlbench.virtdata.library.curves4.discrete.common.DiscreteLongLongSampler;
import io.nosqlbench.virtdata.library.curves4.discrete.common.IntegerDistributionICDSource;
import org.apache.commons.statistics.distribution.BinomialDistribution;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class IntegerDistributionsBinomialSanity {
private static double[] binomial85steps = new double[]{
private static final double[] binomial85steps = new double[]{
0.00390d, 0.03125d, 0.10937d, 0.21875d, 0.27343d, 0.21875d, 0.10937d, 0.03125d, 0.00390d,
};
@@ -23,7 +23,7 @@ public class IntegerDistributionsBinomialSanity {
),false);
assertThat(b85.applyAsLong(0L)).isEqualTo(0);
assertThat(b85.applyAsLong(Long.MAX_VALUE)).isEqualTo(8);
double c[] = new double[binomial85steps.length];
double[] c = new double[binomial85steps.length];
c[0]=binomial85steps[0];
for (int i = 1; i < c.length; i++) {
c[i] = c[i-1]+binomial85steps[i];
@@ -56,7 +56,7 @@ public class IntegerDistributionsBinomialSanity {
}
@Ignore
@Disabled
@Test
public void showBinomialICDF() {
DiscreteLongLongSampler b85 = new DiscreteLongLongSampler(new IntegerDistributionICDSource(

4
virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java
View File

@@ -4,7 +4,7 @@ import io.nosqlbench.virtdata.core.bindings.DataMapper;
import io.nosqlbench.virtdata.core.bindings.VirtData;
import org.apache.commons.statistics.distribution.BinomialDistribution;
import org.assertj.core.data.Offset;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.Arrays;
@@ -128,7 +128,7 @@ public class IntegerDistributionsConcurrencyTest {
private final Object signal;
private final int slot;
private final String mapperSpec;
private int size;
private final int size;
public IntegerDistributionCallable(int slot, int size, String mapperSpec, Object signal) {
this.slot = slot;

24
virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java
View File

@@ -4,8 +4,8 @@ import io.nosqlbench.virtdata.library.curves4.continuous.long_double.Uniform;
import io.nosqlbench.virtdata.library.curves4.discrete.long_long.Zipf;
import org.apache.commons.math4.stat.descriptive.DescriptiveStatistics;
import org.assertj.core.data.Offset;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.util.Formatter;
import java.util.Locale;
@@ -16,11 +16,11 @@ import static org.assertj.core.api.Assertions.assertThat;
public class IntegerDistributionsValuesTest {
@Ignore
@Disabled
@Test
public void testComputedZipf() {
RunData runData = iterateMapperLong(new Zipf(10000,2.0), 10000);
System.out.println(runData.toString());
System.out.println(runData);
assertThat(runData.getFractionalPercentile(0.6D))
.isCloseTo(1.0D, Offset.offset(0.0001D));
assertThat(runData.getFractionalPercentile(0.7D))
@@ -34,7 +34,7 @@ public class IntegerDistributionsValuesTest {
@Test
public void testInterpolatedZipf() {
RunData runData = iterateMapperLong(new Zipf(10000,2.0), 10000);
System.out.println(runData.toString());
System.out.println(runData);
assertThat(runData.getFractionalPercentile(0.6D))
.isCloseTo(1.0D, Offset.offset(0.0001D));
assertThat(runData.getFractionalPercentile(0.7D))
@@ -55,7 +55,7 @@ public class IntegerDistributionsValuesTest {
.isCloseTo(50.0D, Offset.offset(1.0D));
assertThat(runData.getFractionalPercentile(0.78D))
.isCloseTo(78.0D, Offset.offset(1.0D));
System.out.println(runData.toString());
System.out.println(runData);
}
@Test
@@ -67,7 +67,7 @@ public class IntegerDistributionsValuesTest {
.isCloseTo(50.0D, Offset.offset(1.0D));
assertThat(runData.getFractionalPercentile(0.78D))
.isCloseTo(78.0D, Offset.offset(1.0D));
System.out.println(runData.toString());
System.out.println(runData);
}
@Test
@@ -83,11 +83,11 @@ public class IntegerDistributionsValuesTest {
private RunData iterateMapperLong(LongUnaryOperator mapper, int iterations) {
assertThat(mapper).isNotNull();
double samples[] = new double[iterations];
double[] samples = new double[iterations];
long time_generating = System.nanoTime();
for (int i = 0; i < iterations; i++) {
samples[i] = mapper.applyAsLong((long)i);
samples[i] = mapper.applyAsLong(i);
}
long time_generated = System.nanoTime();
@@ -98,11 +98,11 @@ public class IntegerDistributionsValuesTest {
private RunData iterateMapperDouble(LongToDoubleFunction mapper, int iterations) {
assertThat(mapper).isNotNull();
double samples[] = new double[iterations];
double[] samples = new double[iterations];
long time_generating = System.nanoTime();
for (int i = 0; i < iterations; i++) {
samples[i] = mapper.applyAsDouble((long)i);
samples[i] = mapper.applyAsDouble(i);
}
long time_generated = System.nanoTime();
@@ -141,7 +141,7 @@ public class IntegerDistributionsValuesTest {
f.format("iterations: %d\n", iterations);
f.format("iterations/ms: %5f\n", (iterations/ms));
for (int i = 10; i < 100; i += 10) {
double pctile = (double) i;
double pctile = i;
f.format("pctile %4d %4f\n", i, s1.getPercentile(pctile));
}
return sb.toString();

2
virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java
View File

@@ -1,6 +1,6 @@
package io.nosqlbench.virtdata.library.curves4.discrete.common;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

6
virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java
View File

@@ -1,12 +1,12 @@
package io.nosqlbench.virtdata.library.curves4.discrete.long_long;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
public class ZipfTest {
@Test
@Ignore
@Disabled
public void testZipfMatrix() {
for (int i = 0; i < 20; i++) {