Skip to content

Commit

Permalink
#878: Rename 'ConcurrentEvaluator' to 'ExecutorEvaluator'.
Browse files Browse the repository at this point in the history
Signed-off-by: Franz Wilhelmstötter <franz.wilhelmstoetter@gmail.com>
  • Loading branch information
jenetics committed Aug 5, 2023
1 parent ba36314 commit 9699f85
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions jenetics/src/main/java/io/jenetics/engine/Engine.java
Expand Up @@ -39,7 +39,7 @@
import io.jenetics.Optimize;
import io.jenetics.Phenotype;
import io.jenetics.Selector;
import io.jenetics.internal.concurrent.ConcurrentEvaluator;
import io.jenetics.internal.concurrent.ExecutorEvaluator;
import io.jenetics.util.Copyable;
import io.jenetics.util.Factory;
import io.jenetics.util.ISeq;
Expand Down Expand Up @@ -1039,7 +1039,7 @@ public Engine<G, C> build() {
}

private Evaluator<G, C> __evaluator() {
return _evaluator instanceof ConcurrentEvaluator<G, C> ce
return _evaluator instanceof ExecutorEvaluator<G, C> ce
? ce.with(_executor)
: _evaluator;
}
Expand Down
4 changes: 2 additions & 2 deletions jenetics/src/main/java/io/jenetics/engine/Evaluators.java
Expand Up @@ -26,7 +26,7 @@

import io.jenetics.Gene;
import io.jenetics.Genotype;
import io.jenetics.internal.concurrent.ConcurrentEvaluator;
import io.jenetics.internal.concurrent.ExecutorEvaluator;
import io.jenetics.internal.concurrent.VirtualThreadEvaluator;

/**
Expand Down Expand Up @@ -125,7 +125,7 @@ Evaluator<G, C> concurrent(
final Function<? super Genotype<G>, ? extends C> fitness,
final Executor executor
) {
return new ConcurrentEvaluator<>(fitness, executor);
return new ExecutorEvaluator<>(fitness, executor);
}

/**
Expand Down
Expand Up @@ -43,7 +43,7 @@
* @version 5.0
* @since 4.2
*/
public final class ConcurrentEvaluator<
public final class ExecutorEvaluator<
G extends Gene<?, G>,
C extends Comparable<? super C>
>
Expand All @@ -53,16 +53,16 @@ public final class ConcurrentEvaluator<
private final Function<? super Genotype<G>, ? extends C> _function;
private final Executor _executor;

public ConcurrentEvaluator(
public ExecutorEvaluator(
final Function<? super Genotype<G>, ? extends C> function,
final Executor executor
) {
_function = requireNonNull(function);
_executor = requireNonNull(executor);
}

public ConcurrentEvaluator<G, C> with(final Executor executor) {
return new ConcurrentEvaluator<>(_function, executor);
public ExecutorEvaluator<G, C> with(final Executor executor) {
return new ExecutorEvaluator<>(_function, executor);
}

@Override
Expand Down
Expand Up @@ -32,7 +32,7 @@
/**
* @author <a href="mailto:franz.wilhelmstoetter@gmail.com">Franz Wilhelmstötter</a>
*/
public class ConcurrentEvaluatorTest {
public class ExecutorEvaluatorTest {

@Test
public void evaluateSerial() {
Expand All @@ -45,7 +45,7 @@ public void evaluateSerial() {
phenotypes.forEach(pt -> Assert.assertTrue(pt.nonEvaluated()));

final Evaluator<DoubleGene, Double> evaluator =
new ConcurrentEvaluator<>(gt -> gt.gene().doubleValue(), Runnable::run);
new ExecutorEvaluator<>(gt -> gt.gene().doubleValue(), Runnable::run);

final ISeq<Phenotype<DoubleGene, Double>> evaluated = evaluator.eval(phenotypes);

Expand Down

0 comments on commit 9699f85

Please sign in to comment.