From 3c900e57a3f0101a8bec9a56895fd1c2b9a5cd3b Mon Sep 17 00:00:00 2001 From: Jan Potocki Date: Mon, 20 Jan 2020 20:13:20 +0100 Subject: [PATCH] New default parameters for TS (algorithm tuning) --- pea2plus.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pea2plus.cpp b/pea2plus.cpp index 7310f54..20b9a9e 100755 --- a/pea2plus.cpp +++ b/pea2plus.cpp @@ -31,7 +31,7 @@ unsigned tabuLength = 0; // Domyslny stan dywersyfikacji bool tabuDiversification = true; // Domyslne kryterium dywersyfikacji, liczba iteracji bez poprawy -int tabuIterationsToRestart = 10000; +int tabuIterationsToRestart = 5000; // Domyslny czas zatrzymania algorytmu tabu search [s] unsigned tabuStopTime = 60; @@ -206,7 +206,7 @@ unsigned autoTabuLength(Graph &graph) { unsigned computedTabuLength; - computedTabuLength = (2 * graph.getVertexNumber() / 10) * 10; + computedTabuLength = 10 + (graph.getVertexNumber() / 10) * 10; if(computedTabuLength == 0) computedTabuLength = 10;