Skip to content

Commit b9e5259

Browse files
cclaussgithub-actionspoyea
authored
Fix long line, tests (TheAlgorithms#2123)
* Fix long line * updating DIRECTORY.md * Add doctest * ... * ... * Update tabu_search.py * space * Fix doctest >>> find_neighborhood(['a','c','b','d','e','a']) # doctest: +NORMALIZE_WHITESPACE [['a','e','b','d','c','a',90], [['a','c','d','b','e','a',90], ['a','d','b','c','e','a',93], ['a','c','b','e','d','a',102], ['a','c','e','d','b','a',113], ['a','b','c','d','e','a',93]] Co-authored-by: github-actions <${GITHUB_ACTOR}@users.noreply.github.com> Co-authored-by: John Law <johnlaw.po@gmail.com>
1 parent 9316e7c commit b9e5259

5 files changed

Lines changed: 20 additions & 9 deletions

File tree

‎DIRECTORY.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
* [Hamiltonian Cycle](https://github.com/TheAlgorithms/Python/blob/master/backtracking/hamiltonian_cycle.py)
1919
* [Minimax](https://github.com/TheAlgorithms/Python/blob/master/backtracking/minimax.py)
2020
* [N Queens](https://github.com/TheAlgorithms/Python/blob/master/backtracking/n_queens.py)
21+
* [Rat In Maze](https://github.com/TheAlgorithms/Python/blob/master/backtracking/rat_in_maze.py)
2122
* [Sudoku](https://github.com/TheAlgorithms/Python/blob/master/backtracking/sudoku.py)
2223
* [Sum Of Subsets](https://github.com/TheAlgorithms/Python/blob/master/backtracking/sum_of_subsets.py)
2324

‎digital_image_processing/resize/resize.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def get_y(self, y: int) -> int:
5050
:param y: Destination X coordinate
5151
:return: Parent X coordinate based on `y ratio`
5252
>>> nn = NearestNeighbour(imread("digital_image_processing/image_data/lena.jpg",
53-
1), 100, 100)
53+
... 1), 100, 100)
5454
>>> nn.ratio_y = 0.5
5555
>>> nn.get_y(4)
5656
2

‎divide_and_conquer/convex_hull.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,10 @@ def convex_hull_recursive(points):
325325
>>> convex_hull_recursive([[0, 0], [1, 0], [10, 0]])
326326
[(0.0, 0.0), (10.0, 0.0)]
327327
>>> convex_hull_recursive([[-1, 1],[-1, -1], [0, 0], [0.5, 0.5], [1, -1], [1, 1],
328-
[-0.75, 1]])
328+
... [-0.75, 1]])
329329
[(-1.0, -1.0), (-1.0, 1.0), (1.0, -1.0), (1.0, 1.0)]
330330
>>> convex_hull_recursive([(0, 3), (2, 2), (1, 1), (2, 1), (3, 0), (0, 0), (3, 3),
331-
(2, -1), (2, -4), (1, -3)])
331+
... (2, -1), (2, -4), (1, -3)])
332332
[(0.0, 0.0), (0.0, 3.0), (1.0, -3.0), (2.0, -4.0), (3.0, 0.0), (3.0, 3.0)]
333333
334334
"""

‎maths/gamma.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ def gamma(num: float) -> float:
2929
40320.0
3030
3131
>>> from math import gamma as math_gamma
32-
>>> all(gamma(i)/math_gamma(i) <= 1.000000001 and abs(gamma(i)/math_gamma(i)) > .99999999 for i in range(1, 50))
32+
>>> all(.99999999 < gamma(i) / math_gamma(i) <= 1.000000001
33+
... for i in range(1, 50))
3334
True
3435
3536

‎searches/tabu_search.py‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,19 @@ def find_neighborhood(solution, dict_of_neighbours):
139139
from the solution that the method took as an input
140140
141141
Example:
142-
>>> find_neighborhood(['a','c','b','d','e','a']) # doctest: +NORMALIZE_WHITESPACE
143-
[['a','e','b','d','c','a',90], [['a','c','d','b','e','a',90],
144-
['a','d','b','c','e','a',93], ['a','c','b','e','d','a',102],
145-
['a','c','e','d','b','a',113], ['a','b','c','d','e','a',93]]
142+
>>> find_neighborhood(['a', 'c', 'b', 'd', 'e', 'a'],
143+
... {'a': [['b', '20'], ['c', '18'], ['d', '22'], ['e', '26']],
144+
... 'c': [['a', '18'], ['b', '10'], ['d', '23'], ['e', '24']],
145+
... 'b': [['a', '20'], ['c', '10'], ['d', '11'], ['e', '12']],
146+
... 'e': [['a', '26'], ['b', '12'], ['c', '24'], ['d', '40']],
147+
... 'd': [['a', '22'], ['b', '11'], ['c', '23'], ['e', '40']]}
148+
... ) # doctest: +NORMALIZE_WHITESPACE
149+
[['a', 'e', 'b', 'd', 'c', 'a', 90],
150+
['a', 'c', 'd', 'b', 'e', 'a', 90],
151+
['a', 'd', 'b', 'c', 'e', 'a', 93],
152+
['a', 'c', 'b', 'e', 'd', 'a', 102],
153+
['a', 'c', 'e', 'd', 'b', 'a', 113],
154+
['a', 'b', 'c', 'd', 'e', 'a', 119]]
146155
"""
147156

148157
neighborhood_of_solution = []
@@ -209,7 +218,7 @@ def tabu_search(
209218
best_cost_index = len(best_solution) - 1
210219

211220
found = False
212-
while found is False:
221+
while not found:
213222
i = 0
214223
while i < len(best_solution):
215224

0 commit comments

Comments
 (0)