From 01575f862cffb77671ed131f0fb3d4f34ae0babe Mon Sep 17 00:00:00 2001 From: Romain BERNARD <romain.bernard@uca.fr> Date: Wed, 18 Sep 2024 18:26:58 +0200 Subject: [PATCH] update instances to include travel time bounds --- .../DebugWeight/requests.dat | 2 +- .../Instance_Alain_140624/requests.dat | 2 +- .../Instance_Alain_140624_2/requests.dat | 2 +- .../basic_debug_instance/graph.dat | 4 ++-- .../basic_debug_instance/requests.dat | 2 +- .../instance_alain_140624/even_more_requests.dat | 2 +- .../instance_alain_140624/graph.dat | 14 +++++++------- .../instance_alain_140624/more_requests.dat | 2 +- .../instance_alain_140624/requests.dat | 2 +- .../basic_debug_instance/graph.dat | 4 ++-- .../contiguous_lines_debug_instance/graph.dat | 10 +++++----- .../cycling_line_debug_instance/graph.dat | 2 +- .../graph.dat | 12 ++++++------ .../graph.dat | 14 +++++++------- .../single_node_lines_debug_instance/graph.dat | 8 ++++---- .../two_lines_debug_instance/graph.dat | 6 +++--- .../graph preprocess/book example/graph.dat | 4 ++-- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/resources/test/instances/BestInsertionHeuristic/DebugWeight/requests.dat b/resources/test/instances/BestInsertionHeuristic/DebugWeight/requests.dat index b3170a4..43762eb 100644 --- a/resources/test/instances/BestInsertionHeuristic/DebugWeight/requests.dat +++ b/resources/test/instances/BestInsertionHeuristic/DebugWeight/requests.dat @@ -1,6 +1,6 @@ #Global Params (delta ratio) 1 -#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta baseline,capacity) +#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta_time,capacity) 1,2,1,5,,,30,4 1,2,1,5,,,30,3 1,2,1,5,,,30,1 diff --git a/resources/test/instances/Constraint Propagation/Instance_Alain_140624/requests.dat b/resources/test/instances/Constraint Propagation/Instance_Alain_140624/requests.dat index d4e1219..db51b70 100644 --- a/resources/test/instances/Constraint Propagation/Instance_Alain_140624/requests.dat +++ b/resources/test/instances/Constraint Propagation/Instance_Alain_140624/requests.dat @@ -1,6 +1,6 @@ #Global Params (delta ratio) 1 -#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta baseline,capacity) +#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta_time,capacity) 1,2,3,6,,,16,1 3,4,6,9,,,8,1 5,6,11,13,,,18,1 diff --git a/resources/test/instances/Constraint Propagation/Instance_Alain_140624_2/requests.dat b/resources/test/instances/Constraint Propagation/Instance_Alain_140624_2/requests.dat index 65b3a20..734f753 100644 --- a/resources/test/instances/Constraint Propagation/Instance_Alain_140624_2/requests.dat +++ b/resources/test/instances/Constraint Propagation/Instance_Alain_140624_2/requests.dat @@ -1,6 +1,6 @@ #Global Params (delta ratio) 1 -#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta baseline,capacity) +#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta_time,capacity) 1,2,1,5,,,30,1 3,4,10,12,,,15,1 5,6,14,20,,,10,1 diff --git a/resources/test/instances/Constraint Propagation/basic_debug_instance/graph.dat b/resources/test/instances/Constraint Propagation/basic_debug_instance/graph.dat index 110d845..033b4c0 100644 --- a/resources/test/instances/Constraint Propagation/basic_debug_instance/graph.dat +++ b/resources/test/instances/Constraint Propagation/basic_debug_instance/graph.dat @@ -10,7 +10,7 @@ work,1,1 10,0,20,10 10,20,0,10 20,10,10,0 -#PT line format : freq (min), start_time, end_time, node_1, ..., node_n -15,340,560,1,2 +#PT line format : frequency,start_time,end_time,min_travel_time,max_travel_time,node_0, ..., node_n +15,340,560,1,5,1,2 #Depot node index 0 \ No newline at end of file diff --git a/resources/test/instances/Constraint Propagation/basic_debug_instance/requests.dat b/resources/test/instances/Constraint Propagation/basic_debug_instance/requests.dat index 59a584e..9826720 100644 --- a/resources/test/instances/Constraint Propagation/basic_debug_instance/requests.dat +++ b/resources/test/instances/Constraint Propagation/basic_debug_instance/requests.dat @@ -1,6 +1,6 @@ #Global Params (delta ratio) 1 -#Requests (origin_idx,destination_idx,min,max,delta baseline,capacity) +#Requests (origin_idx,destination_idx,min,max,delta_time,capacity) 0,3,510,540,30,1 1,2,520,545,25,1 #Expected result for end route D->R1.O->R2.O->R1.D->R2.D->D : [495;515],[505;520],[515;535],[525;545] \ No newline at end of file diff --git a/resources/test/instances/MultimodalHeuristic/instance_alain_140624/even_more_requests.dat b/resources/test/instances/MultimodalHeuristic/instance_alain_140624/even_more_requests.dat index 6099ca0..c1dac90 100644 --- a/resources/test/instances/MultimodalHeuristic/instance_alain_140624/even_more_requests.dat +++ b/resources/test/instances/MultimodalHeuristic/instance_alain_140624/even_more_requests.dat @@ -1,6 +1,6 @@ #Global Params (delta ratio) 1 -#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta baseline,capacity) +#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta_time,capacity) 1,2,3,6,,,16,1 3,4,6,9,,,8,1 5,6,11,13,,,18,1 diff --git a/resources/test/instances/MultimodalHeuristic/instance_alain_140624/graph.dat b/resources/test/instances/MultimodalHeuristic/instance_alain_140624/graph.dat index 8f87fdf..778e676 100644 --- a/resources/test/instances/MultimodalHeuristic/instance_alain_140624/graph.dat +++ b/resources/test/instances/MultimodalHeuristic/instance_alain_140624/graph.dat @@ -32,10 +32,10 @@ 11,12,4 12,10,2 10,0,3 -#PT line format : freq (min), start_time, end_time, node_1, ..., node_n -5,2,40,1,3,5,6 -5,3,40,6,5,3,1 -3,6,40,7,8,2,12,10,6,0 -3,5,40,0,6,10,12,2,8,7 -4,9,40,14,3,11,9,0,15,6 -4,9,40,6,15,0,9,11,3,14 \ No newline at end of file +#PT line format : frequency,start_time,end_time,min_travel_time,max_travel_time,node_0, ..., node_n +5,2,40,1,5,1,3,5,6 +5,3,40,1,5,6,5,3,1 +3,6,40,1,5,7,8,2,12,10,6,0 +3,5,40,1,5,0,6,10,12,2,8,7 +4,9,40,1,5,14,3,11,9,0,15,6 +4,9,40,1,5,6,15,0,9,11,3,14 \ No newline at end of file diff --git a/resources/test/instances/MultimodalHeuristic/instance_alain_140624/more_requests.dat b/resources/test/instances/MultimodalHeuristic/instance_alain_140624/more_requests.dat index 12d7cf0..99519c2 100644 --- a/resources/test/instances/MultimodalHeuristic/instance_alain_140624/more_requests.dat +++ b/resources/test/instances/MultimodalHeuristic/instance_alain_140624/more_requests.dat @@ -1,6 +1,6 @@ #Global Params (delta ratio) 1 -#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta baseline,capacity) +#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta_time,capacity) 1,2,3,6,,,16,1 3,4,6,9,,,8,1 5,6,11,13,,,18,1 diff --git a/resources/test/instances/MultimodalHeuristic/instance_alain_140624/requests.dat b/resources/test/instances/MultimodalHeuristic/instance_alain_140624/requests.dat index d4e1219..db51b70 100644 --- a/resources/test/instances/MultimodalHeuristic/instance_alain_140624/requests.dat +++ b/resources/test/instances/MultimodalHeuristic/instance_alain_140624/requests.dat @@ -1,6 +1,6 @@ #Global Params (delta ratio) 1 -#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta baseline,capacity) +#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta_time,capacity) 1,2,3,6,,,16,1 3,4,6,9,,,8,1 5,6,11,13,,,18,1 diff --git a/resources/test/instances/PT Shortest Path/basic_debug_instance/graph.dat b/resources/test/instances/PT Shortest Path/basic_debug_instance/graph.dat index 97764d4..a3797f7 100644 --- a/resources/test/instances/PT Shortest Path/basic_debug_instance/graph.dat +++ b/resources/test/instances/PT Shortest Path/basic_debug_instance/graph.dat @@ -17,5 +17,5 @@ 4,5,2 5,6,3 6,7,2 -#PT line format : freq (min), start_time, end_time, node_1, ..., node_n -15,340,560,3,4,5,6 \ No newline at end of file +#PT line format : frequency,start_time,end_time,min_travel_time,max_travel_time,node_0, ..., node_n +15,340,560,1,5,3,4,5,6 \ No newline at end of file diff --git a/resources/test/instances/PT Shortest Path/contiguous_lines_debug_instance/graph.dat b/resources/test/instances/PT Shortest Path/contiguous_lines_debug_instance/graph.dat index 67e8ad8..81c2e0e 100644 --- a/resources/test/instances/PT Shortest Path/contiguous_lines_debug_instance/graph.dat +++ b/resources/test/instances/PT Shortest Path/contiguous_lines_debug_instance/graph.dat @@ -17,8 +17,8 @@ 4,5,2 5,6,3 6,7,2 -#PT line format : freq (min), start_time, end_time, node_1, ..., node_n -15,340,560,3,4,5,6 -15,340,560,6,5,4,3 -30,360,580,2,3,4,5,6,7 -30,240,580,7,6,5,4,3,2 \ No newline at end of file +#PT line format : frequency,start_time,end_time,min_travel_time,max_travel_time,node_0, ..., node_n +15,340,560,1,5,3,4,5,6 +15,340,560,1,5,6,5,4,3 +30,360,580,1,5,2,3,4,5,6,7 +30,240,580,1,5,7,6,5,4,3,2 \ No newline at end of file diff --git a/resources/test/instances/PT Shortest Path/cycling_line_debug_instance/graph.dat b/resources/test/instances/PT Shortest Path/cycling_line_debug_instance/graph.dat index 5e6abe1..5b703a3 100644 --- a/resources/test/instances/PT Shortest Path/cycling_line_debug_instance/graph.dat +++ b/resources/test/instances/PT Shortest Path/cycling_line_debug_instance/graph.dat @@ -18,4 +18,4 @@ 5,6,3 6,7,2 #PT line format : freq (min), start_time, end_time, node_1, ..., node_n -30,240,580,7,6,7,5,4,3,2,7 \ No newline at end of file +30,240,580,1,5,7,6,7,5,4,3,2,7 \ No newline at end of file diff --git a/resources/test/instances/PT Shortest Path/multiple_crossing_lines_debug_instance/graph.dat b/resources/test/instances/PT Shortest Path/multiple_crossing_lines_debug_instance/graph.dat index 4cdc53d..c023fff 100644 --- a/resources/test/instances/PT Shortest Path/multiple_crossing_lines_debug_instance/graph.dat +++ b/resources/test/instances/PT Shortest Path/multiple_crossing_lines_debug_instance/graph.dat @@ -18,9 +18,9 @@ 5,6,3 6,7,2 #PT line format : freq (min), start_time, end_time, node_1, ..., node_n -15,340,560,3,4,5,6 -15,340,560,6,5,4,3 -30,360,580,2,3,4,5,6,7 -30,240,580,7,6,5,4,3,2 -30,290,580,0,4,1 -30,290,580,1,4,0 \ No newline at end of file +15,340,560,1,5,3,4,5,6 +15,340,560,1,5,6,5,4,3 +30,360,580,1,5,2,3,4,5,6,7 +30,240,580,1,5,7,6,5,4,3,2 +30,290,580,1,5,0,4,1 +30,290,580,1,5,1,4,0 \ No newline at end of file diff --git a/resources/test/instances/PT Shortest Path/multiple_cycling_lines_debug_instance/graph.dat b/resources/test/instances/PT Shortest Path/multiple_cycling_lines_debug_instance/graph.dat index 6b69917..05ce249 100644 --- a/resources/test/instances/PT Shortest Path/multiple_cycling_lines_debug_instance/graph.dat +++ b/resources/test/instances/PT Shortest Path/multiple_cycling_lines_debug_instance/graph.dat @@ -18,10 +18,10 @@ 5,6,3 6,7,2 #PT line format : freq (min), start_time, end_time, node_1, ..., node_n -15,340,560,3,4,5,6,3 -15,340,560,6,5,4,3,6 -30,360,580,2,3,4,5,6,7,2 -30,240,580,7,6,5,4,3,2,7 -30,240,580,7,6,7,5,4,3,2,7 -30,290,580,0,4,1,0 -30,290,580,1,4,0,1 \ No newline at end of file +15,340,560,1,5,3,4,5,6,3 +15,340,560,1,5,6,5,4,3,6 +30,360,580,1,5,2,3,4,5,6,7,2 +30,240,580,1,5,7,6,5,4,3,2,7 +30,240,580,1,5,7,6,7,5,4,3,2,7 +30,290,580,1,5,0,4,1,0 +30,290,580,1,5,1,4,0,1 \ No newline at end of file diff --git a/resources/test/instances/PT Shortest Path/single_node_lines_debug_instance/graph.dat b/resources/test/instances/PT Shortest Path/single_node_lines_debug_instance/graph.dat index 971382a..5c0c715 100644 --- a/resources/test/instances/PT Shortest Path/single_node_lines_debug_instance/graph.dat +++ b/resources/test/instances/PT Shortest Path/single_node_lines_debug_instance/graph.dat @@ -17,7 +17,7 @@ 4,5,2 5,6,3 6,7,2 -#PT line format : freq (min), start_time, end_time, node_1, ..., node_n -15,340,560,3,3,3,3,3,3,3,3,3 -15,340,560,7,7,7,7,7,7,7,7 -30,360,580,2,3,4,5,6,7 \ No newline at end of file +#PT line format : frequency,start_time,end_time,min_travel_time,max_travel_time,node_0, ..., node_n +15,340,560,1,5,3,3,3,3,3,3,3,3,3 +15,340,560,1,5,7,7,7,7,7,7,7,7 +30,360,580,1,5,2,3,4,5,6,7 \ No newline at end of file diff --git a/resources/test/instances/PT Shortest Path/two_lines_debug_instance/graph.dat b/resources/test/instances/PT Shortest Path/two_lines_debug_instance/graph.dat index 813e885..7b7103b 100644 --- a/resources/test/instances/PT Shortest Path/two_lines_debug_instance/graph.dat +++ b/resources/test/instances/PT Shortest Path/two_lines_debug_instance/graph.dat @@ -17,6 +17,6 @@ 4,5,2 5,6,3 6,7,2 -#PT line format : freq (min), start_time, end_time, node_1, ..., node_n -15,340,560,3,4,5,6 -30,360,580,0,1,2,3,7 \ No newline at end of file +#PT line format : frequency,start_time,end_time,min_travel_time,max_travel_time,node_0, ..., node_n +15,340,560,1,5,3,4,5,6 +30,360,580,1,5,0,1,2,3,7 \ No newline at end of file diff --git a/resources/test/instances/graph preprocess/book example/graph.dat b/resources/test/instances/graph preprocess/book example/graph.dat index f12c12d..1969ed8 100644 --- a/resources/test/instances/graph preprocess/book example/graph.dat +++ b/resources/test/instances/graph preprocess/book example/graph.dat @@ -12,7 +12,7 @@ work,2,1 -1,3,0,-1,2 -1,-1,-1,0,4 7,-1,-1,6,0 -#PT line format : freq (min), start_time, end_time, node_1, ..., node_n -15,340,560,1,2 +#PT line format : frequency,start_time,end_time,min_travel_time,max_travel_time,node_0, ..., node_n +15,340,560,1,5,1,2 #Depot node index 0 \ No newline at end of file -- GitLab