From 921dd88b41494d2d0f48ed7ff1edf6dc1991ed84 Mon Sep 17 00:00:00 2001
From: Brandon Rodriguez <brodriguez8774@gmail.com>
Date: Sat, 6 Nov 2021 11:44:45 -0400
Subject: [PATCH] Further correct TravelingSalesman to be more consistent
---
src/misc.py | 18 ++++++++----------
src/systems.py | 6 +++---
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/misc.py b/src/misc.py
index cbe7995..a55153c 100644
--- a/src/misc.py
+++ b/src/misc.py
@@ -740,8 +740,6 @@ def calc_trash_distances(data_manager, roomba_only=False):
{'id': tile_id, 'forward_cost': forward_cost, 'backward_cost': backward_cost, 'path': path},
)
- logger.info('Calculating path costs.')
-
# Call actual function logic, now that inner functions are defined.
if roomba_only and data_manager.ideal_trash_paths is not None:
# Save computations by only calculating roomba distance to trash tiles.
@@ -759,7 +757,6 @@ def calc_traveling_salesman(data_manager, calc_new=True, debug=False):
:param calc_new: Bool indicating if previously calculated path data should be discarded. Such as wall entity update.
"""
logger.debug('calc_traveling_salesman()')
- logger.info('Calculating ideal path.')
# Clear all debug entities.
clear_debug_entities(data_manager)
@@ -851,6 +848,9 @@ def calc_traveling_salesman(data_manager, calc_new=True, debug=False):
else:
curr_total_dist += len(trash_paths[start_tile_id][end_tile_id]) - 1
+ # Update calculated set for distance found to traverse set.
+ calculated_path['total_cost'] = curr_total_dist
+
# Swap and recalculate distance.
swapped_total_dist = 0
swapped_path = list(calculated_path['ordering'])
@@ -871,7 +871,9 @@ def calc_traveling_salesman(data_manager, calc_new=True, debug=False):
swapped_total_dist += len(trash_paths[start_tile_id][end_tile_id]) - 1
# Check if swapping sets will decrease overall distance travelled.
+ logger.debug('curr_dist: {0} swapped_dist: {1}'.format(curr_total_dist, swapped_total_dist))
if swapped_total_dist < curr_total_dist:
+ logger.debug('Found more efficient path. Swapping.')
calculated_path['ordering'][conn_1_index_1] = conn_2_id_1
calculated_path['ordering'][conn_2_index_1] = conn_1_id_1
calculated_path['total_cost'] = swapped_total_dist
@@ -883,13 +885,9 @@ def calc_traveling_salesman(data_manager, calc_new=True, debug=False):
data_manager.ideal_overall_path['ordering'] == ['{0}, {1}'.format(roomba_x, roomba_y)] or
calculated_path['total_cost'] < data_manager.ideal_overall_path['total_cost']
):
- # New calculated path is more NOT more efficient. Revert to previously found values.
- calculated_path = data_manager.ideal_overall_path
-
- # Save best-found values and update counters.
- data_manager.ideal_overall_path = calculated_path
- data_manager.gui_data['optimal_counter'] = calculated_path['total_cost']
- data_manager.gui_data['total_move_counter'] += 1
+ # New calculated path is more more efficient. Update path values.
+ data_manager.ideal_overall_path = calculated_path
+ data_manager.gui_data['optimal_counter'] = calculated_path['total_cost']
# Optionally display debug tile sprites.
if debug:
diff --git a/src/systems.py b/src/systems.py
index b3189d7..990a063 100644
--- a/src/systems.py
+++ b/src/systems.py
@@ -211,6 +211,9 @@ class AbstractMovementSystem(ABC):
calc_trash_distances(self.data_manager, roomba_only=True)
calc_traveling_salesman(self.data_manager, calc_new=False)
+ # Update for a movement.
+ self.data_manager.gui_data['total_move_counter'] += 1
+
class MovementSystem(sdl2.ext.Applicator, AbstractMovementSystem):
"""
@@ -428,9 +431,6 @@ class AISystem(sdl2.ext.Applicator, AbstractMovementSystem):
curr_tile_x, curr_tile_y = get_tile_coord_from_id(curr_tile_id)
desired_tile_x, desired_tile_y = get_tile_coord_from_id(desired_next_tile_id)
- print('curr_tile: ({0}, {1})'.format(curr_tile_x, curr_tile_y))
- print('desired_tile: ({0}, {1})'.format(desired_tile_x, desired_tile_y))
-
# Determine which direction we move, in order to reach desired tile.
if curr_tile_x != desired_tile_x:
# Moving east/west.
--
GitLab