Merge pull request coders-school#18 from KrzysztofJ85/KrzysztofJ85

Task 4: Map (new class) coders-school#4; Task 5: Map (constructor) coders-school#5; Task 6: Map (getIsland) coders-school#9

shm/Coordinates.cpp

@@ -1,10 +1,14 @@
 #include "Coordinates.hpp"
 
+Coordinates::Coordinates(const int positionX,
+                         const int positionY)
+    : _positionX(positionX), _positionY(positionY) {}
+
 bool Coordinates::operator==(const Coordinates& coordinatesToCheck) const {
     return _positionX == coordinatesToCheck._positionX &&
            _positionY == coordinatesToCheck._positionY;
 }
 
 bool Coordinates::operator!=(const Coordinates& coordinatesToCheck) const {
     return !(*this == coordinatesToCheck);
-}
+}

shm/Coordinates.hpp

@@ -2,9 +2,7 @@
 
 class Coordinates {
 public:
-    Coordinates(const int positionX,
-                const int positionY)
-        : _positionX(positionX), _positionY(positionY) {}
+    Coordinates(const int positionX, const int positionY);
 
     bool operator==(const Coordinates& coordinatesToCheck) const;
     bool operator!=(const Coordinates& coordinatesToCheck) const;

shm/Island.cpp

@@ -1 +1,4 @@
 #include "Island.hpp"
+
+Island::Island(int posX, int posY)
+    : _position(posX, posY) {}

shm/Island.hpp

@@ -4,9 +4,9 @@
 
 class Island {
 public:
+    Island(int posX, int posY);
     Coordinates getPosition() const { return _position; }
 
 private:
     Coordinates _position;
 };
-

shm/Makefile

@@ -6,7 +6,7 @@ CC = g++
 
 CFLAGS = -std=c++17 -Wall -Wextra -Wpedantic -Wconversion -Werror -O2
 
-OBJECTS = Ship.o Cargo.o Coordinates.o Island.o SHM.o
+OBJECTS = Cargo.o Ship.o Coordinates.o Island.o Map.o SHM.o
 
 .cpp.o:
 	$(CC) -c $(CFLAGS) $< -o $@

shm/Map.cpp

@@ -0,0 +1,28 @@
+#include "Map.hpp"
+
+#include <algorithm>
+#include <memory>
+#include <random>
+
+Map::Map() {
+    std::random_device rd;
+    std::mt19937 gen(rd());
+    std::uniform_int_distribution<> distrib(minPositionXY, maxPositionXY);
+    _vecOfIslands.reserve(numberOfIslands);
+    int notRepeatedPositions = 0;
+    while (notRepeatedPositions != numberOfIslands) {
+        int positionX = distrib(gen);
+        int positionY = distrib(gen);
+        if (std::none_of(_vecOfIslands.begin(), _vecOfIslands.end(), [positionX, positionY](auto& i) {
+                return i.getPosition() == Coordinates(positionX, positionY);
+            })) {
+            _vecOfIslands.push_back(Island(positionX, positionY));
+            notRepeatedPositions++;
+        }
+    }
+}
+
+Island* Map::getIsland(const Coordinates& coordinate) {
+    auto itr = std::find_if(_vecOfIslands.begin(), _vecOfIslands.end(), [&coordinate](auto& i) { return i.getPosition() == coordinate; });
+    return std::addressof(*itr);
+}

shm/Map.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <vector>
+
+#include "Island.hpp"
+
+constexpr int minPositionXY = 1;
+constexpr int maxPositionXY = 10;
+constexpr int numberOfIslands = 10;
+
+class Map {
+public:
+    Map();
+    Island* getIsland(const Coordinates& coordinate);
+
+private:
+    std::vector<Island> _vecOfIslands;
+    Island* _currentPosition;
+};