Commit 33fb529

author

Greg Eakin

committed

Fix the comparator

1 parent d9feae6 commit 33fb529Copy full SHA for 33fb529

File tree

3 files changed

+17

-11

lines changed

ch09
- knapsackTests.py
ch13
- approximatePiTests.py
ch15
- lawnmowerTests.py

3 files changed

+17

-11

lines changed

`‎ch09/knapsackTests.py`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,11 @@ def __init__(self, totalWeight, totalVolume, totalValue):`
`253`	`253`	`self.TotalValue = totalValue`
`254`	`254`
`255`	`255`	`def __gt__(self, other):`
`256`		`- return self.TotalValue > other.TotalValue`
	`256`	`+ if self.TotalValue != other.TotalValue:`
	`257`	`+ return self.TotalValue > other.TotalValue`
	`258`	`+ if self.TotalWeight != other.TotalWeight:`
	`259`	`+ return self.TotalWeight < other.TotalWeight`
	`260`	`+ return self.TotalValue < other.TotalValue`
`257`	`261`
`258`	`262`	`def __str__(self):`
`259`	`263`	`return "wt: {:0.2f} vol: {:0.2f} value: {}".format(`

`‎ch13/approximatePiTests.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ def fnMutate(genes):`
`90`	`90`	`best = genetic.get_best(fnGetFitness, length, optimalFitness,`
`91`	`91`	`geneset, fnDisplay, fnMutate, maxAge=250,`
`92`	`92`	`maxSeconds=maxSeconds)`
`93`		`- return best.Fitness>=optimalFitness`
	`93`	`+ return optimalFitness<=best.Fitness`
`94`	`94`
`95`	`95`	`def test_optimize(self):`
`96`	`96`	`geneset = [i for i in range(1, 512 + 1)]`

`‎ch15/lawnmowerTests.py`

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ def mutate(genes, geneSet, minGenes, maxGenes, fnGetFitness, maxRounds):`
`45`	`45`	`count -= 1`
`46`	`46`	`if fnGetFitness(genes) > initialFitness:`
`47`	`47`	`return`
	`48`	`+`
`48`	`49`	`adding = len(genes) == 0 or \`
`49`	`50`	`(len(genes) < maxGenes and random.randint(0, 5) == 0)`
`50`	`51`	`if adding:`
`@@ -236,7 +237,7 @@ def fnMutate(child):`
`236`	`237`	`fnDisplay, fnMutate, fnCreate, maxAge=None,`
`237`	`238`	`poolSize=10, crossover=crossover)`
`238`	`239`
`239`		`- self.assertTrue(not best.Fitness > optimalFitness)`
	`240`	`+ self.assertTrue(not optimalFitness > best.Fitness)`
`240`	`241`
`241`	`242`
`242`	`243`	`class Mow:`
`@@ -342,6 +343,7 @@ def __init__(self, genes):`
`342`	`343`
`343`	`344`	`if type(temp[index]) is Call:`
`344`	`345`	`temp[index].Funcs = funcs`
	`346`	`+`
`345`	`347`	`if type(temp[index]) is Func:`
`346`	`348`	`if len(funcs) > 0 and not temp[index].ExpectCall:`
`347`	`349`	`temp[index] = Call()`
`@@ -369,14 +371,14 @@ def __init__(self, genes):`
`369`	`371`	`len(funcs[func_id].Ops) == 0:`
`370`	`372`	`del func.Ops[index]`
`371`	`373`
`372`		`- for index in reversed(range(len(temp))):`
`373`		`- if type(temp[index]) is Call:`
`374`		`- func_id = temp[index].FuncId`
`375`		`- if func_id is None:`
`376`		`- continue`
`377`		`- if func_id >= len(funcs) or \`
`378`		`- len(funcs[func_id].Ops) == 0:`
`379`		`- del temp[index]`
	`374`	`+ for index in reversed(range(len(temp))):`
	`375`	`+ if type(temp[index]) is Call:`
	`376`	`+ func_id = temp[index].FuncId`
	`377`	`+ if func_id is None:`
	`378`	`+ continue`
	`379`	`+ if func_id >= len(funcs) or \`
	`380`	`+ len(funcs[func_id].Ops) == 0:`
	`381`	`+ del temp[index]`
`380`	`382`	`self.Main = temp`
`381`	`383`	`self.Funcs = funcs`
`382`	`384`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 33fb529

File tree

3 files changed

3 files changed

`‎ch09/knapsackTests.py`

`‎ch13/approximatePiTests.py`

`‎ch15/lawnmowerTests.py`

0 commit comments