diff --git a/Graph.cpp b/Graph.cpp index 4a1bc35..4fc1bca 100755 --- a/Graph.cpp +++ b/Graph.cpp @@ -567,14 +567,7 @@ void Graph::travellingSalesmanTabuSearchEngine(Graph &graph, unsigned tabuSteps, continue; - if(nextRouteLength == -1) - { - nextRouteLength = neighbourRouteLength; - nextRoute = neighbourRoute; - nextTabu.at(1) = i; - nextTabu.at(2) = j; - } - else if(nextRouteLength > neighbourRouteLength) + if(nextRouteLength == -1 || nextRouteLength > neighbourRouteLength) { nextRouteLength = neighbourRouteLength; nextRoute = neighbourRoute; @@ -692,7 +685,7 @@ void Graph::travellingSalesmanTabuSearchEngine(Graph &graph, unsigned tabuSteps, { currentRoute = Graph::travellingSalesmanHybrid(graph); currentRouteLength = 0; - + for(int i = 1; i < currentRoute.size(); i++) currentRouteLength += graph.getWeight(currentRoute.at(i - 1), currentRoute.at(i)); } while(currentRouteLength > criticalLength);