Skip to content
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

fix #217 and add shifting to the tree #228

Merged
merged 13 commits into from
Jul 7, 2020

Conversation

antgonza
Copy link
Collaborator

@antgonza antgonza commented Jul 1, 2020

No description provided.

Copy link
Member

@ElDeveloper ElDeveloper left a comment

Choose a reason for hiding this comment

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

Looks great @antgonza, just a handful of minor comments.

empress/core.py Show resolved Hide resolved
empress/support_files/js/bp-tree.js Show resolved Hide resolved
empress/support_files/js/bp-tree.js Outdated Show resolved Hide resolved
empress/tools.py Outdated Show resolved Hide resolved
empress/tools.py Outdated Show resolved Hide resolved
tests/python/test_tools.py Show resolved Hide resolved
empress/support_files/js/bp-tree.js Outdated Show resolved Hide resolved
@ElDeveloper ElDeveloper requested a review from kwcantrell July 6, 2020 17:35
Copy link
Member

@ElDeveloper ElDeveloper left a comment

Choose a reason for hiding this comment

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

Looks great, thanks @antgonza!

empress/support_files/js/bp-tree.js Outdated Show resolved Hide resolved
empress/tools.py Outdated Show resolved Hide resolved
tests/test-bp-tree.js Outdated Show resolved Hide resolved
tests/test-bp-tree.js Outdated Show resolved Hide resolved
@ElDeveloper
Copy link
Member

Thanks @antgonza! Looks like there's conflicts, can you resolve those? Also, @kwcantrell if this looks good to you can you go ahead and merge this PR?

@ElDeveloper
Copy link
Member

@antgonza, there's conflicts again due to a merged PR. Can you re-solve conflicts?

@ElDeveloper
Copy link
Member

@antgonza, let's wait for @kwcantrell to submit his review and then this should be good to merge and solve conflicts.

Copy link
Collaborator

@kwcantrell kwcantrell left a comment

Choose a reason for hiding this comment

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

@antgonza thanks, this looks good.I just have a couple minor comments.


def shifting(bitlist, size=51):
"""Takes a list of 0-1s, splits in size and converts it to a list of int

Copy link
Collaborator

@kwcantrell kwcantrell Jul 7, 2020

Choose a reason for hiding this comment

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

It might be helpful to add a simple example in the documentation.

For example, if bitlist = [1, 0, 0, 0, 0, 1] and size = 3 then [4, 1] is returned.

@@ -8,11 +8,44 @@ define(["ByteArray"], function (ByteArray) {
* @param {Uint8Array} b The array that represents the tree structure
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
* @param {Uint8Array} b The array that represents the tree structure
* @param {Array} b The array that represents the tree structure


b = decoded_b;
}

/**
* @type {Uint8Array}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
* @type {Uint8Array}
* @type {Array}

@kwcantrell kwcantrell merged commit 3948ea8 into biocore:master Jul 7, 2020
@ElDeveloper
Copy link
Member

Thanks @antgonza @kwcantrell!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants