Merge pull request coders-school#23 from Marcinati/kocur1z

zadanie 4 i 5

Author: NeoBauer

shm/.vscode/settings.json

@@ -0,0 +1,48 @@
+{
+    "files.associations": {
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "typeinfo": "cpp"
+    }
+}

shm/cargo.cpp

@@ -1,31 +1,38 @@
+#include "cargo.hpp"
+
 #include <iostream>
 #include <string>
-#include "cargo.hpp"
 
-    Cargo::Cargo(std::string name, size_t amount, size_t basePrice)
-        : name_(name)
-        , amount_(amount)
-        , basePrice_(basePrice)
-{}
+Cargo::Cargo(std::string name, size_t amount, size_t basePrice)
+    : name_(name), amount_(amount), basePrice_(basePrice) {}
 
-    Cargo& Cargo::operator+=(size_t amount) {
-        amount_ += amount;
+Cargo& Cargo::operator+=(size_t amount) {
+    amount_ += amount;
+    return *this;
+}
+Cargo& Cargo::operator-=(size_t amount) {
+    if (amount_ < amount) {
+        std::cerr << "Cargo is lower than 0 \n";
         return *this;
     }
-    Cargo& Cargo::operator-=(size_t amount) {
-        if (amount_ < amount) {
-            std::cerr << "Cargo is lower than 0 \n";
-            return *this;
-        }
-        amount_ -= amount;
-        return *this;
-    };
+    amount_ -= amount;
+    return *this;
+};
 
-    bool Cargo::operator==(std::string name) {
-        return name_ == name;
-    };
+bool Cargo::operator==(std::string name) {
+    return name_ == name;
+};
 
-std::string Cargo::GetName() const  { return name_; }
-size_t Cargo::GetAmount() const  { return amount_; }
-size_t Cargo::GetBasePrice() const  { return basePrice_; }
+std::string Cargo::GetName() const {
+    return name_;
+}
+size_t Cargo::GetAmount() const {
+    return amount_;
+}
+size_t Cargo::GetBasePrice() const {
+    return basePrice_;
+}
 
+bool Cargo::operator==(std::string name) {
+    return name_ == name;
+};

shm/cargo.hpp

@@ -10,11 +10,8 @@ class Cargo {
     size_t GetAmount() const;
     size_t GetBasePrice() const;
 
-
-
 protected:
     std::string name_;
     size_t amount_;
     size_t basePrice_;
 };
-

shm/map.cpp

@@ -0,0 +1,26 @@
+#include "map.hpp"
+
+#include <algorithm>
+#include <random>
+
+Map::Map() {
+    std::vector<unsigned int> posX(maxX);
+    std::vector<unsigned int> posY(maxY);
+
+    std::iota(posX.begin(), posX.end(), posX.begin());
+    std::iota(posY.begin(), posY.end(), posY.begin());
+
+    std::mt19937 gen(std::random_device{}());
+    std::shuffle(posX.begin(), posX.end(), gen);
+    std::shuffle(posY.begin(), posY.end(), gen);
+
+    vecOfIslandOnMap_.reserve(initialAmountOfIsland);
+
+    std::transform(posX.begin(),
+                   posX.end(),
+                   posY.begin(),
+                   std::back_inserter(vecOfIslandOnMap_),
+                   [](int x, int y) {
+                       return std::make_pair(x, y);
+                   });
+}

shm/map.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <vector>
+
+#include "island.hpp"
+
+constexpr int initialAmountOfIsland = 10;
+constexpr int maxX = 10;
+constexpr int maxY = 10;
+
+class Map {
+private:
+    std::vector<Island> vecOfIslandOnMap_;
+    Island* currentPosition_;
+
+public:
+    Map();
+};

shm/player.cpp

@@ -8,14 +8,14 @@ Player::Player(std::unique_ptr<Ship> ship, size_t money, size_t space)
 Player::Player(std::unique_ptr<Ship> ship)
     : Player(std::move(ship), START_MONEY, START_SPACE) {}
 
-size_t Player::getSpeed() {
+size_t Player::getSpeed() const{
     if (ship_)
         return ship_->getSpeed();
 
     return 0;
 }
 
-Cargo Player::getCargo(size_t index) {
+Cargo Player::getCargo(size_t index) const{
     if (ship_)
         return ship_->getCargo(index);
 

shm/player.hpp

@@ -1,13 +1,14 @@
 #pragma once
 #include <memory>
 
+#include "cargo.hpp"
 #include "ship.hpp"
 
 size_t constexpr START_MONEY = 1000;
 size_t constexpr START_SPACE = 0;
 
 class Player {
-  public:
+public:
     Player(std::unique_ptr<Ship> ship, size_t money, size_t space);
     Player(std::unique_ptr<Ship> ship);
 
@@ -16,7 +17,7 @@ class Player {
     size_t getSpeed() const;
     Cargo getCargo(size_t index) const;
 
-  private:
+private:
     std::unique_ptr<Ship> ship_;
     size_t money_;
     size_t availableSpace_;

shm/ship.cpp

@@ -1,46 +1,50 @@
+#include "ship.hpp"
+
 #include <iostream>
 #include <string>
-#include "ship.hpp"
 
-    Ship::Ship()
-        : id_(-1)
-    {}
+Ship::Ship()
+    : id_(-1) {}
 
-    Ship::Ship(int capacity, int maxCrew, int speed, const std::string& name, int id)
-        : capacity_(capacity)
-        , maxCrew_(maxCrew)
-        , crew_(0)
-        , speed_(speed)
-        , name_(name)
-        , id_(id)
-    {}
-    
-    Ship::Ship(int maxCrew, int speed, size_t id)
-        : Ship(0, maxCrew, speed, "", id)
-    {}
+Ship::Ship(int capacity, int maxCrew, int speed, const std::string& name, int id)
+    : capacity_(capacity), maxCrew_(maxCrew), crew_(0), speed_(speed), name_(name), id_(id) {}
 
-    void Ship::setName(const std::string& name) { name_ = name; }
+Ship::Ship(int maxCrew, int speed, size_t id)
+    : Ship(0, maxCrew, speed, "", id) {}
 
-    Ship& Ship::operator-=(size_t num) {
-        if (crew_ < num) {
-            std::cerr << "Number of papays is lower than 0 \n";
-            return *this;
-        }
-        crew_ -= num;
+void Ship::setName(const std::string& name) {
+    name_ = name;
+}
+
+Ship& Ship::operator-=(size_t num) {
+    if (crew_ < num) {
+        std::cerr << "Number of papays is lower than 0 \n";
         return *this;
     }
-    Ship& Ship::operator+=(size_t num) {
-        if(num + crew_ > maxCrew_) {
-            std::cerr << "To many papays!\n";
-            return *this;
-        }
-        crew_ += num;
+    crew_ -= num;
+    return *this;
+}
+Ship& Ship::operator+=(size_t num) {
+    if (num + crew_ > maxCrew_) {
+        std::cerr << "To many papays!\n";
         return *this;
     }
+    crew_ += num;
+    return *this;
+}
 
-    size_t Ship::getCapacity() const  { return capacity_; }
-    size_t Ship::getMaxCrew() const   { return maxCrew_; }
-    size_t Ship::getSpeed() const     { return speed_; }
-    std::string Ship::getName() const { return name_; }
-    int Ship::getId() const        { return id_; }
-
+size_t Ship::getCapacity() const {
+    return capacity_;
+}
+size_t Ship::getMaxCrew() const {
+    return maxCrew_;
+}
+size_t Ship::getSpeed() const {
+    return speed_;
+}
+std::string Ship::getName() const {
+    return name_;
+}
+int Ship::getId() {
+    return id_;
+}

shm/ship.hpp

@@ -1,7 +1,6 @@
 #pragma once
 #include <string>
 
-
 class Ship {
 public: 
     Ship();
@@ -23,4 +22,3 @@ class Ship {
     std::string name_;
     const int id_;
 };
-