Merge pull request #646 from jenetics/issues/JENETICS-645-deprecate_b…

…ean_getter #645: Deprecate bean getter
jenetics · Jan 23, 2020 · a87292b · a87292b
2 parents 412a017 + b3abfd0
commit a87292b
Show file tree

Hide file tree

Showing 197 changed files with 1,494 additions and 777 deletions.
diff --git a/jenetics.doc/src/main/java/DTLZ1.java b/jenetics.doc/src/main/java/DTLZ1.java
@@ -65,7 +65,7 @@ public static void main(final String[] args) {
 		final ISeq<Vec<double[]>> front = ENGINE.stream()
 			.limit(2500)
 			.collect(MOEA.toParetoSet(IntRange.of(1000, 1100)))
-			.map(Phenotype::getFitness);
+			.map(Phenotype::fitness);
 	}
 
 }
diff --git a/jenetics.doc/src/main/java/DTLZ1Diagram.java b/jenetics.doc/src/main/java/DTLZ1Diagram.java
@@ -48,7 +48,7 @@ public static void main(final String[] args) throws IOException {
 		final ISeq<Vec<double[]>> front = DTLZ1.ENGINE.stream()
 			.limit(3500)
 			.collect(MOEA.toParetoSet(IntRange.of(1000, 1100)))
-			.map(Phenotype::getFitness);
+			.map(Phenotype::fitness);
 
 		System.out.println(front.size());
 

diff --git a/jenetics.doc/src/main/java/SymbolicRegression.java b/jenetics.doc/src/main/java/SymbolicRegression.java
@@ -77,13 +77,13 @@ public static void main(final String[] args) {
 				.limit(Limits.byFitnessThreshold(0.01))
 				.collect(EvolutionResult.toBestEvolutionResult());
 
-		final ProgramGene<Double> program = er.getBestPhenotype()
-			.getGenotype()
+		final ProgramGene<Double> program = er.bestPhenotype()
+			.genotype()
 			.gene();
 
 		final TreeNode<Op<Double>> tree = program.toTreeNode();
 		MathExpr.rewrite(tree);
-		System.out.println("G: " + er.getTotalGenerations());
+		System.out.println("G: " + er.totalGenerations());
 		System.out.println("F: " + new MathExpr(tree));
 		System.out.println("E: " + REGRESSION.error(tree));
 	}

diff --git a/jenetics.doc/src/main/java/TravelingSalesman.java b/jenetics.doc/src/main/java/TravelingSalesman.java
@@ -112,7 +112,7 @@ public static void main(String[] args) {
 
 		out.println(statistics);
 		out.println("Known min path length: " + minPathLength);
-		out.println("Found min path length: " + best.getFitness());
+		out.println("Found min path length: " + best.fitness());
 	}
 
 }
diff --git a/jenetics.example/src/main/java/io/jenetics/example/DynamicGenotype.java b/jenetics.example/src/main/java/io/jenetics/example/DynamicGenotype.java
@@ -87,7 +87,7 @@ public AltererResult<G, C> alter(
 			indexes(RandomRegistry.getRandom(), pop.size(), p).forEach(i -> {
 				final Phenotype<G, C> pt = pop.get(i);
 
-				final Genotype<G> gt = pt.getGenotype();
+				final Genotype<G> gt = pt.genotype();
 				final Genotype<G> mgt = mutate(gt, p, alterations);
 
 				final Phenotype<G, C> mpt = Phenotype.of(mgt, generation);
@@ -151,7 +151,7 @@ public static void main(final String[] args) {
 			.limit(20)
 			.collect(EvolutionResult.toBestEvolutionResult());
 
-		System.out.println(result.getBestFitness());
+		System.out.println(result.bestFitness());
 	}
 
 }
diff --git a/jenetics.example/src/main/java/io/jenetics/example/EvolutionResume.java b/jenetics.example/src/main/java/io/jenetics/example/EvolutionResume.java
@@ -101,7 +101,7 @@ public static void main(final String[] args)
 		System.out.println("Writing evolution result.");
 		IO.object.write(future.get(), resultPath);
 
-		System.out.println("Best fitness: " + future.get().getBestFitness());
+		System.out.println("Best fitness: " + future.get().bestFitness());
 	}
 }
 

diff --git a/jenetics.example/src/main/java/io/jenetics/example/FitnessDiversity.java b/jenetics.example/src/main/java/io/jenetics/example/FitnessDiversity.java
@@ -74,8 +74,8 @@ public static void main(final String[] args) {
 			.limit(bySteadyFitness(50))
 			.collect(toBestEvolutionResult());
 
-		System.out.println(best.getTotalGenerations());
-		System.out.println(best.getBestPhenotype());
+		System.out.println(best.totalGenerations());
+		System.out.println(best.bestPhenotype());
 	}
 
 }
diff --git a/jenetics.example/src/main/java/io/jenetics/example/Game.java b/jenetics.example/src/main/java/io/jenetics/example/Game.java
@@ -77,7 +77,7 @@ public static void main(final String[] args) {
 			final Player other;
 			if (pop != null) {
 				final int index = RandomRegistry.getRandom().nextInt(pop.size());
-				other = codec.decode(pop.get(index).getGenotype());
+				other = codec.decode(pop.get(index).genotype());
 			} else {
 				other = Player.of(0.5);
 			}
@@ -92,7 +92,7 @@ public static void main(final String[] args) {
 		final Player best = codec.decode(
 			engine.stream()
 				.limit(Limits.bySteadyFitness(50))
-				.peek(er -> population.set(er.getPopulation()))
+				.peek(er -> population.set(er.population()))
 				.collect(EvolutionResult.toBestGenotype())
 		);
 

diff --git a/jenetics.example/src/main/java/io/jenetics/example/LastMonday.java b/jenetics.example/src/main/java/io/jenetics/example/LastMonday.java
@@ -44,7 +44,7 @@ public class LastMonday {
 	// The used Codec.
 	private static final Codec<LocalDate, AnyGene<LocalDate>> CODEC = Codec.of(
 		Genotype.of(AnyChromosome.of(LastMonday::nextRandomMonday)),
-		gt -> gt.gene().getAllele()
+		gt -> gt.gene().allele()
 	);
 
 	// Supplier of random 'LocalDate' objects. The implementation is responsible

diff --git a/jenetics.example/src/main/java/io/jenetics/example/MultiRootGP.java b/jenetics.example/src/main/java/io/jenetics/example/MultiRootGP.java
@@ -67,14 +67,14 @@ public class MultiRootGP {
 				// First 'program'
 				ProgramChromosome.of(
 					5,
-					ch -> ch.getRoot().size() <= 50,
+					ch -> ch.root().size() <= 50,
 					OPERATIONS,
 					TERMINALS
 				),
 				// Second 'program'
 				ProgramChromosome.of(
 					5,
-					ch -> ch.getRoot().size() <= 50,
+					ch -> ch.root().size() <= 50,
 					OPERATIONS,
 					TERMINALS
 				)

diff --git a/jenetics.example/src/main/java/io/jenetics/example/OnesCounting.java b/jenetics.example/src/main/java/io/jenetics/example/OnesCounting.java
@@ -55,7 +55,7 @@ public OnesCounting(final int length, final double onesProbability) {
 
 	@Override
 	public Function<ISeq<BitGene>, Integer> fitness() {
-		return genes -> (int)genes.stream().filter(BitGene::getBit).count();
+		return genes -> (int)genes.stream().filter(BitGene::bit).count();
 	}
 
 	@Override

diff --git a/jenetics.example/src/main/java/io/jenetics/example/RectFill.java b/jenetics.example/src/main/java/io/jenetics/example/RectFill.java
@@ -95,7 +95,7 @@ public Codec<ISeq<Rect>, AnyGene<Rect>> codec() {
 				MAX_RECT_COUNT
 			)),
 			gt -> gt.chromosome().stream()
-						.map(AnyGene::getAllele)
+						.map(AnyGene::allele)
 						.filter(r -> r != Rect.EMPTY)
 						.collect(ISeq.toISeq())
 		);

diff --git a/jenetics.example/src/main/java/io/jenetics/example/RepairingConstraint.java b/jenetics.example/src/main/java/io/jenetics/example/RepairingConstraint.java
@@ -40,7 +40,7 @@ public class RepairingConstraint implements Constraint<DoubleGene, Double> {
 	@Override
 	public boolean test(final Phenotype<DoubleGene, Double> pt) {
 		return isValid(
-			pt.getGenotype().chromosome()
+			pt.genotype().chromosome()
 				.as(DoubleChromosome.class)
 				.toArray()
 		);
@@ -55,7 +55,7 @@ public Phenotype<DoubleGene, Double> repair(
 		final Phenotype<DoubleGene, Double> pt,
 		final long generation
 	) {
-		final double[] x = pt.getGenotype().chromosome()
+		final double[] x = pt.genotype().chromosome()
 			.as(DoubleChromosome.class)
 			.toArray();
 

diff --git a/jenetics.example/src/main/java/io/jenetics/example/ReproducibleGA.java b/jenetics.example/src/main/java/io/jenetics/example/ReproducibleGA.java
@@ -66,7 +66,7 @@ public static void main(final String[] args) {
 					.collect(EvolutionResult.toBestEvolutionResult())
 			);
 
-		System.out.println(result.getBestPhenotype());
+		System.out.println(result.bestPhenotype());
 	}
 
 }
diff --git a/jenetics.example/src/main/java/io/jenetics/example/RxEvaluator.java b/jenetics.example/src/main/java/io/jenetics/example/RxEvaluator.java
@@ -67,7 +67,7 @@ public ISeq<Phenotype<G, C>> eval(final Seq<Phenotype<G, C>> population) {
 				.map(Observable::just),
 			population.stream()
 				.filter(Phenotype::nonEvaluated)
-				.map(pt -> _fitness.apply(pt.getGenotype())
+				.map(pt -> _fitness.apply(pt.genotype())
 								.map(pt::withFitness))
 		);
 
@@ -88,7 +88,7 @@ public static void main(final String[] args) {
 			.limit(100)
 			.collect(EvolutionResult.toBestEvolutionResult());
 
-		System.out.println(result.getBestPhenotype());
+		System.out.println(result.bestPhenotype());
 	}
 
 	private static Observable<Double> fitness(final Genotype<DoubleGene> gt) {

diff --git a/jenetics.example/src/main/java/io/jenetics/example/Sorting.java b/jenetics.example/src/main/java/io/jenetics/example/Sorting.java
@@ -39,8 +39,8 @@
 public class Sorting {
 
 	private static int dist(Chromosome<EnumGene<Integer>> path, int i, int j) {
-		return (path.get(i).getAllele() - path.get(j).getAllele())*
-			(path.get(i).getAllele() - path.get(j).getAllele());
+		return (path.get(i).allele() - path.get(j).allele())*
+			(path.get(i).allele() - path.get(j).allele());
 	}
 
 	private static int length(final Genotype<EnumGene<Integer>> genotype) {
@@ -76,7 +76,7 @@ public static void main(final String[] args) {
 			.collect(EvolutionResult.toBestEvolutionResult());
 
 		System.out.println(statistics);
-		System.out.println(result.getBestPhenotype());
+		System.out.println(result.bestPhenotype());
 	}
 
 }
diff --git a/jenetics.example/src/main/java/io/jenetics/example/SymbolicRegression.java b/jenetics.example/src/main/java/io/jenetics/example/SymbolicRegression.java
@@ -105,13 +105,13 @@ public static void main(final String[] args) {
 			.limit(Limits.byFitnessThreshold(0.01))
 			.collect(EvolutionResult.toBestEvolutionResult());
 
-		final ProgramGene<Double> program = result.getBestPhenotype()
-			.getGenotype()
+		final ProgramGene<Double> program = result.bestPhenotype()
+			.genotype()
 			.gene();
 
 		final TreeNode<Op<Double>> tree = program.toTreeNode();
 		MathExpr.rewrite(tree);
-		System.out.println("Generations: " + result.getTotalGenerations());
+		System.out.println("Generations: " + result.totalGenerations());
 		System.out.println("Function:    " + new MathExpr(tree));
 		System.out.println("Error:       " + REGRESSION.error(tree));
 

diff --git a/jenetics.example/src/main/java/io/jenetics/example/TravelingSalesman.java b/jenetics.example/src/main/java/io/jenetics/example/TravelingSalesman.java
@@ -102,9 +102,9 @@ public static void main(String[] args) throws IOException {
 			.peek(statistics)
 			.collect(toBestPhenotype());
 
-		final ISeq<WayPoint> path = best.getGenotype()
+		final ISeq<WayPoint> path = best.genotype()
 			.chromosome().stream()
-			.map(Gene::getAllele)
+			.map(Gene::allele)
 			.collect(ISeq.toISeq());
 
 		final GPX gpx = GPX.builder()
@@ -113,7 +113,7 @@ public static void main(String[] args) throws IOException {
 				.addSegment(s -> s.points(path.asList())))
 			.build();
 
-		final double km = tsm.fitness(best.getGenotype())/1_000.0;
+		final double km = tsm.fitness(best.genotype())/1_000.0;
 		GPX.writer("    ")
 			.write(gpx, format("%s/out_%d.gpx", getProperty("user.home"), (int)km));
 

diff --git a/jenetics.example/src/main/java/io/jenetics/example/image/EvolutionResultPanel.java b/jenetics.example/src/main/java/io/jenetics/example/image/EvolutionResultPanel.java
@@ -47,16 +47,16 @@ public EvolutionResultPanel() {
 	}
 
 	void update(final EvolutionResult<?, Double> result) {
-		final String generation = Long.toString(result.getGeneration());
-		final String bestFitness = _format.format(result.getBestFitness());
-		final double age = result.getPopulation().stream()
-			.collect(averagingLong(p -> p.getAge(result.getGeneration())));
+		final String generation = Long.toString(result.generation());
+		final String bestFitness = _format.format(result.bestFitness());
+		final double age = result.population().stream()
+			.collect(averagingLong(p -> p.age(result.generation())));
 
 		_generationTextField.setText(generation);
 		_bestFitnessTextField.setText(bestFitness);
 		_populationAgeTextField.setText(_format.format(age));
 		_evaluationTimeTextField.setText(format(
-			result.getDurations().getEvaluationDuration()
+			result.durations().evaluationDuration()
 		));
 	}
 

diff --git a/jenetics.example/src/main/java/io/jenetics/example/image/EvolvingImages.java b/jenetics.example/src/main/java/io/jenetics/example/image/EvolvingImages.java
@@ -428,8 +428,8 @@ private void onNewResult(
 	) {
 		invokeLater(() -> {
 			final Genotype<PolygonGene> gt = best
-				.getBestPhenotype()
-				.getGenotype();
+				.bestPhenotype()
+				.genotype();
 
 			bestEvolutionResultPanel.update(best);
 			currentevolutionResultPanel.update(current);

diff --git a/jenetics.example/src/main/java/io/jenetics/example/image/EvolvingImagesCmd.java b/jenetics.example/src/main/java/io/jenetics/example/image/EvolvingImagesCmd.java
@@ -195,7 +195,7 @@ private static void evolve(
 		final AtomicLong time = new AtomicLong(0);
 
 		worker.start((current, best) -> {
-			final long generation = current.getGeneration();
+			final long generation = current.generation();
 
 			if (generation%generationGap == 0 || generation == 1) {
 				final double duration = System.currentTimeMillis() - time.get();
@@ -207,22 +207,22 @@ private static void evolve(
 					format(IMAGE_PATTERN, generation)
 				);
 
-				final Phenotype<PolygonGene, Double> pt = best.getBestPhenotype();
+				final Phenotype<PolygonGene, Double> pt = best.bestPhenotype();
 				if (latest.get() == null || latest.get().compareTo(pt) < 0) {
 					log(
 						"Writing '%s': fitness=%1.4f, speed=%1.2f.",
-						file, pt.getFitness(), speed
+						file, pt.fitness(), speed
 					);
 
 					latest.set(pt);
 					final PolygonChromosome ch =
-						(PolygonChromosome)pt.getGenotype().chromosome();
+						(PolygonChromosome)pt.genotype().chromosome();
 
 					writeImage(file, ch, image.getWidth(), image.getHeight());
 				} else {
 					log(
 						"No improvement - %07d: fitness=%1.4f, speed=%1.2f.",
-						generation, pt.getFitness(), speed
+						generation, pt.fitness(), speed
 					);
 				}
 			}

diff --git a/jenetics.example/src/main/java/io/jenetics/example/image/PolygonChromosome.java b/jenetics.example/src/main/java/io/jenetics/example/image/PolygonChromosome.java
@@ -48,7 +48,7 @@ public Chromosome<PolygonGene> newInstance(final ISeq<PolygonGene> genes) {
 
 	@Override
 	public Chromosome<PolygonGene> newInstance() {
-		return new PolygonChromosome(length(), gene().getAllele().length());
+		return new PolygonChromosome(length(), gene().allele().length());
 	}
 
 	public void draw(final Graphics2D g, final int width, final int height) {
@@ -59,7 +59,7 @@ public void draw(final Graphics2D g, final int width, final int height) {
 		g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
 
 		for (PolygonGene gene : this) {
-			gene.getAllele().draw(g, width, height);
+			gene.allele().draw(g, width, height);
 		}
 	}
 

diff --git a/jenetics.example/src/main/java/io/jenetics/example/image/PolygonGene.java b/jenetics.example/src/main/java/io/jenetics/example/image/PolygonGene.java
@@ -37,6 +37,7 @@ private PolygonGene(final Polygon polygon) {
 		_polygon = requireNonNull(polygon);
 	}
 
+	@Deprecated
 	@Override
 	public Polygon getAllele() {
 		return _polygon;
@@ -59,7 +60,7 @@ public PolygonGene newInstance(final Polygon polygon) {
 
 	@Override
 	public PolygonGene mean(final PolygonGene other) {
-		return of(getAllele().mean(other.getAllele()));
+		return of(allele().mean(other.allele()));
 	}
 
 	static ISeq<PolygonGene> seq(final int polygonCount, final int polygonLength) {

diff --git a/jenetics.example/src/main/java/io/jenetics/example/image/PolygonMutator.java b/jenetics.example/src/main/java/io/jenetics/example/image/PolygonMutator.java
@@ -54,7 +54,7 @@ protected MutatorResult<Chromosome<PolygonGene>> mutate(
 	}
 
 	private PolygonGene mutate(final PolygonGene gene) {
-		return gene.newInstance(gene.getAllele().mutate(_rate, _magnitude));
+		return gene.newInstance(gene.allele().mutate(_rate, _magnitude));
 	}
 
 }
diff --git a/jenetics.ext/src/main/java/io/jenetics/ext/AbstractTreeGene.java b/jenetics.ext/src/main/java/io/jenetics/ext/AbstractTreeGene.java
@@ -91,13 +91,14 @@ public ISeq<G> flattenedNodes() {
 	}
 
 	@Override
+	@Deprecated
 	public G getRoot() {
 		return _genes.get(0);
 	}
 
 	@Override
 	public boolean isRoot() {
-		return getRoot() == this;
+		return root() == this;
 	}
 
 	@Override
@@ -128,6 +129,7 @@ public int childOffset() {
 		return _childOffset;
 	}
 
+	@Deprecated
 	@Override
 	public A getAllele() {
 		return _allele;
@@ -141,6 +143,7 @@ public A getAllele() {
 	 * @throws IllegalStateException if this gene is not part of a chromosome
 	 */
 	@Override
+	@Deprecated
 	public Optional<G> getParent() {
 		checkTreeState();