Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6cab940785 | |||
| c10d296d82 |
@@ -517,7 +517,9 @@ void Graph::travellingSalesmanTabuSearchEngine(Graph &graph, unsigned tabuSteps,
|
||||
|
||||
while(cheeseSupplied == true)
|
||||
{
|
||||
std::vector<unsigned> nextRoute;
|
||||
std::vector<unsigned> nextRoute = currentRoute;
|
||||
// ...na wszelki wypadek, gdyby cale sasiedztwo bylo na liscie tabu
|
||||
// (zeby algorytm sie nie wywalil)
|
||||
int nextRouteLength = -1;
|
||||
|
||||
std::vector<unsigned> nextTabu(3, 0);
|
||||
@@ -691,6 +693,4 @@ void Graph::travellingSalesmanTabuSearchEngine(Graph &graph, unsigned tabuSteps,
|
||||
// Reset licznika iteracji przed restartem
|
||||
stopCounter = 0;
|
||||
}
|
||||
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
@@ -448,6 +448,7 @@ int main(int argc, char *argv[])
|
||||
cout << route.at(i) << '\t' << length << '\t' << distFromStart << endl;
|
||||
}
|
||||
|
||||
cout << endl;
|
||||
cout << "Dlugosc trasy: " << distFromStart << endl;
|
||||
cout << endl;
|
||||
cout << "Czas wykonania algorytmu [s]: " << clock.read() << endl;
|
||||
|
||||
Reference in New Issue
Block a user