Commit 4f6621f

author

Greg Eakin

committed

Clarify and fix which age gets reset in the Get Improvement function.

1 parent 54078b4 commit 4f6621fCopy full SHA for 4f6621f

File tree

+20

-20

lines changed

+20

-20

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,20 +90,20 @@ def _get_improvement(new_child, generate_parent, maxAge):`
`90`	`90`	`if random.random() < exp(-proportionSimilar):`
`91`	`91`	`parent = child`
`92`	`92`	`continue`
	`93`	`+ bestParent.Age = 0`
`93`	`94`	`parent = bestParent`
`94`		`- parent.Age = 0`
`95`	`95`	`continue`
`96`	`96`	`if not child.Fitness > parent.Fitness:`
`97`	`97`	`# same fitness`
`98`	`98`	`child.Age = parent.Age + 1`
`99`	`99`	`parent = child`
`100`	`100`	`continue`
	`101`	`+ child.Age = 0`
`101`	`102`	`parent = child`
`102`		`- parent.Age = 0`
`103`	`103`	`if child.Fitness > bestParent.Fitness:`
`104`		`- yield child`
`105`	`104`	`bestParent = child`
`106`		`- historicalFitnesses.append(child.Fitness)`
	`105`	`+ yield bestParent`
	`106`	`+ historicalFitnesses.append(bestParent.Fitness)`
`107`	`107`
`108`	`108`
`109`	`109`	`class Chromosome:`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,20 +139,20 @@ def _get_improvement(new_child, generate_parent, maxAge, poolSize):`
`139`	`139`	`if random.random() < exp(-proportionSimilar):`
`140`	`140`	`parents[pindex] = child`
`141`	`141`	`continue`
	`142`	`+ bestParent.Age = 0`
`142`	`143`	`parents[pindex] = bestParent`
`143`		`- parent.Age = 0`
`144`	`144`	`continue`
`145`	`145`	`if not child.Fitness > parent.Fitness:`
`146`	`146`	`# same fitness`
`147`	`147`	`child.Age = parent.Age + 1`
`148`	`148`	`parents[pindex] = child`
`149`	`149`	`continue`
	`150`	`+ child.Age = 0`
`150`	`151`	`parents[pindex] = child`
`151`		`- parent.Age = 0`
`152`	`152`	`if child.Fitness > bestParent.Fitness:`
`153`		`- yield child`
`154`	`153`	`bestParent = child`
`155`		`- historicalFitnesses.append(child.Fitness)`
	`154`	`+ yield bestParent`
	`155`	`+ historicalFitnesses.append(bestParent.Fitness)`
`156`	`156`
`157`	`157`
`158`	`158`	`class Chromosome:`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,20 +148,20 @@ def _get_improvement(new_child, generate_parent, maxAge, poolSize, maxSeconds):`
`148`	`148`	`if random.random() < exp(-proportionSimilar):`
`149`	`149`	`parents[pindex] = child`
`150`	`150`	`continue`
	`151`	`+ bestParent.Age = 0`
`151`	`152`	`parents[pindex] = bestParent`
`152`		`- parent.Age = 0`
`153`	`153`	`continue`
`154`	`154`	`if not child.Fitness > parent.Fitness:`
`155`	`155`	`# same fitness`
`156`	`156`	`child.Age = parent.Age + 1`
`157`	`157`	`parents[pindex] = child`
`158`	`158`	`continue`
	`159`	`+ child.Age = 0`
`159`	`160`	`parents[pindex] = child`
`160`		`- parent.Age = 0`
`161`	`161`	`if child.Fitness > bestParent.Fitness:`
`162`		`- yield False, child`
`163`	`162`	`bestParent = child`
`164`		`- historicalFitnesses.append(child.Fitness)`
	`163`	`+ yield False, bestParent`
	`164`	`+ historicalFitnesses.append(bestParent.Fitness)`
`165`	`165`
`166`	`166`
`167`	`167`	`class Chromosome:`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -149,20 +149,20 @@ def _get_improvement(new_child, generate_parent, maxAge, poolSize,`
`149`	`149`	`if random.random() < exp(-proportionSimilar):`
`150`	`150`	`parents[pindex] = child`
`151`	`151`	`continue`
	`152`	`+ bestParent.Age = 0`
`152`	`153`	`parents[pindex] = bestParent`
`153`		`- parent.Age = 0`
`154`	`154`	`continue`
`155`	`155`	`if not child.Fitness > parent.Fitness:`
`156`	`156`	`# same fitness`
`157`	`157`	`child.Age = parent.Age + 1`
`158`	`158`	`parents[pindex] = child`
`159`	`159`	`continue`
	`160`	`+ child.Age = 0`
`160`	`161`	`parents[pindex] = child`
`161`		`- parent.Age = 0`
`162`	`162`	`if child.Fitness > bestParent.Fitness:`
`163`		`- yield False, child`
`164`	`163`	`bestParent = child`
`165`		`- historicalFitnesses.append(child.Fitness)`
	`164`	`+ yield False, bestParent`
	`165`	`+ historicalFitnesses.append(bestParent.Fitness)`
`166`	`166`
`167`	`167`
`168`	`168`	`def hill_climbing(optimizationFunction, is_improvement, is_optimal,`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,20 +150,20 @@ def _get_improvement(new_child, generate_parent, maxAge, poolSize,`
`150`	`150`	`if random.random() < exp(-proportionSimilar):`
`151`	`151`	`parents[pindex] = child`
`152`	`152`	`continue`
	`153`	`+ bestParent.Age = 0`
`153`	`154`	`parents[pindex] = bestParent`
`154`		`- parent.Age = 0`
`155`	`155`	`continue`
`156`	`156`	`if not child.Fitness > parent.Fitness:`
`157`	`157`	`# same fitness`
`158`	`158`	`child.Age = parent.Age + 1`
`159`	`159`	`parents[pindex] = child`
`160`	`160`	`continue`
	`161`	`+ child.Age = 0`
`161`	`162`	`parents[pindex] = child`
`162`		`- parent.Age = 0`
`163`	`163`	`if child.Fitness > bestParent.Fitness:`
`164`		`- yield False, child`
`165`	`164`	`bestParent = child`
`166`		`- historicalFitnesses.append(child.Fitness)`
	`165`	`+ yield False, bestParent`
	`166`	`+ historicalFitnesses.append(bestParent.Fitness)`
`167`	`167`
`168`	`168`
`169`	`169`	`def hill_climbing(optimizationFunction, is_improvement, is_optimal,`

Comments

(0)