Commit dba0efa

committed

changes based on TDE feedback

1 parent 2876f9b commit dba0efaCopy full SHA for dba0efa

File tree

+16

-9

lines changed

+16

-9

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,10 @@ public MCState(int missionaries, int cannibals, boolean boat) {`
`40`	`40`
`41`	`41`	`@Override`
`42`	`42`	`public String toString() {`
`43`		`- return String.format("On the west bank there are %d missionaries and %d cannibals."`
`44`		`- + System.lineSeparator()`
`45`		`- + "On the east bank there are %d missionaries and %d cannibals."`
`46`		`- + System.lineSeparator()`
`47`		`- + "The boat is on the %s bank.",`
	`43`	`+ return String.format(`
	`44`	`+ "On the west bank there are %d missionaries and %d cannibals.%n"`
	`45`	`+ + "On the east bank there are %d missionaries and %d cannibals.%n"`
	`46`	`+ + "The boat is on the %s bank.",`
`48`	`47`	`wm, wc, em, ec,`
`49`	`48`	`boat ? "west" : "east");`
`50`	`49`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,15 @@ public static void main(String[] args) {`
`102`	`102`	`System.out.println(originalOrder);`
`103`	`103`	`ArrayList<ListCompression> initialPopulation = new ArrayList<>();`
`104`	`104`	`final int POPULATION_SIZE = 100;`
	`105`	`+ final int GENERATIONS = 100;`
	`106`	`+ final double THRESHOLD = 1.0;`
`105`	`107`	`for (int i = 0; i < POPULATION_SIZE; i++) {`
`106`	`108`	`initialPopulation.add(ListCompression.randomInstance());`
`107`	`109`	`}`
`108`	`110`	`GeneticAlgorithm<ListCompression> ga = new GeneticAlgorithm<>(`
`109`	`111`	`initialPopulation,`
`110`	`112`	`0.2, 0.7, GeneticAlgorithm.SelectionType.TOURNAMENT);`
`111`		`- ListCompression result = ga.run(100, 1.0);`
	`113`	`+ ListCompression result = ga.run(GENERATIONS, THRESHOLD);`
`112`	`114`	`System.out.println(result);`
`113`	`115`	`}`
`114`	`116`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,15 @@ public String toString() {`
`102`	`102`	`public static void main(String[] args) {`
`103`	`103`	`ArrayList<SendMoreMoney2> initialPopulation = new ArrayList<>();`
`104`	`104`	`final int POPULATION_SIZE = 1000;`
	`105`	`+ final int GENERATIONS = 1000;`
	`106`	`+ final double THRESHOLD = 1.0;`
`105`	`107`	`for (int i = 0; i < POPULATION_SIZE; i++) {`
`106`	`108`	`initialPopulation.add(SendMoreMoney2.randomInstance());`
`107`	`109`	`}`
`108`	`110`	`GeneticAlgorithm<SendMoreMoney2> ga = new GeneticAlgorithm<>(`
`109`	`111`	`initialPopulation,`
`110`	`112`	`0.2, 0.7, GeneticAlgorithm.SelectionType.ROULETTE);`
`111`		`- SendMoreMoney2 result = ga.run(1000, 1.0);`
	`113`	`+ SendMoreMoney2 result = ga.run(GENERATIONS, THRESHOLD);`
`112`	`114`	`System.out.println(result);`
`113`	`115`	`}`
`114`	`116`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,16 @@`
`23`	`23`	`public class SimpleEquation extends Chromosome<SimpleEquation> {`
`24`	`24`	`private int x, y;`
`25`	`25`
	`26`	`+ private static final int MAX_START = 100;`
	`27`	`+`
`26`	`28`	`public SimpleEquation(int x, int y) {`
`27`	`29`	`this.x = x;`
`28`	`30`	`this.y = y;`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`public static SimpleEquation randomInstance() {`
`32`	`34`	`Random random = new Random();`
`33`		`- return new SimpleEquation(random.nextInt(100), random.nextInt(100));`
	`35`	`+ return new SimpleEquation(random.nextInt(MAX_START), random.nextInt(MAX_START));`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`// 6x - x^2 + 4y - y^2`
`@@ -78,13 +80,15 @@ public String toString() {`
`78`	`80`	`public static void main(String[] args) {`
`79`	`81`	`ArrayList<SimpleEquation> initialPopulation = new ArrayList<>();`
`80`	`82`	`final int POPULATION_SIZE = 20;`
	`83`	`+ final int GENERATIONS = 100;`
	`84`	`+ final double THRESHOLD = 13.0;`
`81`	`85`	`for (int i = 0; i < POPULATION_SIZE; i++) {`
`82`	`86`	`initialPopulation.add(SimpleEquation.randomInstance());`
`83`	`87`	`}`
`84`	`88`	`GeneticAlgorithm<SimpleEquation> ga = new GeneticAlgorithm<>(`
`85`	`89`	`initialPopulation,`
`86`	`90`	`0.1, 0.7, GeneticAlgorithm.SelectionType.TOURNAMENT);`
`87`		`- SimpleEquation result = ga.run(100, 13.0);`
	`91`	`+ SimpleEquation result = ga.run(GENERATIONS, THRESHOLD);`
`88`	`92`	`System.out.println(result);`
`89`	`93`	`}`
`90`	`94`

Comments

(0)