diff --git a/resources/test/instances/BestInsertionHeuristic/DebugWeight/requests.dat b/resources/test/instances/BestInsertionHeuristic/DebugWeight/requests.dat index b3170a42e91822b83f38ac8b55add69c5d920520..43762eb6dfb6c57bd300f3052dec5c01578f10fb 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 d4e1219260ac785fcde31acda13a57eaef97218d..db51b7095b91cbb387937376afde93182c57ea7f 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 65b3a20a015ede5df24b58eeab1b491eec9f071b..734f753fffe159a892da8c80531ec721409ba554 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 110d845bdb33779ac050fe70d7543c43eedb3eb5..033b4c0338c87919768a9a0b5eb0eb441fe40760 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 59a584e8cdc3f31963c3ab6c406fb5b85c58bf8e..9826720d6d886af414f7d6ff018ab94e32b81754 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 6099ca0b3d2c4ed24480e7924ce9123430af67a0..c1dac90104cd1a4ef73273766ce566459a4da400 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 8f87fdf421a834093b27b46781c47b983644c3f5..778e676bac985162b7f77f5ade43dc7aa73d068d 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 12d7cf0ac0bb5ee7a59fb96367cd3e6893210aa4..99519c207525c7bfc9be58a4bef5d03dad5dcb7d 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 d4e1219260ac785fcde31acda13a57eaef97218d..db51b7095b91cbb387937376afde93182c57ea7f 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 97764d4b1618d78d86986f38f8319ce70b1d9d9f..a3797f779dadc3be45e8eea1852b7b8b09d33410 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 67e8ad8b90a0df3d0b1cece891aeefd48d2b677e..81c2e0ebbc5bb02d28392fa4efe75089a88b469c 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 5e6abe119b0ab7da31d6ccb70cbe31df50740e35..5b703a3f869046fcda88f2e09b1cdeb24abe25df 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 4cdc53d46a0ce446b94b1fc38095bc17da27a63f..c023ffff2aad2cec480100de16752755eaffd9ae 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 6b69917d8c38621cb98042260a55f1ca8514ebad..05ce249908f0d60f98d78f369016a97202db42b7 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 971382ad792e295ece30769a3cbe3a436be5c70a..5c0c7159cba26a252341b8be4f177690943baad5 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 813e885cc9def2e29ae9fb6a1c6f5829c8b8e67b..7b7103b86201eacea8b25cbff7f118985ff8a85b 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 f12c12d63cf0fa57b85c06d83b9a86cd0901bfda..1969ed8fd4325010dec5db064a9a7b4e05118635 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