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

Simplified if-else statement (TS)

Browse Source
This commit is contained in:
Jan Potocki
2020-01-20 19:40:22 +01:00
parent 20160689f4
commit b2517f51f2
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Graph.cpp
+2 -9
View File
@@ -567,14 +567,7 @@ void Graph::travellingSalesmanTabuSearchEngine(Graph &graph, unsigned tabuSteps,
continue; continue;
if(nextRouteLength == -1) if(nextRouteLength == -1 || nextRouteLength > neighbourRouteLength)
{
nextRouteLength = neighbourRouteLength;
nextRoute = neighbourRoute;
nextTabu.at(1) = i;
nextTabu.at(2) = j;
}
else if(nextRouteLength > neighbourRouteLength)
{ {
nextRouteLength = neighbourRouteLength; nextRouteLength = neighbourRouteLength;
nextRoute = neighbourRoute; nextRoute = neighbourRoute;
@@ -692,7 +685,7 @@ void Graph::travellingSalesmanTabuSearchEngine(Graph &graph, unsigned tabuSteps,
{ {
currentRoute = Graph::travellingSalesmanHybrid(graph); currentRoute = Graph::travellingSalesmanHybrid(graph);
currentRouteLength = 0; currentRouteLength = 0;
for(int i = 1; i < currentRoute.size(); i++) for(int i = 1; i < currentRoute.size(); i++)
currentRouteLength += graph.getWeight(currentRoute.at(i - 1), currentRoute.at(i)); currentRouteLength += graph.getWeight(currentRoute.at(i - 1), currentRoute.at(i));
} while(currentRouteLength > criticalLength); } while(currentRouteLength > criticalLength);