Skip to content

Commit 2a63d95

Browse files
committed
Add simultaneous measurement
1 parent 12b5079 commit 2a63d95

2 files changed

+9
-6
lines changed

apps/vss_generation_timetable_simulator_search_methods_testing.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ int main(int argc, char** argv) {
4848
.contraction_coeff = 0.9,
4949
};
5050

51-
std::vector<std::string> methods = {"genetic"};
51+
std::vector<std::string> methods = {"greedy", "random+local", "grasp",
52+
"genetic"};
5253

5354
for (std::string method : methods) {
5455
cda_rail::sim::ScoreHistoryCollection score_coll;
@@ -59,22 +60,22 @@ int main(int argc, char** argv) {
5960
workers.push_back(std::thread{[&]() {
6061
cda_rail::sim::RoutingSolver solver{instance};
6162

62-
for (size_t sample = 0; sample < 3; sample++) {
63+
for (size_t sample = 0; sample < 4; sample++) {
6364
// Method here
6465

6566
std::tuple<std::optional<cda_rail::sim::SolverResult>,
6667
cda_rail::sim::ScoreHistory>
6768
res;
6869
if (method == "random") {
69-
res = solver.random_search(std::chrono::seconds{300}, {});
70+
res = solver.random_search(std::chrono::seconds{200}, {});
7071
} else if (method == "greedy") {
71-
res = solver.greedy_search(std::chrono::seconds{300}, {},
72+
res = solver.greedy_search(std::chrono::seconds{200}, {},
7273
{std::chrono::milliseconds{50}});
7374
} else if (method == "random+local") {
74-
res = solver.random_local_search(std::chrono::seconds{300},
75+
res = solver.random_local_search(std::chrono::seconds{200},
7576
loc_params);
7677
} else if (method == "grasp") {
77-
res = solver.grasp_search(std::chrono::seconds{300},
78+
res = solver.grasp_search(std::chrono::seconds{200},
7879
{std::chrono::milliseconds{50}},
7980
loc_params);
8081
} else if (method == "genetic") {

dev_scripts/launch_method_compare.sh

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
./build/apps/rail_vss_generation_timetable_simulator_search_methods_testing ./test/example-networks-unidirec/Overtake .
12
./build/apps/rail_vss_generation_timetable_simulator_search_methods_testing ./test/example-networks-unidirec/SimpleNetwork .
3+
./build/apps/rail_vss_generation_timetable_simulator_search_methods_testing ./test/example-networks-unidirec/Stammstrecke16Trains .

0 commit comments

Comments
 (0)