From 5b34058ac7dcdedcd64d07b68ff48121e2d5610e Mon Sep 17 00:00:00 2001 From: devZoGok Date: Sat, 6 Jan 2024 14:25:52 +0200 Subject: [PATCH] optimized edge calculation for adjacent cells --- mapEditorAppState.cpp | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/mapEditorAppState.cpp b/mapEditorAppState.cpp index ebf1f17..0350f0e 100644 --- a/mapEditorAppState.cpp +++ b/mapEditorAppState.cpp @@ -329,34 +329,7 @@ namespace battleship{ } } - vector edges; - int weight = 1; - bool up = (i > 0), right = (j < numHorCells - 1), down = (i < numVertCells - 1), left = (j > 0); - - if(left) - edges.push_back(Map::Edge(weight, numVertCells * i + j, numVertCells * i + j - 1)); - - if(right) - edges.push_back(Map::Edge(weight, numVertCells * i + j, numVertCells * i + j + 1)); - - if(up) - edges.push_back(Map::Edge(weight, numVertCells * i + j, numVertCells * (i - 1) + j)); - - if(down) - edges.push_back(Map::Edge(weight, numVertCells * i + j, numVertCells * (i + 1) + j)); - - if(up && left) - edges.push_back(Map::Edge(weight, numVertCells * i + j, numVertCells * (i - 1) + j - 1)); - - if(up && right) - edges.push_back(Map::Edge(weight, numVertCells * i + j, numVertCells * (i - 1) + j + 1)); - - if(down && left) - edges.push_back(Map::Edge(weight, numVertCells * i + j, numVertCells * (i + 1) + j - 1)); - - if(down && right) - edges.push_back(Map::Edge(weight, numVertCells * i + j, numVertCells * (i + 1) + j + 1)); - + vector edges = Map::generateAdjacentNodeEdges(numVertCells, i, numHorCells, j, 1); cells.push_back(Map::Cell(pos, type, edges)); }