Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MATH-1599: Class removed (out-of-scope).

This commit is contained in:
Gilles Sadowski 2021-06-03 19:29:40 +02:00
parent 076fe24409
commit 8f39a414c1
2 changed files with 0 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/random/SynchronizedRandomGenerator.java
View File

@ -1,134 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.commons.math4.legacy.random;
/**
* Any {@link RandomGenerator} implementation can be thread-safe if it
* is used through an instance of this class.
* This is achieved by enclosing calls to the methods of the actual
* generator inside the overridden {@code synchronized} methods of this
* class.
*
* @since 3.1
* @deprecated As of 4.0. No replacement.
*/
@Deprecated
public class SynchronizedRandomGenerator implements RandomGenerator {
/** Object to which all calls will be delegated. */
private final RandomGenerator wrapped;
/**
* Creates a synchronized wrapper for the given {@code RandomGenerator}
* instance.
*
* @param rng Generator whose methods will be called through
* their corresponding overridden synchronized version.
* To ensure thread-safety, the wrapped generator <em>must</em>
* not be used directly.
*/
public SynchronizedRandomGenerator(RandomGenerator rng) {
wrapped = rng;
}
/**
* {@inheritDoc}
*/
@Override
public synchronized void setSeed(int seed) {
wrapped.setSeed(seed);
}
/**
* {@inheritDoc}
*/
@Override
public synchronized void setSeed(int[] seed) {
wrapped.setSeed(seed);
}
/**
* {@inheritDoc}
*/
@Override
public synchronized void setSeed(long seed) {
wrapped.setSeed(seed);
}
/**
* {@inheritDoc}
*/
@Override
public synchronized void nextBytes(byte[] bytes) {
wrapped.nextBytes(bytes);
}
/**
* {@inheritDoc}
*/
@Override
public synchronized int nextInt() {
return wrapped.nextInt();
}
/**
* {@inheritDoc}
*/
@Override
public synchronized int nextInt(int n) {
return wrapped.nextInt(n);
}
/**
* {@inheritDoc}
*/
@Override
public synchronized long nextLong() {
return wrapped.nextLong();
}
/**
* {@inheritDoc}
*/
@Override
public synchronized boolean nextBoolean() {
return wrapped.nextBoolean();
}
/**
* {@inheritDoc}
*/
@Override
public synchronized float nextFloat() {
return wrapped.nextFloat();
}
/**
* {@inheritDoc}
*/
@Override
public synchronized double nextDouble() {
return wrapped.nextDouble();
}
/**
* {@inheritDoc}
*/
@Override
public synchronized double nextGaussian() {
return wrapped.nextGaussian();
}
}

120
commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/random/SynchronizedRandomGeneratorTest.java
View File

@ -1,120 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.commons.math4.legacy.random;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.apache.commons.rng.simple.RandomSource;
import org.junit.Assert;
import org.junit.Test;
public class SynchronizedRandomGeneratorTest {
private final int numberOfThreads = 5;
private final int numberOfGenerators = 5;
private final int numberOfSamples = 100000;
@Test
public void testAdapter() {
final int seed = 12345;
final RandomGenerator orig = new RngAdaptor(RandomSource.MT, seed);
final RandomGenerator wrap
= new SynchronizedRandomGenerator(new RngAdaptor(RandomSource.MT, seed));
final int bSize = 67;
final byte[] bOrig = new byte[bSize];
final byte[] bWrap = new byte[bSize];
for (int i = 0; i < 100; i++) {
orig.nextBytes(bOrig);
wrap.nextBytes(bWrap);
for (int k = 0; k < bSize; k++) {
Assert.assertEquals(bOrig[k], bWrap[k]);
}
Assert.assertEquals(orig.nextInt(), wrap.nextInt());
final int range = (i + 1) * 89;
Assert.assertEquals(orig.nextInt(range), wrap.nextInt(range));
Assert.assertEquals(orig.nextLong(), wrap.nextLong());
Assert.assertEquals(orig.nextBoolean(), wrap.nextBoolean());
Assert.assertEquals(orig.nextFloat(), wrap.nextFloat(), 0);
Assert.assertEquals(orig.nextDouble(), wrap.nextDouble(), 0);
Assert.assertEquals(orig.nextGaussian(), wrap.nextGaussian(), 0);
}
}
@Test
public void testMath899Sync() throws Throwable {
try {
// Running the test several times in order to decrease the
// probability that a non-thread-safe code did not trigger
// a concurrency problem.
for (int i = 0; i < 10; i++) {
doTestMath899(true, numberOfThreads, numberOfGenerators, numberOfSamples);
}
} catch (InterruptedException e) {
Assert.fail(e.getMessage());
} catch (ExecutionException e) {
throw e.getCause();
}
}
/**
* @param sync Whether to use a synchronizing wrapper.
*/
private double[] doTestMath899(final boolean sync,
final int numThreads,
final int numGenerators,
final int numSamples)
throws InterruptedException,
ExecutionException {
final RandomGenerator rng = new RngAdaptor(RandomSource.MT);
final RandomGenerator wrapper = sync ? new SynchronizedRandomGenerator(rng) : rng;
final List<Callable<Double>> tasks = new ArrayList<>();
for (int i = 0; i < numGenerators; i++) {
tasks.add(new Callable<Double>() {
@Override
public Double call() {
Double lastValue = 0d;
for (int j = 0; j < numSamples; j++) {
lastValue = wrapper.nextGaussian();
}
return lastValue;
}
});
}
final ExecutorService exec = Executors.newFixedThreadPool(numThreads);
final List<Future<Double>> results = exec.invokeAll(tasks);
final double[] values = new double[numGenerators];
for (int i = 0; i < numGenerators; i++) {
values[i] = results.get(i).get();
}
exec.shutdown();
return values;
}
}