From dff56611d57b184f684e8be4a3c657bab269617b Mon Sep 17 00:00:00 2001
From: Lukas Eveborn <lukas.eveborn@liu.se>
Date: Wed, 16 Oct 2024 13:20:59 +0200
Subject: [PATCH] Small fix
---
src/labelling_algorithm.cpp | 6 ++++--
src/main.cpp | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/labelling_algorithm.cpp b/src/labelling_algorithm.cpp
index 8e5a380..34bc347 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 f69020d..a7360c8 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);
}
--
GitLab