MKjanek32/PWrPEA2plus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New default parameters for TS (algorithm tuning)

Browse Source
This commit is contained in:
Jan Potocki
2020-01-20 20:13:20 +01:00
parent 6d562fb2e3
commit 3c900e57a3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pea2plus.cpp
+2 -2
View File
@@ -31,7 +31,7 @@ unsigned tabuLength = 0;
// Domyslny stan dywersyfikacji // Domyslny stan dywersyfikacji
bool tabuDiversification = true; bool tabuDiversification = true;
// Domyslne kryterium dywersyfikacji, liczba iteracji bez poprawy // Domyslne kryterium dywersyfikacji, liczba iteracji bez poprawy
int tabuIterationsToRestart = 10000; int tabuIterationsToRestart = 5000;
// Domyslny czas zatrzymania algorytmu tabu search [s] // Domyslny czas zatrzymania algorytmu tabu search [s]
unsigned tabuStopTime = 60; unsigned tabuStopTime = 60;
@@ -206,7 +206,7 @@ unsigned autoTabuLength(Graph &graph)
{ {
unsigned computedTabuLength; unsigned computedTabuLength;
computedTabuLength = (2 * graph.getVertexNumber() / 10) * 10; computedTabuLength = 10 + (graph.getVertexNumber() / 10) * 10;
if(computedTabuLength == 0) if(computedTabuLength == 0)
computedTabuLength = 10; computedTabuLength = 10;