Commit 805d8b9

committed

propagate Greg Eakin's suggestions, corrections and improvements over to the Spanish language tree

1 parent cf99d17 commit 805d8b9Copy full SHA for 805d8b9

File tree

6 files changed

+23

-16

lines changed

es
- ch07
  - caballos.py
- ch09
  - mochila.py
- ch13
  - pi.py
- ch15
  - pruebas.py
- ch17
  - regex.py
- ch18
  - ticTacToe.py

6 files changed

+23

-16

lines changed

`‎es/ch07/caballos.py`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ def test_3x4(self):`
`96`	`96`	`anchura = 4`
`97`	`97`	`altura = 3`
`98`	`98`	`# 1,0 2,0 3,0`
`99`		`- # 0,2 1,2 2,0`
	`99`	`+ # 0,2 1,2 2,2`
`100`	`100`	`# 2 C C C .`
`101`	`101`	`# 1 . . . .`
`102`	`102`	`# 0 . C C C`
`@@ -114,8 +114,8 @@ def test_10x10(self):`
`114`	`114`	`self.encontrarCaballoPosiciones(anchura, altura, 22)`
`115`	`115`
`116`	`116`	`def test_12x12(self):`
`117`		`- anchura = 13`
`118`		`- altura = 13`
	`117`	`+ anchura = 12`
	`118`	`+ altura = 12`
`119`	`119`	`self.encontrarCaballoPosiciones(anchura, altura, 28)`
`120`	`120`
`121`	`121`	`def test_13x13(self):`

`‎es/ch09/mochila.py`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,12 @@ def __init__(self, pesoTotal, volumenTotal, valorTotal):`
`261`	`261`	`self.ValorTotal = valorTotal`
`262`	`262`
`263`	`263`	`def __gt__(self, otro):`
`264`		`- return self.ValorTotal > otro.ValorTotal`
	`264`	`+ if self.ValorTotal != otro.ValorTotal:`
	`265`	`+ return self.ValorTotal > otro.ValorTotal`
	`266`	`+ if self.PesoTotal != otro.PesoTotal:`
	`267`	`+ return self.PesoTotal < otro.PesoTotal`
	`268`	`+ return self.VolumenTotal < otro.VolumenTotal`
	`269`	`+`
`265`	`270`
`266`	`271`	`def __str__(self):`
`267`	`272`	`return "peso: {:0.2f} vol: {:0.2f} valor: {}".format(`

`‎es/ch13/pi.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ def fnMudar(genes):`
`91`	`91`	`aptitudÓptima, geneSet, fnMostrar,`
`92`	`92`	`fnMudar, edadMáxima=250,`
`93`	`93`	`segundosMáximos=segundosMáximos)`
`94`		`- return mejor.Aptitud>=aptitudÓptima`
	`94`	`+ return aptitudÓptima<=mejor.Aptitud`
`95`	`95`
`96`	`96`	`def test_optimize(self):`
`97`	`97`	`geneSet = [i for i in range(1, 512 + 1)]`

`‎es/ch15/pruebas.py`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ def fnMudar(niño):`
`245`	`245`	`edadMáxima=None, tamañoDePiscina=10,`
`246`	`246`	`intercambiar=intercambiar)`
`247`	`247`
`248`		`- self.assertTrue(not mejor.Aptitud > aptitudÓptima)`
	`248`	`+ self.assertTrue(not aptitudÓptima > mejor.Aptitud)`
`249`	`249`
`250`	`250`
`251`	`251`	`class Corta:`
`@@ -379,14 +379,14 @@ def __init__(self, genes):`
`379`	`379`	`len(funcs[func_id].Instrucciones) == 0:`
`380`	`380`	`del func.Instrucciones[índice]`
`381`	`381`
`382`		`- for índice in reversed(range(len(temp))):`
`383`		`- if type(temp[índice]) is Llama:`
`384`		`- func_id = temp[índice].FuncId`
`385`		`- if func_id is None:`
`386`		`- continue`
`387`		`- if func_id >= len(funcs) or \`
`388`		`- len(funcs[func_id].Instrucciones) == 0:`
`389`		`- del temp[índice]`
	`382`	`+ for índice in reversed(range(len(temp))):`
	`383`	`+ if type(temp[índice]) is Llama:`
	`384`	`+ func_id = temp[índice].FuncId`
	`385`	`+ if func_id is None:`
	`386`	`+ continue`
	`387`	`+ if func_id >= len(funcs) or \`
	`388`	`+ len(funcs[func_id].Instrucciones) == 0:`
	`389`	`+ del temp[índice]`
`390`	`390`	`self.Principal = temp`
`391`	`391`	`self.Funcs = funcs`
`392`	`392`

`‎es/ch17/regex.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ def __gt__(self, otro):`
`364`	`364`	`conjunto = (self._totalDeseado -`
`365`	`365`	`self.NúmeroDeDeseadosQueCoincidieron) + \`
`366`	`366`	`self.NúmeroDeNoDeseadosQueCoincidieron`
`367`		`- otroConjunto = (self._totalDeseado -`
	`367`	`+ otroConjunto = (otro._totalDeseado -`
`368`	`368`	`otro.NúmeroDeDeseadosQueCoincidieron) + \`
`369`	`369`	`otro.NúmeroDeNoDeseadosQueCoincidieron`
`370`	`370`	`if conjunto != otroConjunto:`
`@@ -379,7 +379,7 @@ def __gt__(self, otro):`
`379`	`379`	`return self.Longitud < otro.Longitud`
`380`	`380`
`381`	`381`	`def __str__(self):`
`382`		`- return "coincide con {} deseadas y {} no deseadas, lon {}".format(`
	`382`	`+ return "coincide con: {} deseadas y, {} no deseadas, lon {}".format(`
`383`	`383`	`"todas" if self._totalDeseado ==`
`384`	`384`	`self.NúmeroDeDeseadosQueCoincidieron else`
`385`	`385`	`self.NúmeroDeDeseadosQueCoincidieron,`

`‎es/ch18/ticTacToe.py`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,8 @@ def mudar_mover(genes):`
`200`	`200`	`aMover = genes[principio:fin]`
`201`	`201`	`genes[principio:fin] = []`
`202`	`202`	`índice = random.choice(range(len(genes)))`
	`203`	`+ if índice >= principio:`
	`204`	`+ índice += 1`
`203`	`205`	`genes[índice:índice] = aMover`
`204`	`206`	`return True`
`205`	`207`

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 805d8b9

File tree

6 files changed

6 files changed

`‎es/ch07/caballos.py`

`‎es/ch09/mochila.py`

`‎es/ch13/pi.py`

`‎es/ch15/pruebas.py`

`‎es/ch17/regex.py`

`‎es/ch18/ticTacToe.py`

0 commit comments