Formatted the lambda expression

avbasak1 · avbasak1 · commit d1a78fa3438d · 2021-09-24T15:55:12.000+05:30
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/chromosome/AbstractChromosomeTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/chromosome/AbstractChromosomeTest.java
@@ -23,45 +23,25 @@ public class AbstractChromosomeTest {
 
     @Test
     public void testGetFitness() {
-        Chromosome<String> c1 = new AbstractChromosome<String>(chromosome -> {
-            return 1;
-        }, chromosome -> {
-            return "1";
-        }) {
+        Chromosome<String> c1 = new AbstractChromosome<String>(chromosome -> 1, chromosome -> "1") {
         };
         Assert.assertEquals(1, c1.evaluate(), .001);
     }
 
     @Test
     public void testDecode() {
-        Chromosome<String> c1 = new AbstractChromosome<String>(chromosome -> {
-            return 1;
-        }, chromosome -> {
-            return "1";
-        }) {
+        Chromosome<String> c1 = new AbstractChromosome<String>(chromosome -> 1, chromosome -> "1") {
         };
         Assert.assertEquals("1", c1.decode());
     }
 
     @Test
     public void testCompareTo() {
-        Chromosome<String> c1 = new AbstractChromosome<String>(chromosome -> {
-            return 0;
-        }, chromosome -> {
-            return "0";
-        }) {
+        Chromosome<String> c1 = new AbstractChromosome<String>(chromosome -> 0, chromosome -> "0") {
         };
-        Chromosome<String> c2 = new AbstractChromosome<String>(chromosome -> {
-            return 10;
-        }, chromosome -> {
-            return "10";
-        }) {
+        Chromosome<String> c2 = new AbstractChromosome<String>(chromosome -> 10, chromosome -> "10") {
         };
-        Chromosome<String> c3 = new AbstractChromosome<String>(chromosome -> {
-            return 10;
-        }, chromosome -> {
-            return "10";
-        }) {
+        Chromosome<String> c3 = new AbstractChromosome<String>(chromosome -> 10, chromosome -> "10") {
         };
 
         Assert.assertTrue(c1.compareTo(c2) < 0);
@@ -72,23 +52,11 @@ public void testCompareTo() {
 
     @Test
     public void testIsSame() {
-        AbstractChromosome<String> c1 = new AbstractChromosome<String>(chromosome -> {
-            return 1;
-        }, chromosome -> {
-            return "1";
-        }) {
+        AbstractChromosome<String> c1 = new AbstractChromosome<String>(chromosome -> 1, chromosome -> "1") {
         };
-        AbstractChromosome<String> c2 = new AbstractChromosome<String>(chromosome -> {
-            return 2;
-        }, chromosome -> {
-            return "2";
-        }) {
+        AbstractChromosome<String> c2 = new AbstractChromosome<String>(chromosome -> 2, chromosome -> "2") {
         };
-        AbstractChromosome<String> c3 = new AbstractChromosome<String>(chromosome -> {
-            return 3;
-        }, chromosome -> {
-            return "1";
-        }) {
+        AbstractChromosome<String> c3 = new AbstractChromosome<String>(chromosome -> 3, chromosome -> "1") {
         };
         Assert.assertTrue(c1.isSame(c3));
         Assert.assertFalse(c1.isSame(c2));
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/chromosome/BinaryChromosomeTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/chromosome/BinaryChromosomeTest.java
@@ -28,19 +28,15 @@ public void testInvalidConstructor() {
         Integer[][] reprs = new Integer[][] {new Integer[] {0, 1, 0, 1, 2}, new Integer[] {0, 1, 0, 1, -1}};
 
         for (Integer[] repr : reprs) {
-            new BinaryChromosome<>(repr, c -> {
-                return 0;
-            }, new DummyListChromosomeDecoder<>("0"));
+            new BinaryChromosome<>(repr, c -> 0, new DummyListChromosomeDecoder<>("0"));
             Assert.fail("Exception not caught");
         }
     }
 
     @Test
     public void testRandomConstructor() {
         for (int i = 0; i < 20; i++) {
-            BinaryChromosome.<String>randomChromosome(10, c -> {
-                return 1;
-            }, new DummyListChromosomeDecoder<>("1"));
+            BinaryChromosome.<String>randomChromosome(10, c -> 1, new DummyListChromosomeDecoder<>("1"));
         }
     }
 
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/chromosome/RealValuedChromosomeTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/chromosome/RealValuedChromosomeTest.java
@@ -25,18 +25,15 @@ public class RealValuedChromosomeTest {
     @Test
     public void testNewChromosome() {
         for (int i = 0; i < 10; i++) {
-            new RealValuedChromosome<>(ChromosomeRepresentationUtils.randomDoubleRepresentation(10, 0, 1), c1 -> {
-                return 1;
-            }, new DummyListChromosomeDecoder<>("1"));
+            new RealValuedChromosome<>(ChromosomeRepresentationUtils.randomDoubleRepresentation(10, 0, 1), c1 -> 1,
+                    new DummyListChromosomeDecoder<>("1"));
         }
     }
 
     @Test
     public void testRandomChromosome() {
         for (int i = 0; i < 10; i++) {
-            RealValuedChromosome.randomChromosome(5, c -> {
-                return 0;
-            }, new DummyListChromosomeDecoder<>("0"), 0, 2);
+            RealValuedChromosome.randomChromosome(5, c -> 0, new DummyListChromosomeDecoder<>("0"), 0, 2);
         }
     }
 
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/crossover/AbstractListChromosomeCrossoverPolicyTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/crossover/AbstractListChromosomeCrossoverPolicyTest.java
@@ -38,18 +38,10 @@ protected ChromosomePair<String> mate(AbstractListChromosome<Integer, String> fi
                 return new ChromosomePair<>(first, second);
             }
         };
-        Chromosome<String> ch1 = new AbstractChromosome<String>(c -> {
-            return 0;
-        }, c -> {
-            return "0";
-        }) {
+        Chromosome<String> ch1 = new AbstractChromosome<String>(c -> 0, c -> "0") {
         };
 
-        Chromosome<String> ch2 = new AbstractChromosome<String>(c -> {
-            return 1;
-        }, c -> {
-            return "1";
-        }) {
+        Chromosome<String> ch2 = new AbstractChromosome<String>(c -> 1, c -> "1") {
         };
 
         crossoverPolicy.crossover(ch1, ch2, 1.0);
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/crossover/NPointCrossoverTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/crossover/NPointCrossoverTest.java
@@ -33,12 +33,10 @@ public void testNumberIsTooLargeException() {
         final Integer[] p1 = new Integer[] {1, 0, 1, 0, 0, 1, 0, 1, 1};
         final Integer[] p2 = new Integer[] {0, 1, 1, 0, 1, 0, 1, 1, 1};
 
-        final BinaryChromosome<String> p1c = new BinaryChromosome<String>(p1, c -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<Integer>("0"));
-        final BinaryChromosome<String> p2c = new BinaryChromosome<String>(p2, c -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<Integer>("0"));
+        final BinaryChromosome<String> p1c = new BinaryChromosome<String>(p1, c -> 0,
+                new DummyListChromosomeDecoder<Integer>("0"));
+        final BinaryChromosome<String> p2c = new BinaryChromosome<String>(p2, c -> 0,
+                new DummyListChromosomeDecoder<Integer>("0"));
 
         final CrossoverPolicy<String> cp = new NPointCrossover<Integer, String>(15);
         cp.crossover(p1c, p2c, 1.0);
@@ -47,12 +45,10 @@ public void testNumberIsTooLargeException() {
     @Test(expected = GeneticException.class)
     public void testCrossoverInvalidFixedLengthChromosomeFirst() {
         final Integer[] p1 = new Integer[] {1, 0, 1, 0, 0, 1, 0, 1, 1};
-        final BinaryChromosome<String> p1c = new BinaryChromosome<String>(p1, chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
-        final AbstractChromosome<String> p2c = new AbstractChromosome<String>(chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0")) {
+        final BinaryChromosome<String> p1c = new BinaryChromosome<String>(p1, chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0"));
+        final AbstractChromosome<String> p2c = new AbstractChromosome<String>(chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0")) {
         };
 
         final CrossoverPolicy<String> cp = new NPointCrossover<Integer, String>(1);
@@ -62,12 +58,10 @@ public void testCrossoverInvalidFixedLengthChromosomeFirst() {
     @Test(expected = GeneticException.class)
     public void testCrossoverInvalidFixedLengthChromosomeSecond() {
         final Integer[] p1 = new Integer[] {1, 0, 1, 0, 0, 1, 0, 1, 1};
-        final BinaryChromosome<String> p2c = new BinaryChromosome<String>(p1, chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
-        final AbstractChromosome<String> p1c = new AbstractChromosome<String>(chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0")) {
+        final BinaryChromosome<String> p2c = new BinaryChromosome<String>(p1, chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0"));
+        final AbstractChromosome<String> p1c = new AbstractChromosome<String>(chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0")) {
         };
 
         final CrossoverPolicy<String> cp = new NPointCrossover<Integer, String>(1);
@@ -79,12 +73,10 @@ public void testCrossover() {
         Integer[] p1 = new Integer[] {1, 0, 1, 0, 1, 0, 1, 0, 1};
         Integer[] p2 = new Integer[] {0, 1, 0, 1, 0, 1, 0, 1, 0};
 
-        BinaryChromosome<String> p1c = new BinaryChromosome<>(p1, chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
-        BinaryChromosome<String> p2c = new BinaryChromosome<>(p2, chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
+        BinaryChromosome<String> p1c = new BinaryChromosome<>(p1, chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0"));
+        BinaryChromosome<String> p2c = new BinaryChromosome<>(p2, chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0"));
 
         final int order = 3;
         NPointCrossover<Integer, String> npc = new NPointCrossover<>(order);
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/crossover/OnePointCrossoverTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/crossover/OnePointCrossoverTest.java
@@ -31,12 +31,10 @@ public void testCrossover() {
         @SuppressWarnings("boxing")
         Integer[] p2 = new Integer[] {0, 1, 1, 0, 1, 0, 1, 1, 1};
 
-        BinaryChromosome<String> p1c = new BinaryChromosome<>(p1, chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
-        BinaryChromosome<String> p2c = new BinaryChromosome<>(p2, chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
+        BinaryChromosome<String> p1c = new BinaryChromosome<>(p1, chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0"));
+        BinaryChromosome<String> p2c = new BinaryChromosome<>(p2, chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0"));
 
         OnePointCrossover<Integer, String> opc = new OnePointCrossover<>();
 
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/crossover/UniformCrossoverTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/crossover/UniformCrossoverTest.java
@@ -60,12 +60,10 @@ public void testCrossover() {
     }
 
     private void performCrossover(double ratio) {
-        final BinaryChromosome<String> p1c = new BinaryChromosome<>(p1, chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
-        final BinaryChromosome<String> p2c = new BinaryChromosome<>(p2, chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
+        final BinaryChromosome<String> p1c = new BinaryChromosome<>(p1, chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0"));
+        final BinaryChromosome<String> p2c = new BinaryChromosome<>(p2, chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0"));
 
         final CrossoverPolicy<String> cp = new UniformCrossover<Integer, String>(ratio);
 
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/decoder/RandomKeyDecoderTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/decoder/RandomKeyDecoderTest.java
@@ -32,9 +32,7 @@ public void testDecodeChromosome() {
         Double[] keys = new Double[] {0.4, 0.1, 0.5, 0.8, 0.2};
 
         RandomKeyDecoder<String> decoder = new RandomKeyDecoder<>(sequence);
-        RealValuedChromosome<List<String>> chromosome = new RealValuedChromosome<>(keys, c -> {
-            return 0;
-        }, decoder);
+        RealValuedChromosome<List<String>> chromosome = new RealValuedChromosome<>(keys, c -> 0, decoder);
         List<String> decodedSequence = chromosome.decode();
 
         Assert.assertEquals("b", decodedSequence.get(0));
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/decoder/TransparentListChromosomeDecoderTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/decoder/TransparentListChromosomeDecoderTest.java
@@ -30,9 +30,8 @@ public class TransparentListChromosomeDecoderTest {
     @Test
     public void testDecode() {
         List<Integer> rp = ChromosomeRepresentationUtils.randomBinaryRepresentation(10);
-        Chromosome<List<Integer>> chromosome = new BinaryChromosome<>(rp, c -> {
-            return 0;
-        }, new TransparentListChromosomeDecoder<>());
+        Chromosome<List<Integer>> chromosome = new BinaryChromosome<>(rp, c -> 0,
+                new TransparentListChromosomeDecoder<>());
         List<Integer> decodedRp = chromosome.decode();
         Assert.assertTrue(Objects.equals(rp, decodedRp));
     }
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/dummy/DummyChromosome.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/dummy/DummyChromosome.java
@@ -21,11 +21,7 @@
 public class DummyChromosome extends AbstractChromosome<String> {
 
     public DummyChromosome() {
-        super(c -> {
-            return 0;
-        }, c -> {
-                return "0";
-            });
+        super(c -> 0, c -> "0");
     }
 
 }
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/dummy/DummyListChromosome.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/dummy/DummyListChromosome.java
@@ -28,21 +28,16 @@
 public class DummyListChromosome extends AbstractListChromosome<Integer, String> {
 
     public DummyListChromosome(final Integer[] representation) {
-        super(representation, chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
+        super(representation, chromosome -> 0, new DummyListChromosomeDecoder<>("0"));
     }
 
     public DummyListChromosome() {
-        super(ChromosomeRepresentationUtils.randomBinaryRepresentation(10), chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
+        super(ChromosomeRepresentationUtils.randomBinaryRepresentation(10), chromosome -> 0,
+                new DummyListChromosomeDecoder<>("0"));
     }
 
     public DummyListChromosome(final List<Integer> representation) {
-        super(representation, chromosome -> {
-            return 0;
-        }, new DummyListChromosomeDecoder<>("0"));
+        super(representation, chromosome -> 0, new DummyListChromosomeDecoder<>("0"));
     }
 
     @Override
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/mutation/BinaryMutationTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/mutation/BinaryMutationTest.java
@@ -29,9 +29,8 @@ public void testMutate() {
 
         // stochastic testing for single gene mutation :)
         for (int i = 0; i < 20; i++) {
-            BinaryChromosome<String> original = BinaryChromosome.<String>randomChromosome(10, chromosome -> {
-                return 0;
-            }, new DummyListChromosomeDecoder<>("0"));
+            BinaryChromosome<String> original = BinaryChromosome.<String>randomChromosome(10, chromosome -> 0,
+                    new DummyListChromosomeDecoder<>("0"));
             BinaryChromosome<String> mutated = (BinaryChromosome<String>) mutation.mutate(original, .1);
 
             // one gene should be different
@@ -46,9 +45,8 @@ public void testMutate() {
 
         // stochastic testing for two gene mutation :)
         for (int i = 0; i < 20; i++) {
-            BinaryChromosome<String> original = BinaryChromosome.<String>randomChromosome(10, chromosome -> {
-                return 0;
-            }, new DummyListChromosomeDecoder<>("0"));
+            BinaryChromosome<String> original = BinaryChromosome.<String>randomChromosome(10, chromosome -> 0,
+                    new DummyListChromosomeDecoder<>("0"));
             BinaryChromosome<String> mutated = (BinaryChromosome<String>) mutation.mutate(original, .2);
 
             // one gene should be different
@@ -63,9 +61,8 @@ public void testMutate() {
 
         // stochastic testing for three gene mutation :)
         for (int i = 0; i < 20; i++) {
-            BinaryChromosome<String> original = BinaryChromosome.<String>randomChromosome(10, chromosome -> {
-                return 0;
-            }, new DummyListChromosomeDecoder<>("0"));
+            BinaryChromosome<String> original = BinaryChromosome.<String>randomChromosome(10, chromosome -> 0,
+                    new DummyListChromosomeDecoder<>("0"));
             BinaryChromosome<String> mutated = (BinaryChromosome<String>) mutation.mutate(original, .3);
 
             // one gene should be different
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/mutation/RealValuedMutationTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/mutation/RealValuedMutationTest.java
@@ -29,9 +29,8 @@ public void testMutate() {
         MutationPolicy<String> mutation = new RealValuedMutation<>();
         int l = 10;
         for (int i = 0; i < 20; i++) {
-            RealValuedChromosome<String> origRk = RealValuedChromosome.<String>randomChromosome(l, chromosome -> {
-                return 0;
-            }, new DummyListChromosomeDecoder<>("0"), 0d, 1d);
+            RealValuedChromosome<String> origRk = RealValuedChromosome.<String>randomChromosome(l, chromosome -> 0,
+                    new DummyListChromosomeDecoder<>("0"), 0d, 1d);
             AbstractChromosome<String> mutated = (AbstractChromosome<String>) mutation.mutate(origRk, .1);
             RealValuedChromosome<String> mutatedRk = (RealValuedChromosome<String>) mutated;
 
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/population/ListPopulationTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/population/ListPopulationTest.java
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/selection/TournamentSelectionTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/selection/TournamentSelectionTest.java
diff --git a/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/utils/ChromosomeRepresentationUtilsTest.java b/commons-math4-genetics/src/test/java/org/apache/commons/math4/genetics/utils/ChromosomeRepresentationUtilsTest.java

Original file line number	Diff line number	Diff line change
`@@ -28,19 +28,15 @@ public void testInvalidConstructor() {`
`28`	`28`	`Integer[][] reprs = new Integer[][] {new Integer[] {0, 1, 0, 1, 2}, new Integer[] {0, 1, 0, 1, -1}};`
`29`	`29`
`30`	`30`	`for (Integer[] repr : reprs) {`
`31`		`- new BinaryChromosome<>(repr, c -> {`
`32`		`- return 0;`
`33`		`- }, new DummyListChromosomeDecoder<>("0"));`
	`31`	`+ new BinaryChromosome<>(repr, c -> 0, new DummyListChromosomeDecoder<>("0"));`
`34`	`32`	`Assert.fail("Exception not caught");`
`35`	`33`	`}`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`@Test`
`39`	`37`	`public void testRandomConstructor() {`
`40`	`38`	`for (int i = 0; i < 20; i++) {`
`41`		`- BinaryChromosome.<String>randomChromosome(10, c -> {`
`42`		`- return 1;`
`43`		`- }, new DummyListChromosomeDecoder<>("1"));`
	`39`	`+ BinaryChromosome.<String>randomChromosome(10, c -> 1, new DummyListChromosomeDecoder<>("1"));`
`44`	`40`	`}`
`45`	`41`	`}`
`46`	`42`
Original file line number	Diff line number	Diff line change
`@@ -25,18 +25,15 @@ public class RealValuedChromosomeTest {`
`25`	`25`	`@Test`
`26`	`26`	`public void testNewChromosome() {`
`27`	`27`	`for (int i = 0; i < 10; i++) {`
`28`		`- new RealValuedChromosome<>(ChromosomeRepresentationUtils.randomDoubleRepresentation(10, 0, 1), c1 -> {`
`29`		`- return 1;`
`30`		`- }, new DummyListChromosomeDecoder<>("1"));`
	`28`	`+ new RealValuedChromosome<>(ChromosomeRepresentationUtils.randomDoubleRepresentation(10, 0, 1), c1 -> 1,`
	`29`	`+ new DummyListChromosomeDecoder<>("1"));`
`31`	`30`	`}`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`@Test`
`35`	`34`	`public void testRandomChromosome() {`
`36`	`35`	`for (int i = 0; i < 10; i++) {`
`37`		`- RealValuedChromosome.randomChromosome(5, c -> {`
`38`		`- return 0;`
`39`		`- }, new DummyListChromosomeDecoder<>("0"), 0, 2);`
	`36`	`+ RealValuedChromosome.randomChromosome(5, c -> 0, new DummyListChromosomeDecoder<>("0"), 0, 2);`
`40`	`37`	`}`
`41`	`38`	`}`
`42`	`39`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,7 @@`
`21`	`21`	`public class DummyChromosome extends AbstractChromosome<String> {`
`22`	`22`
`23`	`23`	`public DummyChromosome() {`
`24`		`- super(c -> {`
`25`		`- return 0;`
`26`		`- }, c -> {`
`27`		`- return "0";`
`28`		`- });`
	`24`	`+ super(c -> 0, c -> "0");`
`29`	`25`	`}`
`30`	`26`
`31`	`27`	`}`