Natalie Pueyo
|
9d18b0d213
fixed a bunch of conflicts
|
8 роки тому |
Natalie Pueyo
|
f032310f8e
cleaned up AVL stuff but not much else
|
8 роки тому |
Natalie Pueyo
|
b99051e2fb
final program2 changes
|
8 роки тому |
Natalie Pueyo
|
75d6e75a46
added getParent, getLeft, getRight funtions to BST which will lead to figuring out the height of each node
|
8 роки тому |
Natalie Pueyo
|
d4d523b275
sorry, *this* is the initial commit for program 3 files
|
8 роки тому |
Natalie Pueyo
|
5a9fd98109
initial commit for program 3 files
|
8 роки тому |
Natalie Pueyo
|
2a0af3cb42
removeKey needed a conditional to determine if heapify up or down was required.
|
8 роки тому |
Natalie Pueyo
|
92ed1aec30
checking against examples provided by professor, the results are similar but not identical for all the medium-medium examples.
|
8 роки тому |
Natalie Pueyo
|
47c3845e0e
added script to compile using the makefile (a requirement...)
|
8 роки тому |
Natalie Pueyo
|
f9576f3859
wrote buildheap code which uses new addition to priorityqueue to print out a heap built in buildheap using JSON format
|
8 роки тому |
Natalie Pueyo
|
c415ae9a77
fixed priorityqueue removeMax so that it and not the heapify method changes the array size. Fixed the mysterious disappearing numbers bug
|
8 роки тому |
Natalie Pueyo
|
71be100c9a
working on heapsort with positive results for the first sample array and fairly bad results on the next one. Issues include disappearances of numbers and some numbers coming up twice.
|
8 роки тому |
Natalie Pueyo
|
554dc9d760
added heapsort to makefile and added json traversal to heapsort
|
8 роки тому |
Natalie Pueyo
|
b846e12f89
fixed the mysterious removeMax and removeKey zeros. Priority Queue seems to be working now
|
8 роки тому |
Natalie Pueyo
|
f43160cb0b
figured out my mysterious zeros problem is coming from heapifyDown(). Have to figure out exactly from where.
|
8 роки тому |
Natalie Pueyo
|
1e94963547
fixed a number of class methods which had minor bugs, especially in the for loops. Heapify down having some issues with zeros not disappearing as they should.
|
8 роки тому |
Natalie Pueyo
|
e4789e629e
a few of the given examples
|
8 роки тому |
Natalie Pueyo
|
f03c24f50e
began working on the Makefile. Issues referencing the class and I don't know if it's the .h file or the makefile. Began adding basic json capabilities to heapsort
|
8 роки тому |
Natalie Pueyo
|
4ced274198
finished initial priority queue attempt. Starting second part to get test priority queue
|
8 роки тому |
Natalie Pueyo
|
01982ec44c
worked on change() to make it follow the assignment's directives more correctly
|
8 роки тому |
Natalie Pueyo
|
08edb6af2b
changed git directory to organize all the homeworks
|
8 роки тому |
Natalie Pueyo
|
11b1c5f87f
Prof wanted csv output to screen not to a csv file... also fixed the time to give actual float-y numbers. It had been casted incorrectly
|
8 роки тому |
Natalie Pueyo
|
c76b989582
switched to clock() and CLOCKS_PER_SEC to measure time. Also removes all the files that will not be turned in
|
8 роки тому |
Natalie Pueyo
|
d117883c2b
all three executables are giving the same answers as the results from the Prof's examples
|
8 роки тому |
Abhinav Sinha
|
2e0b9e2032
fixed mergesort, removed generated files from git
|
8 роки тому |
Natalie Pueyo
|
7a184d89ad
Merge branch 'master' of https://github.com/epukaza/natalie_code
|
8 роки тому |
Natalie Pueyo
|
16aae392df
merge sort is halfway there
|
8 роки тому |
Abhinav Sinha
|
6505effbf0
added gitignore
|
8 роки тому |
Natalie Pueyo
|
7eda5a661d
program1 info PDF
|
8 роки тому |
Natalie Pueyo
|
ee52863924
new JSON files to see if the executables are working show that merge and quick sort evaluations aren't working
|
8 роки тому |