diff --git a/search/1.json b/search/1.json new file mode 100644 index 0000000000000000000000000000000000000000..7863e69b2783bec2cb71870b1640f97ade19cb00 --- /dev/null +++ b/search/1.json @@ -0,0 +1,27 @@ +{ + "upper": [ + [ + "r", + 2, + -4 + ], + [ + "p", + 2, + -3 + ], + [ + "p", + 3, + -4 + ] + ], + "lower": [ + [ + "s", + 4, + 0 + ] + ], + "block": [] +} \ No newline at end of file diff --git a/search/__pycache__/main.cpython-36.pyc b/search/__pycache__/main.cpython-36.pyc index 82114bf939f6f3661847c6b6f18d45656d42e65e..8ceea90737b37cb74950aaeec327abb444faf268 100644 Binary files a/search/__pycache__/main.cpython-36.pyc and b/search/__pycache__/main.cpython-36.pyc differ diff --git a/search/__pycache__/search_algorithm.cpython-36.pyc b/search/__pycache__/search_algorithm.cpython-36.pyc index 8b0b45f5d0ec70481f3df1dc34911ee8c1453abb..1e49e161785897a28b5b839f252aeb0c023b46b6 100644 Binary files a/search/__pycache__/search_algorithm.cpython-36.pyc and b/search/__pycache__/search_algorithm.cpython-36.pyc differ diff --git a/search/main.py b/search/main.py index 76bc3197861f2036184d2346fb4e6c26b6e7bd76..74a595e9042602f08c0b32b33ee56ec3534b4f45 100644 --- a/search/main.py +++ b/search/main.py @@ -26,8 +26,6 @@ def main(): for piece in upperPiecesDict: find_target(piece) # keep moving until all the piece met its target - make_board() - print_board(board) while targetsDict: take_turn() file.close() diff --git a/search/search_algorithm.py b/search/search_algorithm.py index 0bd0dda0e272c293615fe654f0c40619999b358b..fd3ccc6908a19d7ca47de99029d631e5d40dcf19 100644 --- a/search/search_algorithm.py +++ b/search/search_algorithm.py @@ -328,9 +328,6 @@ def perform_optimal_combination(move_list: dict): continue # Found a move that does not cause collision - - # This is print section - print(upperPiecesDict[piece], " to ", move_list[piece][index]) print_move(upperPiecesDict[piece], move_list[piece][index]) if upperPiecesDict[piece] in board.keys(): @@ -355,8 +352,6 @@ def take_turn(): global turn turn += 1 perform_optimal_combination(possible_actions) - make_board() - print_board(board) update_target_dictionary()