Skip to content

Added code to merge two trees #4121

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Jan 18, 2021
Merged

Added code to merge two trees #4121

merged 3 commits into from
Jan 18, 2021

Conversation

jindal2309
Copy link
Contributor

Describe your change:

Merge two binary trees
Problem Description: Given two binary tree, return the merged tree.
The rule for merging is that if two nodes overlap, then put the value sum of
both nodes to the new value of the merged node. Otherwise, the NOT null node
will be used as the node of the new tree.

  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms have a URL in its comments that points to Wikipedia or other similar explanation.
  • If this pull request resolves one or more open issues then the commit message contains Fixes: #{$ISSUE_NO}.

@ghost ghost added require tests Tests [doctest/unittest/pytest] are required require type hints https://docs.python.org/3/library/typing.html labels Jan 15, 2021
ghost
ghost reviewed Jan 15, 2021
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Click here to look at the relevant links ⬇️

🔗 Relevant Links

Repository:

Python:

Automated review generated by algorithms-keeper. If there's any problem regarding this review, please open an issue about it.
algorithms-keeper commands and options

algorithms-keeper actions can be triggered by commenting on this PR:

  • @algorithms-keeper review to trigger the checks for only added pull request files
  • @algorithms-keeper review-all to trigger the checks for all the pull request files, including the modified files. As we cannot post review comments on lines not part of the diff, this command will post all the messages in one comment.

NOTE: Commands are in beta and so this feature is restricted only to a member or owner of the organization.

data_structures/binary_tree/merge_two_binary_trees.py Outdated
A binary node has value variable and pointers to its left and right node.
"""

def __init__(self, value=0, left=None, right=None):
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please provide return type hint for the function: __init__. If the function does not return a value, please provide the type hint as: def function() -> None:

Please provide type hint for the parameter: value

Please provide type hint for the parameter: left

Please provide type hint for the parameter: right

data_structures/binary_tree/merge_two_binary_trees.py Outdated
self.right = right


def merge_two_binary_trees(tree1: Node, tree2: Node) -> Node:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As there is no test file in this pull request nor any test function or class in the file data_structures/binary_tree/merge_two_binary_trees.py, please provide doctest for the function merge_two_binary_trees

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

data_structures/binary_tree/merge_two_binary_trees.py Outdated
print_preorder(root.right)


def main() -> None:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As there is no test file in this pull request nor any test function or class in the file data_structures/binary_tree/merge_two_binary_trees.py, please provide doctest for the function main

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@ghost ghost added the awaiting reviews This PR is ready to be reviewed label Jan 15, 2021
ruppysuppy
ruppysuppy suggested changes Jan 17, 2021
View reviewed changes
Copy link
Member

@ruppysuppy ruppysuppy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doctest for main is irrelevant, please implement all other suggestions made by algorithms-keeper

@ghost ghost added awaiting changes A maintainer has requested changes to this PR and removed awaiting reviews This PR is ready to be reviewed labels Jan 17, 2021
@ghost ghost removed require type hints https://docs.python.org/3/library/typing.html awaiting changes A maintainer has requested changes to this PR labels Jan 18, 2021
ghost
ghost reviewed Jan 18, 2021
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Click here to look at the relevant links ⬇️

🔗 Relevant Links

Repository:

Python:

Automated review generated by algorithms-keeper. If there's any problem regarding this review, please open an issue about it.
algorithms-keeper commands and options

algorithms-keeper actions can be triggered by commenting on this PR:

  • @algorithms-keeper review to trigger the checks for only added pull request files
  • @algorithms-keeper review-all to trigger the checks for all the pull request files, including the modified files. As we cannot post review comments on lines not part of the diff, this command will post all the messages in one comment.

NOTE: Commands are in beta and so this feature is restricted only to a member or owner of the organization.

data_structures/binary_tree/merge_two_binary_trees.py Outdated
print_preorder(root.right)


def main() -> None:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As there is no test file in this pull request nor any test function or class in the file data_structures/binary_tree/merge_two_binary_trees.py, please provide doctest for the function main

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@ghost ghost added awaiting reviews This PR is ready to be reviewed tests are failing Do not merge until tests pass labels Jan 18, 2021
@ghost ghost removed require tests Tests [doctest/unittest/pytest] are required tests are failing Do not merge until tests pass labels Jan 18, 2021
@ruppysuppy ruppysuppy merged commit 0728cf1 into TheAlgorithms:master Jan 18, 2021
@ghost ghost removed the awaiting reviews This PR is ready to be reviewed label Jan 18, 2021
peRFectBeliever pushed a commit to peRFectBeliever/Python that referenced this pull request Apr 1, 2021
@jindal2309 @peRFectBeliever
Added code to merge two trees (TheAlgorithms#4121)
ccae2e5 
* Added code to merge two trees

* Added doctest and type hints

* Added pre-commit
Panquesito7 pushed a commit to Panquesito7/Python that referenced this pull request May 13, 2021
@jindal2309
Added code to merge two trees (TheAlgorithms#4121)
b1db406 
* Added code to merge two trees

* Added doctest and type hints

* Added pre-commit
shermanhui pushed a commit to shermanhui/Python that referenced this pull request Oct 22, 2021
@jindal2309 @shermanhui
Added code to merge two trees (TheAlgorithms#4121)
c3cd255 
* Added code to merge two trees

* Added doctest and type hints

* Added pre-commit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruppysuppy ruppysuppy ruppysuppy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jindal2309 @ruppysuppy