Merge branch 'nosqlbench-955-jacoco2' into nosqlbench-944-jsonnet

This commit is contained in:
Jonathan Shook 2023-01-27 16:37:28 -06:00
commit ec60692375
710 changed files with 430 additions and 130826 deletions

View File

@ -140,48 +140,6 @@
<followSymLinks>false</followSymLinks>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ package io.nosqlbench.cqlgen.transformers;
import io.nosqlbench.cqlgen.core.CGKeyspaceStats;
import io.nosqlbench.cqlgen.core.CGSchemaStats;
import io.nosqlbench.cqlgen.core.CGTableStats;
import org.apache.commons.math4.util.Pair;
import org.apache.commons.math4.legacy.core.Pair;
import java.io.BufferedReader;
import java.io.IOException;

View File

@ -48,53 +48,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -33,53 +33,6 @@
This provides the ability to generate HTTP requests with nosqlbench
</description>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>

View File

@ -36,53 +36,7 @@
<properties>
<kafka.version>3.3.1</kafka.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>io.nosqlbench</groupId>

View File

@ -46,50 +46,4 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -91,51 +91,4 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -100,50 +100,6 @@
<version>1.7.1</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -53,50 +53,9 @@
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,12 +14,26 @@
* limitations under the License.
*/
/**
* This package is an import of some org.apache.commons source trees.
* Once the state of the newer o.a.c.math4 and distributions modules is stable,
* these will be removed and the release artifacts will be used.
* The enclosed packages were included here as the least worst of several options,
* given the confluence of JPMS, the status of the math4 repos, and the need
* to access stable CDF functions across the extant distributions.
*/
package org.apache.commons;
package io.nosqlbench.adapter.stdout;
import org.junit.jupiter.api.Test;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
public class TemplateFormatTest {
@Test
public void testBasicFormats() {
assertThat(TemplateFormat.json.format(true, List.of("f1","f2")))
.isEqualTo("""
{
"f1":"{f1}",
"f2":"{f2}"
}
""");
}
}

View File

@ -51,51 +51,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -63,50 +63,6 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>

View File

@ -133,51 +133,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -47,51 +47,4 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -41,54 +41,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -42,52 +42,5 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -65,54 +65,6 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>confluent</id>

View File

@ -90,52 +90,5 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -136,51 +136,6 @@
<filtering>false</filtering> <!-- exclusion from defaults -->
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -24,6 +24,22 @@ import static org.assertj.core.api.Assertions.assertThat;
public class GraalJsEvaluatorTest {
// TODO:
/**
* This evaluator may benefit from being compiled. Presently it give a warning:
* <pre>{@code
* [To redirect Truffle log output to a file use one of the following options:
* * '--log.file=<path>' if the option is passed using a guest language launcher.
* * '-Dpolyglot.log.file=<path>' if the option is passed using the host Java launcher.
* * Configure logging using the polyglot embedding API.]
* [engine] WARNING: The polyglot context is using an implementation that does not support runtime compilation.
* The guest application code will therefore be executed in interpreted mode only.
* Execution only in interpreted mode will strongly impact the guest application performance.
* For more information on using GraalVM see https://www.graalvm.org/java/quickstart/.
* To disable this warning the '--engine.WarnInterpreterOnly=false' option or use the '-Dpolyglot.engine.WarnInterpreterOnly=false' system property.
* }</pre>
*/
@Test
public void testBasicOperations() {
GraalJsEvaluator<Long> ne = new GraalJsEvaluator<>(Long.class);

View File

@ -51,51 +51,6 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>

View File

@ -58,51 +58,6 @@
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

View File

@ -93,49 +93,5 @@
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -76,53 +76,4 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -66,49 +66,6 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>

View File

@ -45,7 +45,6 @@
<build>
<resources>
<resource>
<directory>src/main/java</directory>
@ -54,71 +53,6 @@
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-javadoc-plugin</artifactId>-->
<!-- <version>3.1.1</version>-->
<!-- <configuration>-->
<!-- <doctitle>nosqlbench Extensions</doctitle>-->
<!-- <windowtitle>nosqlbench Extensions</windowtitle>-->
<!-- </configuration>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>attach-javadoc</id>-->
<!-- <goals>-->
<!-- <goal>jar</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
</plugins>
</build>
</project>

View File

@ -56,52 +56,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -14,7 +14,9 @@
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.nosqlbench</groupId>
@ -34,8 +36,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<javadoc.name>nosqlbench</javadoc.name>
<jacoco.version>0.8.8</jacoco.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
@ -134,6 +137,32 @@
<version>1.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math4-core</artifactId>
<version>4.0-beta1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math4-legacy</artifactId>
<version>4.0-beta1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math4-legacy-core</artifactId>
<version>4.0-beta1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math4-legacy-exception</artifactId>
<version>4.0-beta1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-statistics-distribution</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
@ -262,7 +291,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.12.382</version>
<version>1.12.393</version>
</dependency>
<dependency>
@ -295,12 +324,6 @@
<version>2.12.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
@ -464,7 +487,118 @@
<version>1.7.1</version>
</extension>
</extensions>
<plugins>
<!-- <plugin>-->
<!-- <groupId>org.jacoco</groupId>-->
<!-- <artifactId>jacoco-maven-plugin</artifactId>-->
<!-- <version>0.8.8</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id></id>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>prepare-agent</id>-->
<!-- <phase>process-test-classes</phase>-->
<!-- <goals>-->
<!-- <goal>prepare-agent</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <destFile>${build.directory}/jacoco-data.exec</destFile>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>report</id>-->
<!-- <phase>verify</phase>-->
<!-- <goals>-->
<!-- <goal>report</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <dataFile>${build.directory}/jacoco-data.exec</dataFile>-->
<!-- <outputDirectory>${build.directory}/jacoco-reports</outputDirectory>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>jacoco-check</id>-->
<!-- <phase>verify</phase>-->
<!-- <goals>-->
<!-- <goal>check</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <rules>-->
<!-- <rule>-->
<!-- <element>BUNDLE</element>-->
<!-- <limits>-->
<!-- <limit>-->
<!-- <counter>INSTRUCTION</counter>-->
<!-- <value>COVEREDRATIO</value>-->
<!-- <minimum>0.00</minimum>-->
<!-- <maximum>1.00</maximum>-->
<!-- </limit>-->
<!-- </limits>-->
<!-- </rule>-->
<!-- </rules>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-antrun-plugin</artifactId>-->
<!-- <version>1.6</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <phase>post-integration-test</phase>-->
<!-- <goals>-->
<!-- <goal>run</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <target>-->
<!-- <echo message="Generating NB Test Coverage Reports"/>-->
<!-- <taskdef name="report" classname="org.jacoco.ant.ReportTask">-->
<!-- <classpath-->
<!-- path="${basedir}/target/jacoco-jars/org.jacoco.ant.jar"/>-->
<!-- </taskdef>-->
<!-- <mkdir dir="${basedir}/target/coverage-report"/>-->
<!-- <report>-->
<!-- <fileset dir="${project.basedir}/target">-->
<!-- <include name="jacoco.exec"/>-->
<!-- </fileset>-->
<!-- <structure name="NB Coverage">-->
<!-- <group name="jacoco-nb-all-modules">-->
<!-- <classfiles>-->
<!-- <fileset dir="${project.basedir}/target/classes">-->
<!-- <include name="io/nosqlbench/**/*.class"/>-->
<!-- </fileset>-->
<!-- </classfiles>-->
<!-- <sourcefiles encoding="UTF-8">-->
<!-- <fileset dir="${project.basedir}/src/main/java"/>-->
<!-- </sourcefiles>-->
<!-- </group>-->
<!-- </structure>-->
<!-- <html destdir="${project.basedir}/target/coverage-report/html"/>-->
<!-- <xml destfile="${project.basedir}/target/coverage-report/nb-coverage-report.xml"/>-->
<!-- <csv destfile="${project.basedir}/target/coverage-report/nb-coverage-report.csv"/>-->
<!-- </report>-->
<!-- </target>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>org.jacoco</groupId>-->
<!-- <artifactId>org.jacoco.ant</artifactId>-->
<!-- <version>${jacoco.version}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@ -502,7 +636,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version>
<version>3.10.1</version>
<configuration>
<debug>true</debug>
<target>17</target>
@ -520,8 +654,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M6</version>
<configuration>
<argLine>-ea ${argLine}</argLine>
<systemPropertyVariables>
<Log4jContextSelector>org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
<Log4jContextSelector>
org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
</Log4jContextSelector>
</systemPropertyVariables>
<parallel>methods</parallel>
@ -538,6 +674,57 @@
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<phase>process-test-classes</phase>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
<destFile>${build.directory}/jacoco-data.exec</destFile>
</configuration>
</execution>
<execution>
<id>report</id>
<phase>verify</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<dataFile>${build.directory}/jacoco-data.exec</dataFile>
<outputDirectory>${build.directory}/jacoco-reports</outputDirectory>
</configuration>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
@ -698,7 +885,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@ -45,52 +45,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -150,52 +150,6 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>

View File

@ -65,50 +65,6 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>

View File

@ -190,48 +190,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
@ -288,50 +246,6 @@
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<executions>
<execution>

View File

@ -68,49 +68,6 @@
</testResources>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>

View File

@ -136,48 +136,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>

243
pom.xml
View File

@ -155,249 +155,6 @@
<!-- </executions>-->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<phase>post-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<echo message="Generating NB Test Coverage Reports" />
<taskdef name="report" classname="org.jacoco.ant.ReportTask">
<classpath path="${basedir}/target/jacoco-jars/org.jacoco.ant.jar" />
</taskdef>
<mkdir dir="${basedir}/target/coverage-report" />
<report>
<executiondata>
<fileset dir="${basedir}/${module.nbr}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.nb-api}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.nb-annotations}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.nb-spectest}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.engine-api}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.engine-core}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.engine-extensions}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.engine-docker}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.engine-docs}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.engine-cli}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapters-api}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapter-diag}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapter-stdout}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapter-cqld4}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapter-http}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapter-tcp}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapter-dynamodb}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapter-mongodb}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapter-pulsar}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapter-s4j}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.adapter-kafka}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-api}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-lang}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-realdata}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-lib-basics}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-lib-random}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-lib-curves4}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-lib-realer}/target">
<include name="jacoco.exec" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-userlibs}/target">
<include name="jacoco.exec" />
</fileset>
</executiondata>
<structure name="NB Coverage">
<group name="jacoco-nb-all-modules">
<classfiles>
<fileset dir="${basedir}/${module.nb-api}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.nb-annotations}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.nb-spectest}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.engine-api}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.engine-core}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.engine-extensions}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.engine-docker}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.engine-docs}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.engine-cli}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapters-api}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapter-diag}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapter-stdout}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapter-cqld4}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapter-http}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapter-tcp}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapter-dynamodb}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapter-mongodb}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapter-pulsar}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapter-s4j}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.adapter-kafka}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-api}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-lang}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-realdata}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-lib-basics}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-lib-random}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-lib-curves4}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-lib-realer}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
<fileset dir="${basedir}/${module.virtdata-userlibs}/target/classes">
<include name="io/nosqlbench/**/*.class" />
</fileset>
</classfiles>
<sourcefiles encoding="UTF-8">
<fileset dir="${basedir}/${module.nb-api}/src/main/java" />
<fileset dir="${basedir}/${module.nb-annotations}/src/main/java" />
<fileset dir="${basedir}/${module.nb-spectest}/src/main/java" />
<fileset dir="${basedir}/${module.engine-api}/src/main/java" />
<fileset dir="${basedir}/${module.engine-core}/src/main/java" />
<fileset dir="${basedir}/${module.engine-extensions}/src/main/java" />
<fileset dir="${basedir}/${module.engine-docker}/src/main/java" />
<fileset dir="${basedir}/${module.engine-docs}/src/main/java" />
<fileset dir="${basedir}/${module.engine-cli}/src/main/java" />
<fileset dir="${basedir}/${module.adapters-api}/src/main/java" />
<fileset dir="${basedir}/${module.adapter-diag}/src/main/java" />
<fileset dir="${basedir}/${module.adapter-stdout}/src/main/java" />
<fileset dir="${basedir}/${module.adapter-cqld4}/src/main/java" />
<fileset dir="${basedir}/${module.adapter-http}/src/main/java" />
<fileset dir="${basedir}/${module.adapter-tcp}/src/main/java" />
<fileset dir="${basedir}/${module.adapter-dynamodb}/src/main/java" />
<fileset dir="${basedir}/${module.adapter-mongodb}/src/main/java" />
<fileset dir="${basedir}/${module.adapter-pulsar}/src/main/java" />
<fileset dir="${basedir}/${module.adapter-s4j}/src/main/java" />
<fileset dir="${basedir}/${module.adapter-kafka}/src/main/java" />
<fileset dir="${basedir}/${module.virtdata-api}/src/main/java" />
<fileset dir="${basedir}/${module.virtdata-lang}/src/main/java" />
<fileset dir="${basedir}/${module.virtdata-realdata}/src/main/java" />
<fileset dir="${basedir}/${module.virtdata-lib-basics}/src/main/java" />
<fileset dir="${basedir}/${module.virtdata-lib-random}/src/main/java" />
<fileset dir="${basedir}/${module.virtdata-lib-curves4}/src/main/java" />
<fileset dir="${basedir}/${module.virtdata-lib-realer}/src/main/java" />
<fileset dir="${basedir}/${module.virtdata-userlibs}/src/main/java" />
</sourcefiles>
</group>
</structure>
<html destdir="${basedir}/target/coverage-report/html" />
<xml destfile="${basedir}/target/coverage-report/nb-coverage-report.xml" />
<csv destfile="${basedir}/target/coverage-report/nb-coverage-report.csv" />
</report>
</target>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
<version>${jacoco.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

View File

@ -60,52 +60,28 @@
<artifactId>javapoet</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math4-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math4-legacy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math4-legacy-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math4-legacy-exception</artifactId>
<version>4.0-beta1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-statistics-distribution</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -80,49 +80,6 @@
<followSymLinks>false</followSymLinks>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

View File

@ -63,10 +63,6 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</dependency>
<dependency>
<groupId>com.elega9t</groupId>
@ -75,51 +71,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -47,59 +47,21 @@
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math4-core</artifactId>
<version>4.0-beta1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math4-legacy-core</artifactId>
<version>4.0-beta1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-statistics-distribution</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<configuration>
<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
<excludes>
<exclude>org/apache/**/*</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>jacoco-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
<maximum>1.00</maximum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.BetaDistribution;
@ThreadSafeMapper
public class Beta extends IntToDoubleContinuousCurve {
public Beta(double alpha, double beta, String... mods) {
super(new BetaDistribution(alpha, beta), mods);
super(BetaDistribution.of(alpha, beta), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.CauchyDistribution;
@Categories({Category.distributions})
public class Cauchy extends IntToDoubleContinuousCurve {
public Cauchy(double median, double scale, String... mods) {
super(new CauchyDistribution(median, scale), mods);
super(CauchyDistribution.of(median, scale), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.ChiSquaredDistribution;
@Categories({Category.distributions})
public class ChiSquared extends IntToDoubleContinuousCurve {
public ChiSquared(double degreesOfFreedom, String... mods) {
super(new ChiSquaredDistribution(degreesOfFreedom), mods);
super(ChiSquaredDistribution.of(degreesOfFreedom), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ package io.nosqlbench.virtdata.library.curves4.continuous.int_double;
import io.nosqlbench.virtdata.api.annotations.Categories;
import io.nosqlbench.virtdata.api.annotations.Category;
import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
import org.apache.commons.statistics.distribution.ConstantContinuousDistribution;
import org.apache.commons.math4.legacy.distribution.EmpiricalDistribution;
/**
* Always yields the same value.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.ConstantContinuousDistribution
@Categories({Category.distributions})
public class ConstantContinuous extends IntToDoubleContinuousCurve {
public ConstantContinuous(double value, String... mods) {
super(new ConstantContinuousDistribution(value), mods);
super(EmpiricalDistribution.from(1, new double[]{value}), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -20,7 +20,7 @@ import io.nosqlbench.virtdata.api.annotations.Categories;
import io.nosqlbench.virtdata.api.annotations.Category;
import io.nosqlbench.virtdata.api.annotations.Example;
import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
import org.apache.commons.math4.distribution.EnumeratedRealDistribution;
import org.apache.commons.math4.legacy.distribution.EnumeratedRealDistribution;
/**
* Creates a probability density given the values and optional weights provided, in "value:weight value:weight ..." form.

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.ExponentialDistribution;
@Categories({Category.distributions})
public class Exponential extends IntToDoubleContinuousCurve {
public Exponential(double mean, String... mods) {
super(new ExponentialDistribution(mean), mods);
super(ExponentialDistribution.of(mean), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -34,6 +34,6 @@ import org.apache.commons.statistics.distribution.FDistribution;
@Categories({Category.distributions})
public class F extends IntToDoubleContinuousCurve {
public F(double numeratorDegreesOfFreedom, double denominatorDegreesOfFreedom, String... mods) {
super(new FDistribution(numeratorDegreesOfFreedom, denominatorDegreesOfFreedom), mods);
super(FDistribution.of(numeratorDegreesOfFreedom, denominatorDegreesOfFreedom), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.GammaDistribution;
@Categories({Category.distributions})
public class Gamma extends IntToDoubleContinuousCurve {
public Gamma(double shape, double scale, String... mods) {
super(new GammaDistribution(shape, scale), mods);
super(GammaDistribution.of(shape, scale), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.GumbelDistribution;
@Categories({Category.distributions})
public class Gumbel extends IntToDoubleContinuousCurve {
public Gumbel(double mu, double beta, String... mods) {
super(new GumbelDistribution(mu, beta), mods);
super(GumbelDistribution.of(mu, beta), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.LaplaceDistribution;
@Categories({Category.distributions})
public class Laplace extends IntToDoubleContinuousCurve {
public Laplace(double mu, double beta, String... mods) {
super(new LaplaceDistribution(mu, beta), mods);
super(LaplaceDistribution.of(mu, beta), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -30,6 +30,6 @@ import org.apache.commons.statistics.distribution.LevyDistribution;
*/
@ThreadSafeMapper
@Categories({Category.distributions})
public class Levy extends IntToDoubleContinuousCurve { public Levy(double mu, double c, String... mods) { super(new LevyDistribution(mu,c), mods);
public class Levy extends IntToDoubleContinuousCurve { public Levy(double mu, double c, String... mods) { super(LevyDistribution.of(mu,c), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.LogNormalDistribution;
@Categories({Category.distributions})
public class LogNormal extends IntToDoubleContinuousCurve {
public LogNormal(double scale, double shape, String... mods) {
super(new LogNormalDistribution(scale, shape), mods);
super(LogNormalDistribution.of(scale, shape), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.LogisticDistribution;
@Categories({Category.distributions})
public class Logistic extends IntToDoubleContinuousCurve {
public Logistic(double mu, double scale, String... mods) {
super(new LogisticDistribution(mu, scale), mods);
super(LogisticDistribution.of(mu, scale), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.NakagamiDistribution;
@Categories({Category.distributions})
public class Nakagami extends IntToDoubleContinuousCurve {
public Nakagami(double mu, double omega, String... mods) {
super(new NakagamiDistribution(mu, omega), mods);
super(NakagamiDistribution.of(mu, omega), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.NormalDistribution;
@Categories({Category.distributions})
public class Normal extends IntToDoubleContinuousCurve {
public Normal(double mean, double sd, String... mods) {
super(new NormalDistribution(mean, sd), mods);
super(NormalDistribution.of(mean, sd), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.ParetoDistribution;
@Categories({Category.distributions})
public class Pareto extends IntToDoubleContinuousCurve {
public Pareto(double scale, double shape, String... mods) {
super(new ParetoDistribution(scale, shape), mods);
super(ParetoDistribution.of(scale, shape), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.TDistribution;
@Categories({Category.distributions})
public class T extends IntToDoubleContinuousCurve {
public T(double degreesOfFreedom, String... mods) {
super(new TDistribution(degreesOfFreedom), mods);
super(TDistribution.of(degreesOfFreedom), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.TriangularDistribution;
@Categories({Category.distributions})
public class Triangular extends IntToDoubleContinuousCurve {
public Triangular(double a, double c, double b, String... mods) {
super(new TriangularDistribution(a,c,b), mods);
super(TriangularDistribution.of(a,c,b), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.UniformContinuousDistribution;
@Categories({Category.distributions})
public class Uniform extends IntToDoubleContinuousCurve {
public Uniform(double lower, double upper, String... mods) {
super(new UniformContinuousDistribution(lower, upper), mods);
super(UniformContinuousDistribution.of(lower, upper), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -34,6 +34,6 @@ import org.apache.commons.statistics.distribution.WeibullDistribution;
@Categories({Category.distributions})
public class Weibull extends IntToDoubleContinuousCurve {
public Weibull(double alpha, double beta, String... mods) {
super(new WeibullDistribution(alpha, beta), mods);
super(WeibullDistribution.of(alpha, beta), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.BetaDistribution;
@ThreadSafeMapper
public class Beta extends LongToDoubleContinuousCurve {
public Beta(double alpha, double beta, String... mods) {
super(new BetaDistribution(alpha, beta), mods);
super(BetaDistribution.of(alpha, beta), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.CauchyDistribution;
@Categories({Category.distributions})
public class Cauchy extends LongToDoubleContinuousCurve {
public Cauchy(double median, double scale, String... mods) {
super(new CauchyDistribution(median, scale), mods);
super(CauchyDistribution.of(median, scale), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.ChiSquaredDistribution;
@Categories({Category.distributions})
public class ChiSquared extends LongToDoubleContinuousCurve {
public ChiSquared(double degreesOfFreedom, String... mods) {
super(new ChiSquaredDistribution(degreesOfFreedom), mods);
super(ChiSquaredDistribution.of(degreesOfFreedom), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -19,12 +19,12 @@ package io.nosqlbench.virtdata.library.curves4.continuous.long_double;
import io.nosqlbench.virtdata.api.annotations.Categories;
import io.nosqlbench.virtdata.api.annotations.Category;
import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
import org.apache.commons.statistics.distribution.ConstantContinuousDistribution;
import org.apache.commons.math4.legacy.distribution.EmpiricalDistribution;
@ThreadSafeMapper
@Categories({Category.distributions})
public class ConstantContinuous extends LongToDoubleContinuousCurve {
public ConstantContinuous(double value, String... mods) {
super(new ConstantContinuousDistribution(value), mods);
super(EmpiricalDistribution.from(1,new double[]{value}), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -20,7 +20,7 @@ import io.nosqlbench.virtdata.api.annotations.Categories;
import io.nosqlbench.virtdata.api.annotations.Category;
import io.nosqlbench.virtdata.api.annotations.Example;
import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
import org.apache.commons.math4.distribution.EnumeratedRealDistribution;
import org.apache.commons.math4.legacy.distribution.EnumeratedRealDistribution;
@ThreadSafeMapper
@Categories({Category.distributions})

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.ExponentialDistribution;
@Categories({Category.distributions})
public class Exponential extends LongToDoubleContinuousCurve {
public Exponential(double mean, String... mods) {
super(new ExponentialDistribution(mean), mods);
super(ExponentialDistribution.of(mean), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.FDistribution;
@Categories({Category.distributions})
public class F extends LongToDoubleContinuousCurve {
public F(double numeratorDegreesOfFreedom, double denominatorDegreesOfFreedom, String... mods) {
super(new FDistribution(numeratorDegreesOfFreedom, denominatorDegreesOfFreedom), mods);
super(FDistribution.of(numeratorDegreesOfFreedom, denominatorDegreesOfFreedom), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.GammaDistribution;
@Categories({Category.distributions})
public class Gamma extends LongToDoubleContinuousCurve {
public Gamma(double shape, double scale, String... mods) {
super(new GammaDistribution(shape, scale), mods);
super(GammaDistribution.of(shape, scale), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -21,10 +21,11 @@ import io.nosqlbench.virtdata.api.annotations.Category;
import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
import org.apache.commons.statistics.distribution.GumbelDistribution;
@ThreadSafeMapper
@Categories({Category.distributions})
public class Gumbel extends LongToDoubleContinuousCurve {
public Gumbel(double mu, double beta, String... mods) {
super(new GumbelDistribution(mu, beta), mods);
super(GumbelDistribution.of(mu, beta), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.LaplaceDistribution;
@Categories({Category.distributions})
public class Laplace extends LongToDoubleContinuousCurve {
public Laplace(double mu, double beta, String... mods) {
super(new LaplaceDistribution(mu, beta), mods);
super(LaplaceDistribution.of(mu, beta), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -23,6 +23,6 @@ import org.apache.commons.statistics.distribution.LevyDistribution;
@ThreadSafeMapper
@Categories({Category.distributions})
public class Levy extends LongToDoubleContinuousCurve { public Levy(double mu, double c, String... mods) { super(new LevyDistribution(mu,c), mods);
public class Levy extends LongToDoubleContinuousCurve { public Levy(double mu, double c, String... mods) { super(LevyDistribution.of(mu,c), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.LogNormalDistribution;
@Categories({Category.distributions})
public class LogNormal extends LongToDoubleContinuousCurve {
public LogNormal(double scale, double shape, String... mods) {
super(new LogNormalDistribution(scale, shape), mods);
super(LogNormalDistribution.of(scale, shape), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.LogisticDistribution;
@Categories({Category.distributions})
public class Logistic extends LongToDoubleContinuousCurve {
public Logistic(double mu, double scale, String... mods) {
super(new LogisticDistribution(mu, scale), mods);
super(LogisticDistribution.of(mu, scale), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.NakagamiDistribution;
@Categories({Category.distributions})
public class Nakagami extends LongToDoubleContinuousCurve {
public Nakagami(double mu, double omega, String... mods) {
super(new NakagamiDistribution(mu, omega), mods);
super(NakagamiDistribution.of(mu, omega), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.NormalDistribution;
@Categories({Category.distributions})
public class Normal extends LongToDoubleContinuousCurve {
public Normal(double mean, double sd, String... mods) {
super(new NormalDistribution(mean, sd), mods);
super(NormalDistribution.of(mean, sd), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.ParetoDistribution;
@Categories({Category.distributions})
public class Pareto extends LongToDoubleContinuousCurve {
public Pareto(double scale, double shape, String... mods) {
super(new ParetoDistribution(scale, shape), mods);
super(ParetoDistribution.of(scale, shape), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.TDistribution;
@Categories({Category.distributions})
public class T extends LongToDoubleContinuousCurve {
public T(double degreesOfFreedom, String... mods) {
super(new TDistribution(degreesOfFreedom), mods);
super(TDistribution.of(degreesOfFreedom), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.TriangularDistribution;
@Categories({Category.distributions})
public class Triangular extends LongToDoubleContinuousCurve {
public Triangular(double a, double c, double b, String... mods) {
super(new TriangularDistribution(a,c,b), mods);
super(TriangularDistribution.of(a,c,b), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.UniformContinuousDistribution;
@Categories({Category.distributions})
public class Uniform extends LongToDoubleContinuousCurve {
public Uniform(double lower, double upper, String... mods) {
super(new UniformContinuousDistribution(lower, upper), mods);
super(UniformContinuousDistribution.of(lower, upper), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.WeibullDistribution;
@Categories({Category.distributions})
public class Weibull extends LongToDoubleContinuousCurve {
public Weibull(double alpha, double beta, String... mods) {
super(new WeibullDistribution(alpha, beta), mods);
super(WeibullDistribution.of(alpha, beta), mods);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.BinomialDistribution;
@Categories({Category.distributions})
public class Binomial extends IntToIntDiscreteCurve {
public Binomial(int trials, double p, String... modslist) {
super(new BinomialDistribution(trials, p), modslist);
super(BinomialDistribution.of(trials, p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.GeometricDistribution;
@Categories({Category.distributions})
public class Geometric extends IntToIntDiscreteCurve {
public Geometric(double p, String... modslist) {
super(new GeometricDistribution(p), modslist);
super(GeometricDistribution.of(p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.HypergeometricDistribution;
@Categories({Category.distributions})
public class Hypergeometric extends IntToIntDiscreteCurve {
public Hypergeometric(int populationSize, int numberOfSuccesses, int sampleSize, String... modslist) {
super(new HypergeometricDistribution(populationSize, numberOfSuccesses, sampleSize), modslist);
super(HypergeometricDistribution.of(populationSize, numberOfSuccesses, sampleSize), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.PascalDistribution;
@Categories({Category.distributions})
public class Pascal extends IntToIntDiscreteCurve {
public Pascal(int r, double p, String... modslist) {
super(new PascalDistribution(r, p), modslist);
super(PascalDistribution.of(r, p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.PoissonDistribution;
@Categories({Category.distributions})
public class Poisson extends IntToIntDiscreteCurve {
public Poisson(double p, String... modslist) {
super(new PoissonDistribution(p), modslist);
super(PoissonDistribution.of(p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.UniformDiscreteDistribution;
@Categories({Category.distributions})
public class Uniform extends IntToIntDiscreteCurve {
public Uniform(int lower, int upper, String... modslist) {
super(new UniformDiscreteDistribution(lower, upper), modslist);
super(UniformDiscreteDistribution.of(lower, upper), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,6 +32,6 @@ import org.apache.commons.statistics.distribution.ZipfDistribution;
@Categories({Category.distributions})
public class Zipf extends IntToIntDiscreteCurve {
public Zipf(int numberOfElements, double exponent, String... modslist) {
super(new ZipfDistribution(numberOfElements, exponent), modslist);
super(ZipfDistribution.of(numberOfElements, exponent), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.BinomialDistribution;
@ThreadSafeMapper
public class Binomial extends IntToLongDiscreteCurve {
public Binomial(int trials, double p, String... modslist) {
super(new BinomialDistribution(trials, p), modslist);
super(BinomialDistribution.of(trials, p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.GeometricDistribution;
@Categories({Category.distributions})
public class Geometric extends IntToLongDiscreteCurve {
public Geometric(double p, String... modslist) {
super(new GeometricDistribution(p), modslist);
super(GeometricDistribution.of(p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.HypergeometricDistribution;
@Categories({Category.distributions})
public class Hypergeometric extends IntToLongDiscreteCurve {
public Hypergeometric(int populationSize, int numberOfSuccesses, int sampleSize, String... modslist) {
super(new HypergeometricDistribution(populationSize, numberOfSuccesses, sampleSize), modslist);
super(HypergeometricDistribution.of(populationSize, numberOfSuccesses, sampleSize), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.PascalDistribution;
@Categories({Category.distributions})
public class Pascal extends IntToLongDiscreteCurve {
public Pascal(int r, double p, String... modslist) {
super(new PascalDistribution(r, p), modslist);
super(PascalDistribution.of(r, p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.PoissonDistribution;
@Categories({Category.distributions})
public class Poisson extends IntToLongDiscreteCurve {
public Poisson(double p, String... modslist) {
super(new PoissonDistribution(p), modslist);
super(PoissonDistribution.of(p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.UniformDiscreteDistribution;
@Categories({Category.distributions})
public class Uniform extends IntToLongDiscreteCurve {
public Uniform(int lower, int upper, String... modslist) {
super(new UniformDiscreteDistribution(lower, upper), modslist);
super(UniformDiscreteDistribution.of(lower, upper), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.ZipfDistribution;
@Categories({Category.distributions})
public class Zipf extends IntToLongDiscreteCurve {
public Zipf(int numberOfElements, double exponent, String... modslist) {
super(new ZipfDistribution(numberOfElements, exponent), modslist);
super(ZipfDistribution.of(numberOfElements, exponent), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.BinomialDistribution;
@Categories({Category.distributions})
public class Binomial extends LongToIntDiscreteCurve {
public Binomial(int trials, double p, String... modslist) {
super(new BinomialDistribution(trials, p), modslist);
super(BinomialDistribution.of(trials, p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.GeometricDistribution;
@Categories({Category.distributions})
public class Geometric extends LongToIntDiscreteCurve {
public Geometric(double p, String... modslist) {
super(new GeometricDistribution(p), modslist);
super(GeometricDistribution.of(p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.HypergeometricDistribution;
@Categories({Category.distributions})
public class Hypergeometric extends LongToIntDiscreteCurve {
public Hypergeometric(int populationSize, int numberOfSuccesses, int sampleSize, String... modslist) {
super(new HypergeometricDistribution(populationSize, numberOfSuccesses, sampleSize), modslist);
super(HypergeometricDistribution.of(populationSize, numberOfSuccesses, sampleSize), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.PascalDistribution;
@Categories({Category.distributions})
public class Pascal extends LongToIntDiscreteCurve {
public Pascal(int r, double p, String... modslist) {
super(new PascalDistribution(r, p), modslist);
super(PascalDistribution.of(r, p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.PoissonDistribution;
@Categories({Category.distributions})
public class Poisson extends LongToIntDiscreteCurve {
public Poisson(double p, String... modslist) {
super(new PoissonDistribution(p), modslist);
super(PoissonDistribution.of(p), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.UniformDiscreteDistribution;
@Categories({Category.distributions})
public class Uniform extends LongToIntDiscreteCurve {
public Uniform(int lower, int upper, String... modslist) {
super(new UniformDiscreteDistribution(lower, upper), modslist);
super(UniformDiscreteDistribution.of(lower, upper), modslist);
}
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,6 +25,6 @@ import org.apache.commons.statistics.distribution.ZipfDistribution;
@Categories({Category.distributions})
public class Zipf extends LongToIntDiscreteCurve {
public Zipf(int numberOfElements, double exponent, String... modslist) {
super(new ZipfDistribution(numberOfElements, exponent), modslist);
super(ZipfDistribution.of(numberOfElements, exponent), modslist);
}
}

Some files were not shown because too many files have changed in this diff Show More