From 663bea976ace114affe01183575babb3e495d5a3 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Sun, 2 Nov 2025 22:33:12 +0100 Subject: [PATCH] chore: update the json specifications for plots --- .../tsp_plotter/algorithms_fitness_eil76.json | 6 ++-- .../algorithms_probability_all.json | 6 ++-- .../tsp_plotter/crossovers_fitness_eil76.json | 28 +++++++++++++++++ .../heuristics_probability_all.json | 7 +++-- .../perturbations_fitness_eil76.json | 6 ++-- .../perturbations_probability_all.json | 5 ++-- .../representations_fitness_eil76.json | 30 +++++++++++++++++++ .../representations_probability_all.json | 6 ++-- 8 files changed, 79 insertions(+), 15 deletions(-) create mode 100644 codes/tsp_plotter/crossovers_fitness_eil76.json create mode 100644 codes/tsp_plotter/representations_fitness_eil76.json diff --git a/codes/tsp_plotter/algorithms_fitness_eil76.json b/codes/tsp_plotter/algorithms_fitness_eil76.json index f3aaa111ee04a565b18a1cca578543b32879bf71..1daabf0565fb5012de9b84cfd0873ef8921e4b5c 100644 --- a/codes/tsp_plotter/algorithms_fitness_eil76.json +++ b/codes/tsp_plotter/algorithms_fitness_eil76.json @@ -18,9 +18,11 @@ ], "plot_type": "fitness_evolution", "average_targets": false, + "average_runs": true, + "show_std_dev": true, "algorithm_labels": { "ea": "EA", - "ls_reverse": "LS", + "ls_reverse": "LS", "rs": "RS" } -} \ No newline at end of file +} diff --git a/codes/tsp_plotter/algorithms_probability_all.json b/codes/tsp_plotter/algorithms_probability_all.json index 31bdce18028c2fbac8a4bd9f3dc9e1ed9b6671f2..d68f5066abd3cca382d4b5275d61bce9206e65da 100644 --- a/codes/tsp_plotter/algorithms_probability_all.json +++ b/codes/tsp_plotter/algorithms_probability_all.json @@ -13,7 +13,7 @@ ], "algorithms": [ "ea", - "ls_reverse", + "ls_mix", "rs" ], "group_by_algorithm": true, @@ -29,7 +29,7 @@ "average_targets": true, "algorithm_labels": { "ea": "EA", - "ls_reverse": "LS", + "ls_mix": "LS", "rs": "RS" } -} \ No newline at end of file +} diff --git a/codes/tsp_plotter/crossovers_fitness_eil76.json b/codes/tsp_plotter/crossovers_fitness_eil76.json new file mode 100644 index 0000000000000000000000000000000000000000..531f51ea31b2ae373726f726dc42942f4d4b4ad2 --- /dev/null +++ b/codes/tsp_plotter/crossovers_fitness_eil76.json @@ -0,0 +1,28 @@ +{ + "instances": [ + "eil76" + ], + "algorithms": [ + "ea_pmx", + "ea_erx", + "ea_cx" + ], + "group_by_algorithm": true, + "base_path": "../tsp_hw01/solutions", + "output_path": "crossovers_fitness_eil76.svg", + "targets": [ + 1.0, + 5.0, + 10.0, + 20.0 + ], + "plot_type": "fitness_evolution", + "average_targets": false, + "average_runs": true, + "show_std_dev": true, + "algorithm_labels": { + "ea_pmx": "EA (pmx)", + "ea_erx": "EA (erx)", + "ea_cx": "EA (cx)" + } +} diff --git a/codes/tsp_plotter/heuristics_probability_all.json b/codes/tsp_plotter/heuristics_probability_all.json index 3836784dadfaa02a4b7b18bf84627e877f38eb37..8cde4dfedaa18afd57eb28beb011fe0d76b7d538 100644 --- a/codes/tsp_plotter/heuristics_probability_all.json +++ b/codes/tsp_plotter/heuristics_probability_all.json @@ -15,7 +15,7 @@ "ea", "ea_nn", "ea_mst", - "ls_reverse", + "ls_mix", "ls_nn", "ls_mst" ], @@ -30,12 +30,13 @@ ], "plot_type": "success_probability", "average_targets": true, + "show_std_dev": false, "algorithm_labels": { "ea": "EA (normal)", "ea_nn": "EA (nn)", "ea_mst": "EA (mst)", - "ls_reverse": "LS (normal)", + "ls_mix": "LS (normal)", "ls_nn": "LS (nn)", "ls_mst": "LS (mst)" } -} \ No newline at end of file +} diff --git a/codes/tsp_plotter/perturbations_fitness_eil76.json b/codes/tsp_plotter/perturbations_fitness_eil76.json index a29f7880b513fe178a6d99f02437619f19cbe049..15a52a8767ae75bf3f37198a8cb85eff67051e8d 100644 --- a/codes/tsp_plotter/perturbations_fitness_eil76.json +++ b/codes/tsp_plotter/perturbations_fitness_eil76.json @@ -4,7 +4,7 @@ ], "algorithms": [ "ls_move", - "ls_swap", + "ls_swap", "ls_reverse", "ls_mix" ], @@ -19,10 +19,12 @@ ], "plot_type": "fitness_evolution", "average_targets": false, + "average_runs": true, + "show_std_dev": true, "algorithm_labels": { "ls_move": "LS (move)", "ls_swap": "LS (swap)", "ls_reverse": "LS (reverse)", "ls_mix": "LS (mix)" } -} \ No newline at end of file +} diff --git a/codes/tsp_plotter/perturbations_probability_all.json b/codes/tsp_plotter/perturbations_probability_all.json index 5fbcfe26692834b87616ae88db39141568f88261..d3bd7dc2db915259709a4baf51950cfb6ebb7731 100644 --- a/codes/tsp_plotter/perturbations_probability_all.json +++ b/codes/tsp_plotter/perturbations_probability_all.json @@ -14,12 +14,13 @@ "algorithms": [ "ls_move", "ls_swap", - "ls_reverse", + "ls_reverse", "ls_mix" ], "group_by_algorithm": true, "base_path": "../tsp_hw01/solutions", "output_path": "perturbations_probability_all.svg", + "show_std_dev": false, "targets": [ 1.0, 5.0, @@ -34,4 +35,4 @@ "ls_reverse": "LS (reverse)", "ls_mix": "LS (mix)" } -} \ No newline at end of file +} diff --git a/codes/tsp_plotter/representations_fitness_eil76.json b/codes/tsp_plotter/representations_fitness_eil76.json new file mode 100644 index 0000000000000000000000000000000000000000..accbe0c4dfdaee60c7ee1f53395668228b92a663 --- /dev/null +++ b/codes/tsp_plotter/representations_fitness_eil76.json @@ -0,0 +1,30 @@ +{ + "instances": [ + "eil76" + ], + "algorithms": [ + "ea_binary", + "ea", + "ls_binary", + "ls_mix" + ], + "group_by_algorithm": true, + "base_path": "../tsp_hw01/solutions", + "output_path": "representations_fitness_eil76.svg", + "targets": [ + 1.0, + 5.0, + 10.0, + 20.0 + ], + "plot_type": "fitness_evolution", + "average_targets": false, + "average_runs": true, + "show_std_dev": true, + "algorithm_labels": { + "ea_binary": "EA (binary)", + "ea": "EA (normal)", + "ls_binary": "LS (binary)", + "ls_mix": "LS (normal)" + } +} diff --git a/codes/tsp_plotter/representations_probability_all.json b/codes/tsp_plotter/representations_probability_all.json index 2d040be1edeed78989988ad99c8269cce9672a80..504bed1c51c3a424c4ee5fa330c739f92ffb32f4 100644 --- a/codes/tsp_plotter/representations_probability_all.json +++ b/codes/tsp_plotter/representations_probability_all.json @@ -15,7 +15,7 @@ "ea_binary", "ea", "ls_binary", - "ls_reverse" + "ls_mix" ], "group_by_algorithm": true, "base_path": "../tsp_hw01/solutions", @@ -32,6 +32,6 @@ "ea_binary": "EA (binary)", "ea": "EA (normal)", "ls_binary": "LS (binary)", - "ls_reverse": "LS (normal)" + "ls_mix": "LS (normal)" } -} \ No newline at end of file +}