New default parameters for TS (algorithm tuning)

2020-01-20 20:13:20 +01:00
parent 6d562fb2e3
commit 3c900e57a3
1 changed files with 2 additions and 2 deletions
@@ -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;