Merge sort #1066
Merged
Merge sort #1066
Conversation
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
Panquesito7
requested changes
Sep 20, 2020
|
Rebase needed. |
|
How to rebase? How do we write code so we will not get error?
…On Mon, Sep 21, 2020, 09:47 David Leal ***@***.***> wrote:
Rebase needed.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#1066 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AMX6C5OYIQJUDBAFXHU4XALSG3HW5ANCNFSM4QPYSFIQ>
.
|
|
See the GitHub Documentation for how to resolve conflicts. 🙂 |
|
Replaced two while loop by adding condition in if statement of first while loop of merging. |
Panquesito7
removed
automated tests are failing
|
What is this PR about? Please add a brief description in the first post. Thanks. |
|
I can write here about it.
…On Sun, Sep 27, 2020, 23:48 David Leal ***@***.***> wrote:
What is this PR about? Please add a brief description in the first post.
Thanks.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#1066 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AMX6C5INYOVSSEGHUJAXCO3SH56WZANCNFSM4QPYSFIQ>
.
|
|
Here, I have shorten the code. There are three while loop used in merge function. Among which two of them can be replaced by adding a condition for if and while of first while loop. Now, the condition for while: (i < n1 || j < n2) and for if: (j>=n2 || (i < n1 && L[i]<R[j])). |
Panquesito7
added
approved
|
Thank you
…On Mon, Sep 28, 2020, 00:29 David Leal ***@***.***> wrote:
***@***.**** approved this pull request.
LGTM. 👍 😄
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#1066 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AMX6C5MD7I72P4IKBLMQDF3SH6DR7ANCNFSM4QPYSFIQ>
.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of Change
Here, I have shorten the code. There are three while loop used in merge function. Among which two of them can be replaced by adding a condition for if and while of first while loop. Now, the condition for while: (i < n1 || j < n2) and for if: (j>=n2 || (i < n1 && L[i]<R[j])).
Checklist
Notes: