diff --git a/map.cpp b/map.cpp index 5d147e3..3bc0d52 100755 --- a/map.cpp +++ b/map.cpp @@ -532,13 +532,10 @@ namespace battleship{ sol::table cellTable = cellsTable[i + 1], posTable = cellTable["pos"]; int numEdges = cellTable["numEdges"]; vector edges; - int id = -1; for(int j = 0; j < numEdges; j++){ sol::table edgeTable = cellTable["edges"][j + 1]; edges.push_back(Edge(edgeTable["weight"], edgeTable["srcCellId"], edgeTable["destCellId"])); - - if(id == -1) id = edgeTable["srcCellId"]; } int numUnderWaterCells = cellTable["numUnderWaterCells"]; diff --git a/map.h b/map.h index 7d86ae2..c983f98 100755 --- a/map.h +++ b/map.h @@ -38,7 +38,6 @@ namespace battleship{ struct Cell{ enum Type{LAND, WATER}; - int id; Type type; vb01::Vector3 pos; std::vector edges; diff --git a/pathfinderTest.cpp b/pathfinderTest.cpp index 14761f3..362fc75 100644 --- a/pathfinderTest.cpp +++ b/pathfinderTest.cpp @@ -18,7 +18,7 @@ namespace battleship{ for(int i = 0; i < numCellsOnSide; i++) for(int j = 0; j < numCellsOnSide; j++){ vector edges = Map::generateAdjacentNodeEdges(numCellsOnSide, i, numCellsOnSide, j, 1000); - cells.push_back(Map::Cell(i * numCellsOnSide + j, Vector3(j * cellSize, 0, i * cellSize), Map::Cell::Type::LAND, edges)); + cells.push_back(Map::Cell(Vector3(j * cellSize, 0, i * cellSize), Map::Cell::Type::LAND, edges)); } return cells; @@ -53,13 +53,13 @@ namespace battleship{ void PathfinderTest::testFindPath(){ cells = vector{ - Map::Cell(0, Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 0, 0), Map::Edge(2, 0, 1), Map::Edge(4, 0, 2)}), - Map::Cell(1, Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 1, 1), Map::Edge(1, 1, 2), Map::Edge(9, 1, 3), Map::Edge(13, 1, 4)}), - Map::Cell(2, Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 2, 2), Map::Edge(2, 2, 1), Map::Edge(4, 2, 4), Map::Edge(5, 2, 5)}), - Map::Cell(3, Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 3, 3), Map::Edge(1, 3, 6)}), - Map::Cell(4, Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 4, 4), Map::Edge(1, 4, 1), Map::Edge(1, 4, 3), Map::Edge(2, 4, 5), Map::Edge(3, 4, 6)}), - Map::Cell(5, Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 5, 5), Map::Edge(9, 5, 4), Map::Edge(2, 5, 6)}), - Map::Cell(6, Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 6, 6)}) + Map::Cell(Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 0, 0), Map::Edge(2, 0, 1), Map::Edge(4, 0, 2)}), + Map::Cell(Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 1, 1), Map::Edge(1, 1, 2), Map::Edge(9, 1, 3), Map::Edge(13, 1, 4)}), + Map::Cell(Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 2, 2), Map::Edge(2, 2, 1), Map::Edge(4, 2, 4), Map::Edge(5, 2, 5)}), + Map::Cell(Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 3, 3), Map::Edge(1, 3, 6)}), + Map::Cell(Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 4, 4), Map::Edge(1, 4, 1), Map::Edge(1, 4, 3), Map::Edge(2, 4, 5), Map::Edge(3, 4, 6)}), + Map::Cell(Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 5, 5), Map::Edge(9, 5, 4), Map::Edge(2, 5, 6)}), + Map::Cell(Vector3::VEC_ZERO, Map::Cell::Type::LAND, vector{Map::Edge(0, 6, 6)}) }; int src = 0, dest = cells.size() - 1;