diff --git a/src/labelling_algorithm.cpp b/src/labelling_algorithm.cpp index 8e5a38014f222385a2123a95686085ac5da097be..34bc34729a58aed69fc2182d361117c0e7276cd1 100644 --- a/src/labelling_algorithm.cpp +++ b/src/labelling_algorithm.cpp @@ -1057,8 +1057,10 @@ void LabellingAlgorithm::get_ng_sets(int size) } } } - node.min_time_incoming_ng=closest_incoming; - node.min_time_outgoing_ng=closest_outgoing; + //node.min_time_incoming_ng=closest_incoming; + //node.min_time_outgoing_ng=closest_outgoing; + nodeInfo[node.uniqueNodeIndex].min_time_incoming_ng = closest_incoming; + nodeInfo[node.uniqueNodeIndex].min_time_outgoing_ng = closest_outgoing; } } diff --git a/src/main.cpp b/src/main.cpp index f69020d0d26dcfe3f19da30cef93377b28b2d9a9..a7360c822087dd1663616f2afe4d28df29a299d4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -76,14 +76,14 @@ int main(int argc, char **argv) int saved_paths = 100; /* Choose acceleration strategies to apply*/ - bool ng_solve = false; + bool ng_solve = true; bool resource_bound = true; bool completion_bound = true; double time_threshold = 0.2; // threshold for time and load bounds, used if completion_bound is true double capacity_threshold = 1; int ng_set_size = 9; // size of ng-set (minus 1), used if ng_solve is true - int max_iterations = 4; // maximum number of iterations to run incremental ng-solve + int max_iterations = 1; // maximum number of iterations to run incremental ng-solve return run_algorithm(argc, argv, chargingVisitsMax, ng_solve, max_iterations, ng_set_size, resource_bound, completion_bound, saved_paths, capacity_threshold, time_threshold); }