You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2021/08/04 07:37:44 UTC
[commons-rng] branch master updated: Use diamond operator
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git
The following commit(s) were added to refs/heads/master by this push:
new 76afdc1 Use diamond operator
76afdc1 is described below
commit 76afdc1a5e33be213e0de69f9ab81cf35d5fcc12
Author: Alex Herbert <ah...@apache.org>
AuthorDate: Wed Aug 4 08:37:42 2021 +0100
Use diamond operator
---
.../commons/rng/sampling/CollectionSampler.java | 2 +-
.../commons/rng/sampling/CompositeSamplers.java | 24 +++++++++++-----------
.../DiscreteProbabilityCollectionSampler.java | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/CollectionSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/CollectionSampler.java
index b8ce38d..44bfee7 100644
--- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/CollectionSampler.java
+++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/CollectionSampler.java
@@ -85,6 +85,6 @@ public class CollectionSampler<T> implements SharedStateObjectSampler<T> {
*/
@Override
public CollectionSampler<T> withUniformRandomProvider(UniformRandomProvider rng) {
- return new CollectionSampler<T>(rng, this);
+ return new CollectionSampler<>(rng, this);
}
}
diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/CompositeSamplers.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/CompositeSamplers.java
index 9caed97..7de1acf 100644
--- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/CompositeSamplers.java
+++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/CompositeSamplers.java
@@ -369,7 +369,7 @@ public final class CompositeSamplers {
public Builder<S> add(S sampler, double weight) {
// Ignore zero weights. The sampler and weight are validated by the WeightedSampler.
if (weight != 0) {
- weightedSamplers.add(new WeightedSampler<S>(weight, sampler));
+ weightedSamplers.add(new WeightedSampler<>(weight, sampler));
}
return this;
}
@@ -612,7 +612,7 @@ public final class CompositeSamplers {
@Override
public ObjectSampler<T> createSampler(DiscreteSampler discreteSampler,
List<ObjectSampler<T>> samplers) {
- return new CompositeObjectSampler<T>(discreteSampler, samplers);
+ return new CompositeObjectSampler<>(discreteSampler, samplers);
}
/**
@@ -665,7 +665,7 @@ public final class CompositeSamplers {
public SharedStateObjectSampler<T> createSampler(DiscreteSampler discreteSampler,
List<SharedStateObjectSampler<T>> samplers) {
// The input discrete sampler is assumed to be a SharedStateDiscreteSampler
- return new CompositeSharedStateObjectSampler<T>(
+ return new CompositeSharedStateObjectSampler<>(
(SharedStateDiscreteSampler) discreteSampler, samplers);
}
@@ -697,7 +697,7 @@ public final class CompositeSamplers {
@Override
public CompositeSharedStateObjectSampler<T> withUniformRandomProvider(UniformRandomProvider rng) {
// Duplicate each sampler with the same source of randomness
- return new CompositeSharedStateObjectSampler<T>(
+ return new CompositeSharedStateObjectSampler<>(
((SharedStateDiscreteSampler) this.discreteSampler).withUniformRandomProvider(rng),
copy(samplers, rng));
}
@@ -969,7 +969,7 @@ public final class CompositeSamplers {
*/
public static <T> Builder<ObjectSampler<T>> newObjectSamplerBuilder() {
final SamplerBuilder.SamplerFactory<ObjectSampler<T>> factory = ObjectSamplerFactory.instance();
- return new SamplerBuilder<ObjectSampler<T>>(
+ return new SamplerBuilder<>(
SamplerBuilder.Specialisation.NONE, factory);
}
@@ -990,7 +990,7 @@ public final class CompositeSamplers {
public static <T> Builder<SharedStateObjectSampler<T>> newSharedStateObjectSamplerBuilder() {
final SamplerBuilder.SamplerFactory<SharedStateObjectSampler<T>> factory =
SharedStateObjectSamplerFactory.instance();
- return new SamplerBuilder<SharedStateObjectSampler<T>>(
+ return new SamplerBuilder<>(
SamplerBuilder.Specialisation.SHARED_STATE_SAMPLER, factory);
}
@@ -1000,7 +1000,7 @@ public final class CompositeSamplers {
* @return the builder
*/
public static Builder<DiscreteSampler> newDiscreteSamplerBuilder() {
- return new SamplerBuilder<DiscreteSampler>(
+ return new SamplerBuilder<>(
SamplerBuilder.Specialisation.NONE, DiscreteSamplerFactory.INSTANCE);
}
@@ -1010,7 +1010,7 @@ public final class CompositeSamplers {
* @return the builder
*/
public static Builder<SharedStateDiscreteSampler> newSharedStateDiscreteSamplerBuilder() {
- return new SamplerBuilder<SharedStateDiscreteSampler>(
+ return new SamplerBuilder<>(
SamplerBuilder.Specialisation.SHARED_STATE_SAMPLER, SharedStateDiscreteSamplerFactory.INSTANCE);
}
@@ -1020,7 +1020,7 @@ public final class CompositeSamplers {
* @return the builder
*/
public static Builder<ContinuousSampler> newContinuousSamplerBuilder() {
- return new SamplerBuilder<ContinuousSampler>(
+ return new SamplerBuilder<>(
SamplerBuilder.Specialisation.NONE, ContinuousSamplerFactory.INSTANCE);
}
@@ -1030,7 +1030,7 @@ public final class CompositeSamplers {
* @return the builder
*/
public static Builder<SharedStateContinuousSampler> newSharedStateContinuousSamplerBuilder() {
- return new SamplerBuilder<SharedStateContinuousSampler>(
+ return new SamplerBuilder<>(
SamplerBuilder.Specialisation.SHARED_STATE_SAMPLER, SharedStateContinuousSamplerFactory.INSTANCE);
}
@@ -1040,7 +1040,7 @@ public final class CompositeSamplers {
* @return the builder
*/
public static Builder<LongSampler> newLongSamplerBuilder() {
- return new SamplerBuilder<LongSampler>(
+ return new SamplerBuilder<>(
SamplerBuilder.Specialisation.NONE, LongSamplerFactory.INSTANCE);
}
@@ -1050,7 +1050,7 @@ public final class CompositeSamplers {
* @return the builder
*/
public static Builder<SharedStateLongSampler> newSharedStateLongSamplerBuilder() {
- return new SamplerBuilder<SharedStateLongSampler>(
+ return new SamplerBuilder<>(
SamplerBuilder.Specialisation.SHARED_STATE_SAMPLER, SharedStateLongSamplerFactory.INSTANCE);
}
diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/DiscreteProbabilityCollectionSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/DiscreteProbabilityCollectionSampler.java
index 43abcb3..ae2247d 100644
--- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/DiscreteProbabilityCollectionSampler.java
+++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/DiscreteProbabilityCollectionSampler.java
@@ -142,7 +142,7 @@ public class DiscreteProbabilityCollectionSampler<T> implements SharedStateObjec
*/
@Override
public DiscreteProbabilityCollectionSampler<T> withUniformRandomProvider(UniformRandomProvider rng) {
- return new DiscreteProbabilityCollectionSampler<T>(rng, this);
+ return new DiscreteProbabilityCollectionSampler<>(rng, this);
}
/**