From 14b32f19d7b8f6b8c9eb71a99a96cfcb07bd55b7 Mon Sep 17 00:00:00 2001 From: ankit3890 Date: Thu, 17 Sep 2026 19:18:58 +0530 Subject: [PATCH 1/2] fix: add missing commas in test_ship.py and fix logger string formatting --- WeatherRoutingTool/algorithms/isochrone.py | 6 +++--- WeatherRoutingTool/algorithms/isofuel.py | 2 +- tests/test_ship.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WeatherRoutingTool/algorithms/isochrone.py b/WeatherRoutingTool/algorithms/isochrone.py index b41a7d95..66e8f069 100644 --- a/WeatherRoutingTool/algorithms/isochrone.py +++ b/WeatherRoutingTool/algorithms/isochrone.py @@ -58,9 +58,9 @@ def check_isochrones(self, route: RouteParams): def get_dist(self, bs): dist = self.delta_time * bs - logger.info('dist=', dist) - logger.info('delta_time=', self.delta_time) - logger.info('bs=', bs) + logger.info('dist=%s', dist) + logger.info('delta_time=%s', self.delta_time) + logger.info('bs=%s', bs) return dist def get_delta_variables(self, boat, wind, bs): diff --git a/WeatherRoutingTool/algorithms/isofuel.py b/WeatherRoutingTool/algorithms/isofuel.py index b85d99c8..1a06dda8 100644 --- a/WeatherRoutingTool/algorithms/isofuel.py +++ b/WeatherRoutingTool/algorithms/isofuel.py @@ -121,7 +121,7 @@ def determine_timespread(self, delta_time): """ stddev = np.std(delta_time) mean = np.mean(delta_time) - logger.info('delta_time', delta_time.to('hour')) + logger.info('delta_time: %s', delta_time.to('hour')) logger.info('spread of time: ' + str(mean.to('hour')) + '+-' + str(stddev.to('hour'))) def update_time(self): diff --git a/tests/test_ship.py b/tests/test_ship.py index 06401d5a..dc9276e0 100644 --- a/tests/test_ship.py +++ b/tests/test_ship.py @@ -39,7 +39,7 @@ def test_shipparams_get_element(self): salinity = np.array([6.4, 6.5, 6.41, 6.42]) water_temperature = np.array([6.7, 6.8, 6.71, 6.72]) status = np.array([1, 2, 2, 3]) - message = np.array(['OK', 'OK', 'Error' 'OK']) + message = np.array(['OK', 'OK', 'Error', 'OK']) sp = ShipParams(fuel_rate=fuel, power=power, rpm=rpm, speed=speed, r_wind=rwind, r_calm=rcalm, r_waves=rwaves, r_shallow=rshallow, r_roughness=rroughness, wave_height=wave_height, @@ -105,7 +105,7 @@ def test_shipparams_get_single(self): salinity = np.array([6.4, 6.5, 6.41, 6.42]) water_temperature = np.array([6.7, 6.8, 6.71, 6.72]) status = np.array([1, 2, 2, 3]) - message = np.array(['OK', 'OK', 'Error' 'OK']) + message = np.array(['OK', 'OK', 'Error', 'OK']) sp = ShipParams(fuel_rate=fuel, power=power, rpm=rpm, speed=speed, r_wind=rwind, r_calm=rcalm, r_waves=rwaves, From ed09fe29ad9735897b5e32e787d2dcc64d90683b Mon Sep 17 00:00:00 2001 From: ankit3890 Date: Thu, 17 Sep 2026 20:28:46 +0530 Subject: [PATCH 2/2] refactor: use %s formatting for time spread logging in determine_timespread --- WeatherRoutingTool/algorithms/isofuel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WeatherRoutingTool/algorithms/isofuel.py b/WeatherRoutingTool/algorithms/isofuel.py index 1a06dda8..eb7908cc 100644 --- a/WeatherRoutingTool/algorithms/isofuel.py +++ b/WeatherRoutingTool/algorithms/isofuel.py @@ -122,7 +122,7 @@ def determine_timespread(self, delta_time): stddev = np.std(delta_time) mean = np.mean(delta_time) logger.info('delta_time: %s', delta_time.to('hour')) - logger.info('spread of time: ' + str(mean.to('hour')) + '+-' + str(stddev.to('hour'))) + logger.info('spread of time: %s+-%s', mean.to('hour'), stddev.to('hour')) def update_time(self): delta_time = self.routing_step.delta_time