Merge branch 'main' of github.com:52North/WeatherRoutingTool

Author: MartinPontius

WeatherRoutingTool/algorithms/genetic/repair.py

@@ -132,7 +132,7 @@ def repair_single_route(self, rt, patchfn, constrained):
         # check for correct input shape of rt
         assert len(rt.shape) == 2
         assert rt.shape[1] == 2
-        debug = True
+        debug = False
 
         prev_seg_end = 0
         on_constraint = False

WeatherRoutingTool/routeparams.py

@@ -362,7 +362,7 @@ def plot_route(self, ax, colour, label, linestyle=False):
 
     def get_power_type(self, power_type):
         if power_type == 'power':
-            return {"value": self.ship_params_per_step.get_power(), "label": 'power consumption', "unit": u.Watt}
+            return {"value": self.ship_params_per_step.get_power(), "label": 'power consumption (kW)', "unit": u.Watt}
         if power_type == 'fuel':
             return {"value": self.get_fuel_per_dist(), "label": "fuel consumption", "unit": u.kg}
 
@@ -474,10 +474,10 @@ def plot_power_vs_dist_ratios(self, denominator, color, label, power_type):
                  marker='o', color=color, linewidth=0, label=label)
         plt.errorbar(x=hist_values_nom["bin_centres"].to(u.km).value, y=hist_values_ratios, yerr=None,
                      xerr=hist_values_nom["bin_widths"].to(u.km).value / 2, fmt=' ', color=color, linestyle=None)
-        plt.axhline(y=mean_dev, color=color, linestyle='dashed')
+        #plt.axhline(y=mean_dev, color=color, linestyle='dashed')
 
         plt.xlabel('travel distance (km)')
-        plt.ylabel(power_nom["label"] + ' data/model')
+        plt.ylabel(power_nom["label"] + ' scipy shortest/model')
         plt.xticks()
 
     def plot_power_vs_coord(self, ax, color, label, coordstring, power_type):

scripts/compare_routes.py

@@ -3,6 +3,7 @@
 ##
 
 import argparse
+import copy
 import datetime as dt
 
 from WeatherRoutingTool.config import set_up_logging
@@ -14,7 +15,7 @@
 
 def plot_power_vs_dist(rp_list, rp_str_list, scenario_str, power_type='fuel'):
     fig, ax = plt.subplots(figsize=(12, 8), dpi=96)
-    ax.set_ylim(0, 5500)
+    ax.set_ylim(4500, 5500)
     for irp in range(0, len(rp_list)):
         rp_list[irp].plot_power_vs_dist(graphics.get_colour(irp), rp_str_list[irp], power_type, ax)
 
@@ -47,16 +48,18 @@ def plot_power_vs_coord(rp_list, rp_str_list, coordstring, power_type='fuel'):
 
 def plot_power_vs_dist_ratios(rp_list, rp_str_list, scenario_str, power_type='fuel'):
     fig, ax = plt.subplots(figsize=(12, 8), dpi=96)
-    ax.set_ylim(0.7, 1.3)
+    ax.set_ylim(0.9, 1.1)
     colour = 0
 
-    for irp in range(1, len(rp_list)):
+    rp_bruch = copy.deepcopy(rp_list[0])
+
+    for irp in range(0, len(rp_list)):
         if rp_str_list[irp] == '':
-            rp_list[irp].plot_power_vs_dist_ratios(rp_list[0], graphics.get_colour(colour),
+            rp_list[irp].plot_power_vs_dist_ratios(rp_bruch, graphics.get_colour(colour),
                                                    rp_str_list[irp], power_type)
             colour = colour + 1
         else:
-            rp_list[irp].plot_power_vs_dist_ratios(rp_list[0], graphics.get_colour(colour),
+            rp_list[irp].plot_power_vs_dist_ratios(rp_bruch, graphics.get_colour(colour),
                                                    rp_str_list[irp], power_type)
             colour = colour + 1
 

scripts/fuel_consumption_for_specific_route.py

@@ -59,6 +59,7 @@ def run_dpm_test_scenario(waypoint_dict, geojsondir, sog, output_route):
 
 def lat_lon_from_file(filename):
     with open(filename) as file:
+        print('reading file: ', filename)
         rp_dict = json.load(file)
 
     point_list = rp_dict['features']