Skip to content
Snippets Groups Projects
Commit 40f8e38d authored by Bernhard Johannes Berger's avatar Bernhard Johannes Berger
Browse files

Renaming stuff.

parent f1fd284f
No related branches found
No related tags found
No related merge requests found
Pipeline #243898 passed
......@@ -43,41 +43,41 @@ public class AltererFactory {
switch(name) {
//case "CompositeAlterer": return createCompositeAlterer(config);
case "mean_alterer": return createMeanAlterer(config);
case "correlation_mean_alterer": return (Alterer<G, FitnessValue>) createCorrelationMeanAlterer(config);
case "partial_matched_alterer": return createPartiallyMatchedAlterer(config);
case "correlation_partial_matched_alterer": return createCorrelationPartiallyMatchedAlterer(config);
case "gaussian_mutator": return createGaussianMutator(config);
case "correlation_gaussian_mutator": return createGaussianCorrelationMutator(config);
case "swap_mutator": return createSwapMutator(config);
case "correlation_swap_mutator": return createCorrelationSwapMutator(config);
case "bit_flip_mutator": return createBitFlipMutator(config);
case "correlation_bit_flip_mutator": return createCorrelationBitFlipMutator(config);
case "mean-alterer": return createMeanAlterer(config);
case "correlation-mean-alterer": return (Alterer<G, FitnessValue>) createCorrelationMeanAlterer(config);
case "partial-matched-alterer": return createPartiallyMatchedAlterer(config);
case "correlation-partial-matched-alterer": return createCorrelationPartiallyMatchedAlterer(config);
case "gaussian-mutator": return createGaussianMutator(config);
case "correlation-gaussian-mutator": return createGaussianCorrelationMutator(config);
case "swap-mutator": return createSwapMutator(config);
case "correlation-swap-mutator": return createCorrelationSwapMutator(config);
case "bit-flip-mutator": return createBitFlipMutator(config);
case "correlation-bit-flip-mutator": return createCorrelationBitFlipMutator(config);
// case "IntermediateCrossover": return createIntermediateCrossover(config);
case "line_crossover": return createLineCrossover(config);
case "correlation_line_crossover": return createCorrelationLineCrossover(config);
case "multi_point_crossover": return createMultiPointCrossover(config);
case "correlation_multi_point_crossover": return createCorrelationMultiPointCrossover(config);
case "single_point_crossover": return createSinglePointCrossover(config);
case "correlation_single_point_crossover": return createCorrelationSinglePointCrossover(config);
case "uniform_crossover": return createUniformCrossover(config);
case "correlation_uniform_crossover": return createCorrelationUniformCrossover(config);
case "line-crossover": return createLineCrossover(config);
case "correlation-line-crossover": return createCorrelationLineCrossover(config);
case "multi-point-crossover": return createMultiPointCrossover(config);
case "correlation-multi-point-crossover": return createCorrelationMultiPointCrossover(config);
case "single-point-crossover": return createSinglePointCrossover(config);
case "correlation-single-point-crossover": return createCorrelationSinglePointCrossover(config);
case "uniform-crossover": return createUniformCrossover(config);
case "correlation-uniform-crossover": return createCorrelationUniformCrossover(config);
}
throw new IllegalStateException("Selector '" + name + "' is unknown.");
}
private <G extends Gene<?, G>> Alterer<G, FitnessValue> createUniformCrossover(final Instance config) {
final Double crossoverProbability = LanguageHelper.lookup(config, "crossover_probability");
final Double swapProbability = LanguageHelper.lookup(config,"swap_probability");
final Double crossoverProbability = LanguageHelper.lookup(config, "crossover-probability");
final Double swapProbability = LanguageHelper.lookup(config,"swap-probability");
return new UniformCrossover<>(crossoverProbability, swapProbability);
}
private <G extends Gene<?, G>> Alterer<G, FitnessValue> createCorrelationUniformCrossover(final Instance config) {
final Double crossoverProbability = LanguageHelper.lookup(config, "crossover_probability");
final Double swapProbability = LanguageHelper.lookup(config,"swap_probability");
final Double crossoverProbability = LanguageHelper.lookup(config, "crossover-probability");
final Double swapProbability = LanguageHelper.lookup(config,"swap-probability");
return new UniformCorrelationCrossover(crossoverProbability, swapProbability, correlations);
}
......
......@@ -30,14 +30,14 @@ public class SelectorFactory {
private <G extends Gene<?, G>, C extends Comparable<? super C>> Selector<G, C> create(final String name, final Instance config) {
switch(name) {
case "elite_selector": return createEliteSelector(config);
case "monte_carlo_selector": return createMonteCarloSelector(config);
case "exponential_rank_selector": return createExponentialRankSelector(config);
case "linear_rank_selector": return createLinearRankSelector(config);
case "boltzmann_selector": return createBoltzmannSelector(config);
case "stochastic_universal_selector": return createStochasticUniversalSelector(config);
case "tournament_selector": return createTournamentSelector(config);
case "truncation_selector": return createTruncationSelector(config);
case "elite-selector": return createEliteSelector(config);
case "monte-carlo-selector": return createMonteCarloSelector(config);
case "exponential-rank-selector": return createExponentialRankSelector(config);
case "linear-rank-selector": return createLinearRankSelector(config);
case "boltzmann-selector": return createBoltzmannSelector(config);
case "stochastic-universal-selector": return createStochasticUniversalSelector(config);
case "tournament-selector": return createTournamentSelector(config);
case "truncation-selector": return createTruncationSelector(config);
}
throw new IllegalStateException("Selector '" + name + "' is unknown.");
......
......@@ -28,7 +28,7 @@ import java.io.File;
public class TrainingInitialPopulation<G extends Gene<?, G>, C extends Comparable<C>> implements InitialPopulation<G, C> {
@Inject
@ConfigurationValue(entry = BlackboardEntry.OPTIMISATION_CONFIGURATION, access = "algorithm.size_of_population")
@ConfigurationValue(entry = BlackboardEntry.OPTIMISATION_CONFIGURATION, access = "algorithm.size-of-population")
private int sizeOfPopulation;
@Inject
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment