Merge sort#9

Open

chamberi wants to merge 140 commits intomasterfrom

Commits on Jan 16, 2017

Initial build out of node and bst structures.
CCallahanIV
committed
Added bst and test_bst files.
chamberi
committed
bst and test_bst files.
chamberi
committed
commiting initial insert tests.

William Benjamin Shields
authored and
William Benjamin Shields
committed
added insert method.
chamberi
committed
Merge branch 'bst' of https://github.com/chamberi/data-structures into bst
chamberi
committed
commit to pull remote changes.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Merge branch 'bst' of https://github.com/chamberi/data-structures into bst

William Benjamin Shields
authored and
William Benjamin Shields
committed
refactor of insert and tests.
chamberi
committed
merge conflict resolution.

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 17, 2017

fixed initial tests and insert function, new test for size.
chamberi
committed
commit to pull remote changes.

William Benjamin Shields
authored and
William Benjamin Shields
committed
commiting implementation of depth, balance, and tests.

William Benjamin Shields
authored and
William Benjamin Shields
committed
else to handle if node with value already exists on insert.

William Benjamin Shields
authored and
William Benjamin Shields
committed
edited docstrings.

William Benjamin Shields
authored and
William Benjamin Shields
committed
bst class can take an iter, built test fixture to fill bst.
chamberi
committed

Commits on Jan 18, 2017

added in_order function, refactor one test.
chamberi
committed
recursive function.

William Benjamin Shields
authored and
William Benjamin Shields
committed
in order traversal and test.

William Benjamin Shields
authored and
William Benjamin Shields
committed
tests
chamberi
committed
tests.
chamberi
committed
pre order traversal, beginning post order traversal.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Refactored post-order traverse.
chamberi
committed
commit to pull post_order trav.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Merge branch 'traversal-bst' of https://github.com/chamberi/data-structures into traversal-bst

William Benjamin Shields
authored and
William Benjamin Shields
committed
trying again, post order.
chamberi
committed
added one space.

William Benjamin Shields
authored and
William Benjamin Shields
committed
breadth first traversal.

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 19, 2017

beggining implementation of delete node function.

William Benjamin Shields
authored and
William Benjamin Shields
committed
finished, for now, delete function.
chamberi
committed
initial refactor of delete.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Merge branch 'delete-bst' of https://github.com/chamberi/data-structures into delete-bst

William Benjamin Shields
authored and
William Benjamin Shields
committed
added edge case catches for self.root holding value to delete.

William Benjamin Shields
authored and
William Benjamin Shields
committed
delete bug fix for parent of del node del node on right.

William Benjamin Shields
authored and
William Benjamin Shields
committed
fixed bug in find_min_parent helper function of delete.

William Benjamin Shields
authored and
William Benjamin Shields
committed
root removal root right has left min node has right.

William Benjamin Shields
authored and
William Benjamin Shields
committed
refactored contains function to cooperate with delete.

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 20, 2017

fixed delete node with multiple children bug.

William Benjamin Shields
authored and
William Benjamin Shields
committed
removed import pdb; pdb.set_trace() line in _find_min_parent.

William Benjamin Shields
authored and
William Benjamin Shields
committed
more tests for delete.
chamberi
committed
Merge branch 'delete-bst' of https://github.com/chamberi/data-structures into delete-bst
chamberi
committed
added tests, merged new delete code.
chamberi
committed

Commits on Jan 22, 2017

debug to past big_bst end delete tests. edited tests to check that new edge node is None.

William Benjamin Shields
authored and
William Benjamin Shields
committed
edited test file, added tests.

William Benjamin Shields
authored and
William Benjamin Shields
committed
added pre order and post order tests.

William Benjamin Shields
authored and
William Benjamin Shields
committed
commented out timeit section.

William Benjamin Shields
authored and
William Benjamin Shields
committed
new file, balanced bst. modified private functions to be marked as private. modified tests to use marked private functions where necessary.

William Benjamin Shields
authored and
William Benjamin Shields
committed
testing for balance function in some different cases.

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 23, 2017

removed corpse code from bst.py. added parent and red properties to balanced bst.

William Benjamin Shields
authored and
William Benjamin Shields
committed
edited docstrings.

William Benjamin Shields
authored and
William Benjamin Shields
committed
removed redundant assignment in delete del_node =

William Benjamin Shields
authored and
William Benjamin Shields
committed
fixtures for l, r, lr, rl, l/r/lr/rl with gc moves.
chamberi
committed
added parent attribute to nodes.

William Benjamin Shields
authored and
William Benjamin Shields
committed
small test changes.
chamberi
committed
merging to get tests.

William Benjamin Shields
authored and
William Benjamin Shields
committed
fixed initial tests.
chamberi
committed
Meng changes to test file. rge branch 'balance-bst' of https://github.com/chamberi/data-structures into balance-bst

William Benjamin Shields
authored and
William Benjamin Shields
committed
fixing tests.
chamberi
committed
setting up rebalance function to pass initial tests.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Meng initial tests. rge branch 'balance-bst' of https://github.com/chamberi/data-structures into balance-bst

William Benjamin Shields
authored and
William Benjamin Shields
committed
adding more tests.
chamberi
committed

Commits on Jan 24, 2017

added balance check for balance tree, see if tree is unbalanced.

William Benjamin Shields
authored and
William Benjamin Shields
committed
added 1-14 sequential insert for balancing tests.
chamberi
committed
tests from 14 down to 1 added for balance bst.
chamberi
committed
implementation of left and right rotations.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Meng tests for left rotations.rge branch 'balance-bst' of https://github.com/chamberi/data-structures into balance-bst

William Benjamin Shields
authored and
William Benjamin Shields
committed
beginning implementation of _left_right and _right_left rotations.

William Benjamin Shields
authored and
William Benjamin Shields
committed
fixed all but one test.
chamberi
committed
Merge branch 'balance-bst' of https://github.com/chamberi/data-structures into balance-bst

William Benjamin Shields
authored and
William Benjamin Shields
committed
tests for left_right rotations.

William Benjamin Shields
authored and
William Benjamin Shields
committed
tests for right left rotations.

William Benjamin Shields
authored and
William Benjamin Shields
committed
left-right and right-left various functions.
chamberi
committed
Merge branch 'balance-bst' of https://github.com/chamberi/data-structures into balance-bst
chamberi
committed
Meng down implementsations of left right and right left rotations.rge branch 'balance-bst' of https://github.com/chamberi/data-structures into balance-bst

William Benjamin Shields
authored and
William Benjamin Shields
committed
trying to fix.
chamberi
committed
added file for hash_table.py

William Benjamin Shields
authored and
William Benjamin Shields
committed
initial implementation of hashtable. created test file.

William Benjamin Shields
authored and
William Benjamin Shields
committed
fixed left-right and right-left.
chamberi
committed
Meng left-right and right-left rotations.rge branch 'balance-bst' of https://github.com/chamberi/data-structures into balance-bst

William Benjamin Shields
authored and
William Benjamin Shields
committed
added more double rotation tests.
chamberi
committed
fixed test for right left rotation.

William Benjamin Shields
authored and
William Benjamin Shields
committed
edited description.

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 25, 2017

list comprehensions, check for existing key.

William Benjamin Shields
authored and
William Benjamin Shields
committed
halfway thru refactoring to work for 3 nodes on delete.
chamberi
committed

Commits on Jan 26, 2017

added travis yml file for data structures.
chamberi
committed
tests for hashtable using words file. added colin ben hash. cleaned up code.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Merge branch 'hash-table' of https://github.com/chamberi/data-structures into hash-table
chamberi
committed
added readme and deleted corpse code.
chamberi
committed
added coverage and info to readme.
chamberi
committed
started the docstrings.
chamberi
committed
fix for deletion of root child.

William Benjamin Shields
authored and
William Benjamin Shields
committed
trie functions, untested.

William Benjamin Shields
authored and
William Benjamin Shields
committed
resolving merge conflict.

William Benjamin Shields
authored and
William Benjamin Shields
committed
debugging trie.

William Benjamin Shields
authored and
William Benjamin Shields
committed
debugged remove method.

William Benjamin Shields
authored and
William Benjamin Shields
committed
decremented size, added doc strings.
chamberi
committed
changed travis yml file to stop email notications.
chamberi
committed
credentials.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Merge branch 'trie' of https://github.com/chamberi/data-structures into trie

William Benjamin Shields
authored and
William Benjamin Shields
committed
beginning implementation of traversal of trie.

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 27, 2017

start of the trie traversal.
chamberi
committed
tests for trie_trav with parameters and fixtures.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Merge branch 'trie-traversal' of https://github.com/chamberi/data-structures into trie-traversal

William Benjamin Shields
authored and
William Benjamin Shields
committed
while loop in traversal.

William Benjamin Shields
authored and
William Benjamin Shields
committed
recursive traversal method for trie.

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 29, 2017

full traversal, not specific to start.

William Benjamin Shields
authored and
William Benjamin Shields
committed
tests for trie and commented out portions of traversal in trie trav.

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 30, 2017

added size and simple remove tests.
chamberi
committed
trying to fix tricky overlapping words situation.
chamberi
committed
fixed tests.
chamberi
committed
passing tests.

William Benjamin Shields
authored and
William Benjamin Shields
committed
fixes for tests in remove method and insert method. passes tests for strange inputs. edited test file last test takes in complex input.

William Benjamin Shields
authored and
William Benjamin Shields
committed
removed corpse code
chamberi
committed
started files with docstrings.
chamberi
committed
test file for insertion_sort.py

William Benjamin Shields
authored and
William Benjamin Shields
committed
final tests for trie.py.

William Benjamin Shields
authored and
William Benjamin Shields
committed
initial insertion sort.
chamberi
committed
Merge branch 'insertion-sort' of https://github.com/chamberi/data-structures into insertion-sort
chamberi
committed
fixed tests, changed name of function.
chamberi
committed
added tests of words for insertion sort test
chamberi
committed
timeit functionality for insertion sort.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Merge branch 'insertion-sort' of https://github.com/chamberi/data-structures into insertion-sort

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 31, 2017

implementation of recursive merge sort method. surprised it works so far.

William Benjamin Shields
authored and
William Benjamin Shields
committed
made merge a private method.

William Benjamin Shields
authored and
William Benjamin Shields
committed
merge sort of empty list returns the list.

William Benjamin Shields
authored and
William Benjamin Shields
committed
working on best worst case timeit functions.

William Benjamin Shields
authored and
William Benjamin Shields
committed
best and worst case times for merge sort and insertion sort.

William Benjamin Shields
authored and
William Benjamin Shields
committed
added tests, added readme tests, travis, docstrings, timeit.
chamberi
committed
removed random sizes from timeit lists.

William Benjamin Shields
authored and
William Benjamin Shields
committed
redid readme with updated timeit numbers.
chamberi
committed

Commits on Feb 1, 2017

timed lists are of the same size. timed lists have the same elements, different orders.

William Benjamin Shields
authored and
William Benjamin Shields
committed
Merge branch 'merge-sort' of https://github.com/chamberi/data-structures into merge-sort

William Benjamin Shields
authored and
William Benjamin Shields
committed
reordered timeit functions in merge sort. insertion sort timed lists same size, same contents, different orders.

William Benjamin Shields
authored and
William Benjamin Shields
committed
edited readme via selenas suggestions. deleted bestlist and worstlist functions.

William Benjamin Shields
authored and
William Benjamin Shields
committed
removed bestlist and worstlist form insertion sort.

William Benjamin Shields
authored and
William Benjamin Shields
committed
fixed docstring for random list.

William Benjamin Shields
authored and
William Benjamin Shields
committed
docstring fixes, naming fixes, slice instead of pop, randomlist takes size.

William Benjamin Shields
authored and
William Benjamin Shields
committed
readme edited.

William Benjamin Shields
authored and
William Benjamin Shields
committed
coverage report fix.

William Benjamin Shields
authored and
William Benjamin Shields
committed
readme formatting.

William Benjamin Shields
authored and
William Benjamin Shields
committed