-
Notifications
You must be signed in to change notification settings - Fork 180
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
homework_08 #1274
Open
erinar
wants to merge
1
commit into
DmitryChitalov:master
Choose a base branch
from
erinar:lesson_8
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
homework_08 #1274
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,7 @@ | |
Поработайте с доработанной структурой, позапускайте на реальных данных. | ||
""" | ||
|
||
|
||
class BinaryTree: | ||
def __init__(self, root_obj): | ||
# корень | ||
|
@@ -19,10 +20,16 @@ def __init__(self, root_obj): | |
# правый потомок | ||
self.right_child = None | ||
|
||
def __str__(self): | ||
return f'({self.left_child}, {self.root}, {self.right_child})' | ||
|
||
def has_children(self): | ||
return self.right_child is not None or self.left_child is not None | ||
|
||
# добавить левого потомка | ||
def insert_left(self, new_node): | ||
# если у узла нет левого потомка | ||
if self.left_child == None: | ||
if self.left_child is None: | ||
# тогда узел просто вставляется в дерево | ||
# формируется новое поддерево | ||
self.left_child = BinaryTree(new_node) | ||
|
@@ -37,7 +44,7 @@ def insert_left(self, new_node): | |
# добавить правого потомка | ||
def insert_right(self, new_node): | ||
# если у узла нет правого потомка | ||
if self.right_child == None: | ||
if self.right_child is None: | ||
# тогда узел просто вставляется в дерево | ||
# формируется новое поддерево | ||
self.right_child = BinaryTree(new_node) | ||
|
@@ -77,3 +84,41 @@ def get_root_val(self): | |
print(r.get_right_child().get_root_val()) | ||
r.get_right_child().set_root_val(16) | ||
print(r.get_right_child().get_root_val()) | ||
print(r) | ||
|
||
# Добавлен метод __str__. Было: | ||
# --- | ||
# 8 | ||
# None | ||
# <__main__.BinaryTree object at 0x7fd1e107cf70> | ||
# 4 | ||
# <__main__.BinaryTree object at 0x7fd1e107cd30> | ||
# 12 | ||
# 16 | ||
# <__main__.BinaryTree object at 0x7fd1e107cfd0> | ||
# --- | ||
|
||
# Стало: | ||
# --- | ||
# 8 | ||
# None | ||
# (None, 4, None) | ||
# 4 | ||
# (None, 12, None) | ||
# 12 | ||
# 16 | ||
# ((None, 4, None), 8, (None, 16, None)) | ||
# --- | ||
|
||
# Также добавлен метод has_children(), необходимый для | ||
# рекурсивных механизмов обхода | ||
|
||
# Предложение по API класса. | ||
# Если get_*_child() возвращает значение | ||
# не в виде числа, а в виде BinaryTree, метод | ||
# insert_* тоже должен получать BinaryTree. | ||
# Методы, которые сейчас называются insert_* | ||
# нужно переименовать в create_* | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. выполнено |
||
# Модифицированный класс используется в самообучающейся | ||
# программе по классификации животных (task_3.py) |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
выполнено