Горшков Николай КМБО-04-21 очищенный Pull requests#38
Open
Nikgor2002 wants to merge 9 commits intograyed:masterfrom
Open
Горшков Николай КМБО-04-21 очищенный Pull requests#38Nikgor2002 wants to merge 9 commits intograyed:masterfrom
Nikgor2002 wants to merge 9 commits intograyed:masterfrom
Conversation
Nikgor2002
changed the title
grayed
requested changes
Jun 6, 2022
| void set_the_average_value_of_the_duration_of_life(float new_the_average_value_of_the_duration_of_life) { the_average_value_of_the_duration_of_life = new_the_average_value_of_the_duration_of_life; } | ||
| float get_the_average_value_of_the_duration_of_life() const { return the_average_value_of_the_duration_of_life; } | ||
|
|
||
| bool Gender; |
| ss << "Gender = " << " " << Gender; | ||
| return ss.str(); | ||
| }; | ||
|
|
Owner
There was a problem hiding this comment.
Отсутствует перегрузка операции вывода в поток для Animal.
electricity/electricity.cpp
Outdated
|
|
||
| for (size_t idx_2 = 0; idx_2 < other.getPoleCount(); idx_2++) { | ||
|
|
||
| if (this->getPole(idx_1)->connectedObjectPole == other.getPole(idx_2)->name) return true; |
Owner
There was a problem hiding this comment.
Ошибка: не проверяете, что ваш полюс подключен именно к указанному объекту.
|
|
||
| getPole(poleName)->connectedObjectPole = ""; | ||
| this->getPole(poleName)->connectedObject = nullptr; | ||
| return true; |
Owner
There was a problem hiding this comment.
Не отключаете полюс другого объекта.
|
|
||
|
|
||
|
|
||
| float getdataFloat(size_t i) { return ((float*)(this + 2) - 4)[i]; } |
Author
There was a problem hiding this comment.
Прибавляем такое количество байт, чтобы обратиться к нужной ячейке памяти
| @@ -1,7 +1,31 @@ | |||
| <<<<<<< HEAD | |||
Owner
There was a problem hiding this comment.
Вы закоммиттили файл с конфликтами.
| @@ -1,4 +1,5 @@ | |||
| #pragma once | |||
| <<<<<<< HEAD | |||
vectors/vector.cpp
Outdated
| vector3d operator - (const vector3d& v1, const vector3d& v2) { return vector3d(v1[0] - v2[0], v1[1] - v2[1], v1[2] - v2[2]); } | ||
| vector3d operator * (const vector3d& v1, const float x) { return vector3d(v1[0] * x, v1[1] * x, v1[2] * x); } | ||
| vector3d operator / (const vector3d& v1, const float x) { return vector3d(v1[0] / x, v1[1] / x, v1[2] / x); } | ||
| const vector3d operator -(const vector3d& v1) { return vector3d(-v1[0], -v1[1], -v1[2]); } |
Owner
There was a problem hiding this comment.
const в возвращаемом типе, при возврате по значению, не имеет смысла.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.