Skip to content

FEAT: List and Linked List Data Packages + Linked List Mergesort Algorithm #90

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.

Sign up for GitHub

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

Open
wants to merge 91 commits into
base: 2024_sem2
Choose a base branch
from
Open

FEAT: List and Linked List Data Packages + Linked List Mergesort Algorithm #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
04e86f3
Added in placeholder files for all needed file changes. Prototype alg…
jiafeilin1 Aug 13, 2024
74fde46
Empty Prototype Set up
jiafeilin1 Aug 18, 2024
752f7f4
Added JEFF's DIAGRAM.drawio
jiafeilin1 Aug 19, 2024
207f367
Added JEFF's DIAGRAM.drawio
jiafeilin1 Aug 19, 2024
31b3644
Added JEFF'S DIAGRAM.drawio
jiafeilin1 Aug 19, 2024
75ca194
Set up link to ListTracer from algorithm controller. Still non functi…
jiafeilin1 Aug 19, 2024
b2406cb
Merge remote-tracking branch 'origin/Team2Main' into Team2Main
jiafeilin1 Aug 19, 2024
25eb700
Pseudocode finished with bookmarks added to controller
carlieyung Aug 20, 2024
a7ee23f
Merge remote-tracking branch 'origin/Team2Main' into Team2Main
carlieyung Aug 20, 2024
4bcfe64
Linked List Data Structure and List Data Structure Added
carlieyung Aug 28, 2024
0ca923b
Resolved error with parameter files. Blocker currently at data struct…
jiafeilin1 Aug 28, 2024
e89f540
Merge branch '2024_sem2' into dev
lee-naish Sep 1, 2024
8ca8f05
Merge branch '2024_sem2' into dev
lee-naish Sep 2, 2024
0b741d5
Isolated bug fixing on list renderer
jiafeilin1 Sep 4, 2024
b92a55d
Completed initial framework for list renderer. Fixed issue with contr…
jiafeilin1 Sep 4, 2024
879500f
Adding in shapes, linking up css file. using rectangle instead. Moved…
jiafeilin1 Sep 5, 2024
5687d78
Expanded values to element data structure to include index and status…
jiafeilin1 Sep 5, 2024
fc98827
fixed prototype pseudocode display bug. Lines with missing bookmarks …
Adam-YY Sep 5, 2024
dd1e8cc
CSS now includes 3 classes for selected, creation of arrow and null p…
jiafeilin1 Sep 7, 2024
b6a38d4
Deleting useless documents
jiafeilin1 Sep 8, 2024
57e9fc6
Merge remote-tracking branch 'origin/Team2Main' into Team2Main
jiafeilin1 Sep 8, 2024
f04e424
First Prototype of splitList is complete. Added helper functions arou…
jiafeilin1 Sep 8, 2024
28b929d
list renderer supports multiple lists and list tracer has new functions
yixingcherryxu1 Sep 10, 2024
b6fa488
updated list tracer and renderer and made a few debug changes
yixingcherryxu1 Sep 10, 2024
94830a1
debugged the listtracer, listrenderer and prototype.js files with mul…
yixingcherryxu1 Sep 14, 2024
bf2ddd8
Merge branch 'algorithms-in-action:dev' into Team2Main
carlieyung Sep 16, 2024
100259c
updated linked list to support multiple and add in ids, updated linke…
yixingcherryxu1 Sep 25, 2024
a945edf
'feat': added in multiple linked list support in the list renderer an…
yixingcherryxu1 Sep 25, 2024
e778401
'feat': added in a searchNode function in the list tracer
yixingcherryxu1 Sep 25, 2024
e3c750c
'fix': issues around linked list initiation in tracer and renderer
jiafeilin1 Sep 28, 2024
ac68b18
'feat': Rendering of multi list with animation and label
jiafeilin1 Sep 28, 2024
6a659db
'fix': class separation of labels and nodes
jiafeilin1 Sep 30, 2024
dcaea32
'feat': Splitting lists and renderer support
jiafeilin1 Sep 30, 2024
a7cd585
'feat': Renderer Vertical layering + list split
jiafeilin1 Sep 30, 2024
493c88b
'fix': Split function working as intended now
jiafeilin1 Sep 30, 2024
49c2d83
'fix': Labels rendering messing up positioning of nodes
jiafeilin1 Sep 30, 2024
9a3bebe
'feat': shift right for list, fix for empty index counts
jiafeilin1 Sep 30, 2024
cf0dae0
'fix': Issue with update indices and stacking
jiafeilin1 Sep 30, 2024
83979cf
'fix': Issue with deletion and insertion of list in moveList
jiafeilin1 Sep 30, 2024
a0dbdab
'feat': added and modified more functions from the 2darraytracer into…
yixingcherryxu1 Oct 1, 2024
6f57582
'feat': Arrows not displacing nodes and inclusion of all arrow direct…
jiafeilin1 Oct 1, 2024
1182507
'feat': Tracer support for moving arrows in 5 directions
jiafeilin1 Oct 1, 2024
3f2aa94
'chore': Additional colour for sorted. clean on pseudocode
jiafeilin1 Oct 1, 2024
ce8b8eb
Merge branch 'Team2Main' into LinkedListRender
carlieyung Oct 4, 2024
a68d183
'chore': syntax issue
jiafeilin1 Oct 4, 2024
62a3f3b
Merge pull request #2 from jiafeilin1/LinkedListRender
carlieyung Oct 4, 2024
9bc15e8
feat: controller working up until left side recursion
Adam-YY Oct 8, 2024
21b6cba
feat: more controller logic implemented
Adam-YY Oct 8, 2024
808dc9c
'chore': Fix issue with multiple list rendering
jiafeilin1 Nov 4, 2024
3ba7f03
'chore': Quick fix with selecting R
jiafeilin1 Nov 4, 2024
3c8c20a
'feat': Mergesort recursion includes both left and right branches spl…
jiafeilin1 Nov 5, 2024
a7d6b9a
'chore': Bug around selection
jiafeilin1 Nov 5, 2024
661eb36
'chore': Patching in working condition. Progressing to merging lists …
jiafeilin1 Nov 5, 2024
979dfbf
'feat': Expansion of merge and sort functions in tracer. First iterat…
jiafeilin1 Nov 6, 2024
8be40ca
'feat': Merge and sort overall frames completed. animation within lar…
jiafeilin1 Nov 6, 2024
09e64a3
'feat': Updated css to add layer for linked list container, allowing …
jiafeilin1 Nov 6, 2024
91bb3e8
'chore': Cleaned variable assigning to better reflect action
jiafeilin1 Nov 6, 2024
ceb2a8e
'chore': Fixed renderer issue with not displaying layers in order
jiafeilin1 Nov 6, 2024
86cea7e
'feat': Prototype of iterative updating of pointers when sorting
jiafeilin1 Nov 12, 2024
8e0215e
'feat': Using prototype pseudocode for easier debugging
jiafeilin1 Nov 12, 2024
42c23c4
'chore': Fix of patch and select functions
jiafeilin1 Nov 12, 2024
93981ca
'feat': Selection of next nodes and setting arrow direction
jiafeilin1 Nov 12, 2024
dde400f
'feat': Patching of M node is complete. Need to fix arrow logic
jiafeilin1 Nov 12, 2024
bd89991
'feat': Arrow directions fixed. slight bug still with end of list and…
jiafeilin1 Nov 12, 2024
e8c7326
'feat': Hidden nodes functional
jiafeilin1 Nov 12, 2024
574e5ff
'feat': Updated ListTracer.js to have the functionality of LinkedList…
carlieyung Nov 12, 2024
b4467c3
'chore': fixed issue with lists not being defined properly in the spl…
carlieyung Nov 13, 2024
e517bf9
Merge pull request #3 from jiafeilin1/ListPackageUpdate
carlieyung Nov 13, 2024
336e9f6
'feat': Completion of controller.
jiafeilin1 Nov 13, 2024
a4934c4
Merge remote-tracking branch 'origin/ControllerDebug' into Controller…
jiafeilin1 Nov 13, 2024
d2a3292
'feat': Syncing up of bookmarks
jiafeilin1 Nov 13, 2024
ba397bb
Merge branch 'Team2Main' into ControllerDebug
carlieyung Nov 13, 2024
29b3dea
Merge pull request #4 from jiafeilin1/ControllerDebug
carlieyung Nov 13, 2024
d712143
'chore': Clean up of prototype -> linked list mergesort
jiafeilin1 Nov 13, 2024
f7da8a2
'chore': Bug fix with add null.
jiafeilin1 Nov 13, 2024
0930d51
'chore': Sync parameters
jiafeilin1 Nov 13, 2024
5bacff7
'chore': Bug fix with addNull
jiafeilin1 Nov 13, 2024
79dca56
'chore': Fix with symbols moving out of sync with nodes
jiafeilin1 Nov 13, 2024
ebda0ba
'chore': Fix with symbols moving out of sync with nodes
jiafeilin1 Nov 13, 2024
ba195bf
'chore': addNull Bug
jiafeilin1 Nov 13, 2024
08c3c4b
'chore': Logic with ignoring nulls at end of list
jiafeilin1 Nov 13, 2024
21cfdb8
'chore': Logic with ignoring nulls at end of list
jiafeilin1 Nov 13, 2024
9c2f8f4
'chore': redundant code cleanup
jiafeilin1 Nov 13, 2024
c7d5e81
'chore': redundant code cleanup
jiafeilin1 Nov 13, 2024
b0ad39f
'Test': Test suite implemented and tested
Adam-YY Nov 14, 2024
e3f1d0f
Merge pull request #5 from jiafeilin1/TestSuite
carlieyung Nov 15, 2024
cde349e
"Test": More test cases implemented and bugs fixed
Adam-YY Nov 15, 2024
ad34d9d
Merge pull request #6 from jiafeilin1/TestSuite
carlieyung Nov 15, 2024
2f29740
Merge remote-tracking branch 'upstream/2024_sem2' into Team2Main
yixingcherryxu1 Nov 15, 2024
652f041
Handover Documentation uploaded
jiafeilin1 Nov 15, 2024
1913eca
revert "Merge remote-tracking branch 'upstream/2024_sem2' into Team2M…
jiafeilin1 Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions .github/workflows/url.yml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

258 changes: 247 additions & 11 deletions .idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed docs/Colour-Guidelines-20241011.pdf
View file
Open in desktop
Binary file not shown.
Binary file added docs/Handover Documentation.pdf
View file
Open in desktop
Binary file not shown.
Binary file removed docs/Homepage-Guidelines-20241020.pdf
View file
Open in desktop
Binary file not shown.
Binary file removed docs/URL-Code-Implementation-Guideline-20241011.pdf
View file
Open in desktop
Binary file not shown.
Loading