SHM part 2 #105

NikczemnyOkularnik · 2021-08-15T19:11:08Z

@Kasia9311 @kondorski @Crazyayane07 @pwiatr3 @NikczemnyOkularnik

shm task 2 adding getters for cargo

…ogramming into shm

ziobron

Just checking automation

ziobron · 2021-09-10T09:40:22Z

Thanks @ziobron for Code Review.
🏅 1 XP granted

ziobron

Quick additional check

ziobron

And the last check

Game loop and vaid data

nauka-programowania-MA · 2021-11-02T08:01:00Z

shm/Game.cpp

+        std::cin.clear();
+        std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');


This is repeated few times, maybe create function clearInputStream()?
DRY rule -> don't repeat yourself :)

nauka-programowania-MA · 2021-11-02T08:03:14Z

shm/alcohol.cpp

+Cargo* Alcohol::clone()
+{
+    return new Alcohol(*this);


Avoid raw ptr! and new operator

return std::unique_ptr and use std::make_unique.

nauka-programowania-MA · 2021-11-02T08:04:25Z

shm/fruit.cpp

 size_t Fruit::getPrice() const
 {
-    return static_cast<size_t>(basePrice_ * ((size_t)(expiry_date_ - time_elapsed_)) / expiry_date_);
+    //return static_cast<size_t>(basePrice_ * ((size_t)(expiry_date_ - time_elapsed_)) / expiry_date_);


remove commented code.
This commented code looks good, why do you return basePrice_ instead?

nauka-programowania-MA · 2021-11-02T08:05:56Z

shm/fruit.cpp

+Cargo *Fruit::clone()
+{
+    return new Fruit(*this);


nauka-programowania-MA · 2021-11-02T08:06:11Z

shm/item.cpp

+Cargo* Item::clone()
+{
+    return new Item(*this);


nauka-programowania-MA · 2021-11-02T08:07:12Z

shm/ship.cpp

    auto cargoPtr = findMatchCargo(item);
-    if(findMatchCargo(item))
+    if(cargoPtr)


Better

if (cargoPtr = findMatchCargo(item)) { }

If automatically check if this is not nullptr

nauka-programowania-MA · 2021-11-02T08:07:47Z

shm/ship.cpp

+        //Cargo * toAdd;     
        loadCargo->reduceAmount(amount);
-        Cargo* toAdd;
-        if(Fruit* f = dynamic_cast<Fruit*>(loadCargo)){
-            toAdd = new Fruit(*f);
-
-        }
-        if(Item* i = dynamic_cast<Item*>(loadCargo)){
-            toAdd = new Item(*i);
-        }
-        if(Alcohol* a = dynamic_cast<Alcohol*>(loadCargo)){
-            toAdd = new Alcohol(*a);
-        }        
-
+        // if(Fruit* f = dynamic_cast<Fruit*>(loadCargo)){
+        //     toAdd = new Fruit(*f);
+        // }
+        // if(Item* i = dynamic_cast<Item*>(loadCargo)){
+        //     toAdd = new Item(*i);
+        // }
+        // if(Alcohol* a = dynamic_cast<Alcohol*>(loadCargo)){
+        //     toAdd = new Alcohol(*a);
+        // }        


Remove commented code

Merging after memory leak fix

We do not use gtest

Tests in catch2

nauka-programowania-MA · 2022-01-21T12:34:01Z

shm/Map.cpp

+        int x = (int)distrib(gen);
+        int y = (int)distrib(gen);


we should avoid old (C) style casting. Because it unsafe

nauka-programowania-MA · 2022-01-21T12:34:21Z

shm/Map.cpp

-    {   
-        Coordinates c (static_cast<float>(distrib(gen)), static_cast<float>(distrib(gen)));
-
+    for (int i = 0; i < (int)constVariables::ISLANDS_COUNT; i++)


better size_t i = 0 and don't cast to int

nauka-programowania-MA · 2022-01-21T12:35:09Z

shm/Map.cpp

+            x = (int)distrib(gen);
+            y = (int)distrib(gen);


avoid old (C) style casting

ziobron and others added 30 commits June 11, 2021 19:12

fix #30

b358851

fix coders-school#84

c5340c8

fix coders-school#88, module3 almost removed

220bf13

Update 09-operators.md

44b8e81

task 4

124ad57

added island and coordinates classes

5904834

Adding ship class

1e0942d

Adding cargo class

65a6e33

Adding comparison operator to class Cargo and little fixes

f94483f

Added cargo getters and constructor

814c82e

Player class + main update

4d803d1

player refactor

80f9fc0

ship class, added vector for cargo and addCargo function

57d4b21

Fixes

cff4651

Merging

140899b

Merge pull request #9 from NikczemnyOkularnik/NikczemnyOkularnik

7392348

shm task 2 adding getters for cargo

task 9

187f30e

Mergin task 4

c62d0cc

Merge branch 'shm' of https://github.com/Kasia9311/object-oriented-pr…

453dea1

…ogramming into shm

Merge v2

7eafa61

Checks

193c1b2

Adding task 5

a099870

Adding function contains

3c0dd7d

Islands tryouts

8aee177

task 5

47df11f

tasks 5,6,7

8d987b8

zepsuty vector

5070b12

all done!

5c09851

Fix pt 1

7fec7d3

fixes part 2

f1965b3

kondorski and others added 9 commits September 5, 2021 20:29

Time::notify - value passed by reference

c08090c

Time::notify added reference to elements in loop

113b96d

Ship::addCargo - vector appended with push_back instead of emplace_back

68939f4

Ship::removeCargo - const added to shipCargoAmount and iterator

6e5d003

Adding input validation

e150a0e

Changing if's for else if's

cf1bed7

Changing do while to while loop

d4fc6e0

Adding checking if input is digit

681f9f0

Adding const to calculating distance

08f0381

ziobron reviewed Sep 10, 2021

View reviewed changes

ziobron added the Standard label Sep 10, 2021

ziobron reviewed Sep 10, 2021

View reviewed changes

BarTes8 pushed a commit to BarTes8/object-oriented-programming that referenced this pull request Sep 18, 2021

Merge pull request coders-school#105 from lukasz-kukulka/gameLoop

1e81de0

Game loop and vaid data

NikczemnyOkularnik and others added 2 commits October 28, 2021 20:19

Removed ugly dynamic cast, created Clone()

f027a90

warning fixes

d49c0f7

nauka-programowania-MA approved these changes Nov 2, 2021

View reviewed changes

NikczemnyOkularnik and others added 6 commits November 3, 2021 16:14

Explosion of format fixed

3d6969e

gtest added

f084cac

Testing

3e5ebad

Memory leak in storeCargo and shipCargo fixed

adf5dad

Deleted comments in destructors

4e32374

Merging after memory leak fix

6b97b91

Merging after memory leak fix

ziobron requested a review from nauka-programowania-MA January 15, 2022 14:23

NikczemnyOkularnik and others added 3 commits January 15, 2022 15:31

delete gtest

80b756a

We do not use gtest

Tests in catch2

9e22538

added tests

005163c

Tests in catch2

nauka-programowania-MA approved these changes Jan 21, 2022

View reviewed changes

nauka-programowania-MA closed this Jan 21, 2022

		std::cin.clear();
		std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');

SHM part 2 #105

SHM part 2 #105

Uh oh!

Conversation

NikczemnyOkularnik commented Aug 15, 2021 • edited by ziobron Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ziobron left a comment

Choose a reason for hiding this comment

Uh oh!

ziobron commented Sep 10, 2021

Uh oh!

ziobron left a comment

Choose a reason for hiding this comment

Uh oh!

ziobron left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

NikczemnyOkularnik commented Aug 15, 2021 •

edited by ziobron

Loading