v1.6.1 Feature List

[caesar0301]

v1.6.1 Feature List:

• Support subtrees with inter-node pointers (Support Nodes' tree-wise bpointer/fpointers #127)
• Support composite (derived) tree class
• Replace long if-else blocks with look-up tables (Replace long if-else blocks with look-up tables. #109)
• Shallow pastes to multiple trees breaks level/depth (Shallow pastes to multiple trees breaks level/depth #88 Shallow paste tests for #88 #131 )
• Ability to paste trees at root level (How to join two trees with the same root? #87 Merge multiple trees on root #87 #134 )
• Fix removal of root node (Cannot add root node after removing previous root #119 Fix removal of root node #130)
• Tree merge feature (#87 tree merge feature #138)
• Optional print in show method (Please, remove the last new line in tree.show() #139)

[caesar0301]

Welcome to join me on branch dev

[leonardbinet]

I'm not sure to get it, looking at dev branch commits I find no trace of my previous commits, did you remove them?

[leonardbinet]

Ah I guess you squashed commits

[caesar0301]

@leonardbinet Yes, I squashed and reviewed the patch last weekend. Your *_in_tree functions are replaced by new predecessor and successors interfaces, which deprecate previous bpointer and fpointer. An optional arg tree_id is appended to functions such as is_leaf and is_root without proposing new interfaces.

TODO: before we finish #127:

1. make tree_id as optional arg in setter and getter of predecessor & successors. Support Nodes' tree-wise bpointer/fpointers #127 is an enhanced feature of logic subtrees. It should not effect the clearness of existing interfaces for some simple use cases.
2. more UTs to cover the potential errors after introducing this tree-wise feature.

[leonardbinet]

@caesar0301 well done for the implementation, I agree with you it is more elegant this way 👍

However why was it necessary for you to squash commits? If you want me to squash my commits in a single one to avoid having too many, no problem I understand 🙂. But the problem here is that you totally deleted my contribution from the history of the repository (as detailed here: isaacs/github#1303).

This quite matters to me, since I see contributions to open-source projects are the main way for me to showcase my capabilities to potential recruitors etc. In this case I won't appear in git blame, history, or contributors of the repo, whereas I spend quite an effort trying to make a meaningful contribution.
Would you consider restoring the history?

If so, you could simply repush feature/tree-wise-node-pointer branch (#129) so I can fetch it, squash my commits in a single one, and rebase with your following commits, I would then push this branch in dev2 so you can validate if that suits you.

[leonardbinet]

Actually, I could restore history without requiring the feature/tree-wise-node-pointer branch. I simply squashed my commits and cherry-picked your following ones:

The dev2 branch is now at the exact same point than dev branch, with only difference being my squashed commit 4dde1fd833bb69a5e8375072575c4c091308ad60:

➜  treelib git:(dev2) git fetch upstream
➜  treelib git:(dev2) git reset upstream/dev2
➜  treelib git:(dev2) git status
On branch dev2
nothing to commit, working tree clean
➜  treelib git:(dev2) git reset upstream/dev
➜  treelib git:(dev2) git status
On branch dev2
nothing to commit, working tree clean

I now only need to force-push dev2 branch into dev branch and we're good to go, is it ok for you?

[leonardbinet]

FYI I would rather first solve above situation before merging #130 and #134.

[leonardbinet]

FYI to merge #130 and #134 I pushed the branch with restored history in dev, and kept a copy of your initial branch dev-> dev_save so you can compare.