|
@@ -31,7 +31,7 @@ unsigned tabuLength = 0;
|
31
|
31
|
// Domyslny stan dywersyfikacji
|
32
|
32
|
bool tabuDiversification = true;
|
33
|
33
|
// Domyslne kryterium dywersyfikacji, liczba iteracji bez poprawy
|
34
|
|
-int tabuIterationsToRestart = 10000;
|
|
34
|
+int tabuIterationsToRestart = 5000;
|
35
|
35
|
// Domyslny czas zatrzymania algorytmu tabu search [s]
|
36
|
36
|
unsigned tabuStopTime = 60;
|
37
|
37
|
|
|
@@ -206,7 +206,7 @@ unsigned autoTabuLength(Graph &graph)
|
206
|
206
|
{
|
207
|
207
|
unsigned computedTabuLength;
|
208
|
208
|
|
209
|
|
- computedTabuLength = (2 * graph.getVertexNumber() / 10) * 10;
|
|
209
|
+ computedTabuLength = 10 + (graph.getVertexNumber() / 10) * 10;
|
210
|
210
|
if(computedTabuLength == 0)
|
211
|
211
|
computedTabuLength = 10;
|
212
|
212
|
|