diff --git a/resources/test/instances/MultimodalHeuristic/debug unfulfilled entry/graph.dat b/resources/test/instances/MultimodalHeuristic/debug unfulfilled entry/graph.dat new file mode 100644 index 0000000000000000000000000000000000000000..f2ab163b0bc517cd0139b1fbef0a28e5e0b06d71 --- /dev/null +++ b/resources/test/instances/MultimodalHeuristic/debug unfulfilled entry/graph.dat @@ -0,0 +1,20 @@ +#Params (seed) +123456789 +#Nodes format : status (work, leisure, residential),x,y +,0,0 +,8,4 +,1,1 +,3,3 +#Edges start,end,length +0,1,60 +0,2,60 +0,3,20 +1,0,5 +1,3,15 +2,3,5 +3,0,20 +#PT line fixed +1,2 +10,15 +20,25 +30,35 \ No newline at end of file diff --git a/resources/test/instances/MultimodalHeuristic/debug unfulfilled entry/requests.dat b/resources/test/instances/MultimodalHeuristic/debug unfulfilled entry/requests.dat new file mode 100644 index 0000000000000000000000000000000000000000..308a1af48d010e1155930ec69f051c754a0b3644 --- /dev/null +++ b/resources/test/instances/MultimodalHeuristic/debug unfulfilled entry/requests.dat @@ -0,0 +1,4 @@ +#Global Params (delta ratio) +1 +#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta_time,capacity) +0,3,10,30,40,60,,1 \ No newline at end of file diff --git a/resources/test/instances/MultimodalHeuristic/debug unfulfilled exit/graph.dat b/resources/test/instances/MultimodalHeuristic/debug unfulfilled exit/graph.dat new file mode 100644 index 0000000000000000000000000000000000000000..ea282ec307970bec38054c8567577de2df2d5a42 --- /dev/null +++ b/resources/test/instances/MultimodalHeuristic/debug unfulfilled exit/graph.dat @@ -0,0 +1,19 @@ +#Params (seed) +123456789 +#Nodes format : status (work, leisure, residential),x,y +,0,0 +,8,4 +,1,1 +,3,3 +#Edges start,end,length +0,2,10 +0,3,20 +1,0,5 +1,3,15 +2,3,5 +3,0,20 +#PT line fixed +1,2 +10,15 +20,25 +30,35 \ No newline at end of file diff --git a/resources/test/instances/MultimodalHeuristic/debug unfulfilled exit/requests.dat b/resources/test/instances/MultimodalHeuristic/debug unfulfilled exit/requests.dat new file mode 100644 index 0000000000000000000000000000000000000000..308a1af48d010e1155930ec69f051c754a0b3644 --- /dev/null +++ b/resources/test/instances/MultimodalHeuristic/debug unfulfilled exit/requests.dat @@ -0,0 +1,4 @@ +#Global Params (delta ratio) +1 +#Requests (origin_idx,destination_idx,min_tw_start,max_tw_start,min_tw_end,max_tw_end,delta_time,capacity) +0,3,10,30,40,60,,1 \ No newline at end of file diff --git a/src/algorithm/Multimodal/Heuristics/MultimodalModularHeuristic.h b/src/algorithm/Multimodal/Heuristics/MultimodalModularHeuristic.h index 97e5805ccbda048cd742cec187d4ed2382342bd0..46242b3c269c35526f4b388948f6204b80aee5e7 100644 --- a/src/algorithm/Multimodal/Heuristics/MultimodalModularHeuristic.h +++ b/src/algorithm/Multimodal/Heuristics/MultimodalModularHeuristic.h @@ -66,7 +66,7 @@ private: std::vector<size_t> _darpRequestList; //Add friend test classes to test inner workings without making the whole API public - FRIEND_TEST(MultimodalInsertionHeuristicDebug, DebugBaseInstance); + FRIEND_TEST(MultimodalInsertionHeuristicDebug, DebugPTInstance); FRIEND_TEST(MultimodalInsertionHeuristicDebug, DebugInstanceAlain); //Public interface to interact with the modular heuristic diff --git a/src/algorithm/Multimodal/Heuristics/TransitAccess.h b/src/algorithm/Multimodal/Heuristics/TransitAccess.h index a1ec4f6331f18b72339765a1d30b577c4d7781c9..c59a121b2a11ea5d7b80d4a1e9a191c8391d05b8 100644 --- a/src/algorithm/Multimodal/Heuristics/TransitAccess.h +++ b/src/algorithm/Multimodal/Heuristics/TransitAccess.h @@ -1,5 +1,5 @@ // -// Created by Bebs on 24/07/2024. +// Created by Romain on 24/07/2024. // #ifndef GREEDYALGORITHM_TRANSITACCESS_H diff --git a/src/utils/Globals.h b/src/utils/Globals.h index 88a94e073df4e6621ce63a41ad8fb7c176359f6d..3beb725947cfc42381b31e072fd65f575cfe8356 100644 --- a/src/utils/Globals.h +++ b/src/utils/Globals.h @@ -1,5 +1,5 @@ // -// Created by Bebs on 19/07/2024. +// Created by Romain on 19/07/2024. // #ifndef GREEDYALGORITHM_GLOBALS_H