8 moved map implementation into source file, simplified map class (#12)

Co-authored-by: Kacu <kacper.kaleta@scythe-studio.com>

Author: Ptysiek

shm/CMakeLists.txt

@@ -10,6 +10,7 @@ project(SHM)
 
 # set executables
 set(THIS_PROJECT_SRC_DIRECTORIES
+    source/Map.cpp
 )
 set(THIS_PROJECT_TESTS_DIRECTORIES
 )
@@ -18,7 +19,7 @@ set(THIS_PROJECT_TESTS_DIRECTORIES
 set(THIS_PROJECT_FLAGS
     -Wall
     -Werror 
-    -Weffc++
+    #-Weffc++
     -Wextra
     -pedantic
     -Wconversion 

shm/source/Map.cpp

@@ -0,0 +1,35 @@
+#include "Map.hpp"
+
+
+Map::Map():
+	horizonLimit_(100),
+	islands_(generateIslands(10)),
+	currentPosition_()
+{}
+
+Island* Map::getIsland(const Island::Coordinates& coordinate) {
+	auto result = std::find_if(islands_.begin(), islands_.end(), [coordinate](const Island& island){ return island.getPosition() == coordinate; });
+	if (result != islands_.end()) {
+		return &(*result);
+	}
+	return nullptr;
+}
+
+std::vector<Island> Map::generateIslands(const size_t numberOfIslands) const {
+	if (numberOfIslands < 1) {
+		return {};
+	}
+	auto xyPositions = generateRandomPositions(numberOfIslands * 2);		
+	std::vector<Island> islands;
+	islands.reserve(xyPositions.size() / 2);
+	for (size_t i = 1; i < xyPositions.size(); i += 2) {
+		islands.emplace_back(Island::Coordinates(xyPositions.at(i - 1), xyPositions.at(i)));
+	}		
+	return islands;
+}
+
+std::vector<int> Map::generateRandomPositions(const size_t numberOfPositions) const {
+	auto positions = Fortune::getNumbersEvenlyDistributed(0, static_cast<int>(horizonLimit_), static_cast<int>(numberOfPositions));
+	Fortune::shuffle(positions);
+	return positions;
+}

shm/source/Map.hpp

@@ -11,53 +11,11 @@ class Map {
 	Island* currentPosition_;
 
 public:
-	Map():
-		horizonLimit_(100),
-		islands_(generateIslands(10)),
-		currentPosition_()
-	{}
+	Map();
 
-	Map(const Map& map):
-	 	horizonLimit_(map.horizonLimit_),
-		islands_(map.islands_),
-		currentPosition_(map.currentPosition_)	
-	{}
-	
-	Map& operator=(const Map& map) {
-		horizonLimit_ = map.horizonLimit_;
-		islands_ = map.islands_;
-		currentPosition_ = currentPosition_;
-		return *this;
-	}
-
-	Island* getIsland(const Island::Coordinates& coordinate) {
-		for (auto& island : islands_) {
-			if (island.getPosition() == coordinate) {
-				return &island;
-			}
-		}
-		return nullptr;
-	}
+	Island* getIsland(const Island::Coordinates& coordinate);
 
 private:
-	std::vector<Island> generateIslands(const size_t numberOfIslands) const {
-		if (numberOfIslands < 1) {
-			return {};
-		}
-		auto xyPositions = generateRandomPositions(numberOfIslands);		
-		std::vector<Island> islands;
-		islands.reserve(xyPositions.size() / 2);
-		for (size_t i = 1; i < xyPositions.size(); i += 2) {
-			islands.emplace_back(Island::Coordinates(xyPositions.at(i - 1), xyPositions.at(i)));
-		}		
-		return islands;
-	}
-
-	std::vector<int> generateRandomPositions(const size_t n) const {
-		auto positions = Fortune::getNumbersEvenlyDistributed(0, static_cast<int>(horizonLimit_), static_cast<int>(n));
-		auto yPositions = Fortune::getNumbersEvenlyDistributed(0, static_cast<int>(horizonLimit_), static_cast<int>(n));
-		positions.insert(positions.end(), yPositions.begin(), yPositions.end());
-		Fortune::shuffle(positions);
-		return positions;
-	}
+	std::vector<Island> generateIslands(const size_t numberOfIslands) const;
+	std::vector<int> generateRandomPositions(const size_t n) const;
 };