Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
bc5627f
Hashing tab created, added explanation and more
nicked1205 Aug 13, 2024
1fe79aa
Merge pull request #1 from tuankhainguy/nick
nicked1205 Aug 13, 2024
9bae5c7
pseudocode indexing and formatting
tuankhainguy Aug 13, 2024
8576ce2
pseudocode works
nicked1205 Aug 13, 2024
71c649d
Adding Parameter for Hashing
tuankhainguy Aug 16, 2024
06280b7
Chore: Update index and format file name
tuankhainguy Aug 19, 2024
1a96b27
Started illustration part
nicked1205 Aug 20, 2024
1747413
basic parameters
WesleyJuraschek Aug 27, 2024
fdf416f
Merge pull request #3 from tuankhainguy/Parameters
tuankhainguy Aug 28, 2024
5a4753f
start implementing logic to controller
tuankhainguy Aug 28, 2024
1fe139c
start implementing logic to controller
tuankhainguy Aug 30, 2024
bc3063e
start implementing logic to controller
tuankhainguy Aug 30, 2024
a0e2ac0
delete some unuse files
nicked1205 Sep 3, 2024
aef136f
mid-panel now works
tuankhainguy Aug 30, 2024
baf290f
Merge branch '2024_sem2' into hash_controller
tuankhainguy Sep 3, 2024
69a4d70
Merge pull request #6 from tuankhainguy/hash_controller
tuankhainguy Sep 3, 2024
e6ec3b0
Khai/array (#7)
tuankhainguy Sep 11, 2024
ee2a58d
quick fix
tuankhainguy Sep 11, 2024
119ce29
Merge branch 'algorithms-in-action:2024_sem2' into 2024_sem2
tuankhainguy Sep 11, 2024
ed091f1
khai/array (#8)
tuankhainguy Sep 15, 2024
c008bc0
double hashing chunker done
nicked1205 Sep 17, 2024
07014af
Merge branch '2024_sem2' into double_hash_chunker
nicked1205 Sep 17, 2024
585dd2e
Merge pull request #9 from tuankhainguy/double_hash_chunker
nicked1205 Sep 17, 2024
9d147e7
Search function working for LP small table, also added instructions a…
WesleyJuraschek Sep 17, 2024
bf066e8
Search function now working for DH, and large and small table. Also c…
WesleyJuraschek Sep 18, 2024
d17c9e5
Merge branch '2024_sem2' into SearchHashing
nicked1205 Sep 18, 2024
f5c4747
Merge pull request #11 from tuankhainguy/SearchHashing
nicked1205 Sep 18, 2024
99efc09
added insertion test files for both LP and DH, made minor adjustments…
nicked1205 Sep 19, 2024
a83ee8b
Merge branch '2024_sem2' into nick_add_insert_test_files
nicked1205 Sep 19, 2024
03c757d
Found bug in Vercel deployment
nicked1205 Sep 19, 2024
c3ba920
Merge pull request #12 from tuankhainguy/nick_add_insert_test_files
nicked1205 Sep 19, 2024
cac78da
Updated pseudocode since previous branch, josh/hash-updates, had merg…
JoshuaLapitan Sep 19, 2024
f93a398
Merge branch '2024_sem2' into josh/pseudocode-merge
JoshuaLapitan Sep 19, 2024
435be30
Merge pull request #13 from tuankhainguy/josh/pseudocode-merge
JoshuaLapitan Sep 19, 2024
32eb19d
fixed searching bug, minor changes in pseudocode files
nicked1205 Sep 19, 2024
f7a684a
Merge branch '2024_sem2' into nick_fixbug5
nicked1205 Sep 19, 2024
720f63e
Merge pull request #14 from tuankhainguy/nick_fixbug5
nicked1205 Sep 19, 2024
7c1cb15
Updated pseudocode for pseudocode/HashingSearch.js to match the style…
JoshuaLapitan Sep 19, 2024
b84ac4e
Merge pull request #15 from tuankhainguy/hotfix/hash_search_pseudocod…
JoshuaLapitan Sep 19, 2024
c2d3f8d
Fixed indentation error in hash search pseudocode.
JoshuaLapitan Sep 20, 2024
298e83c
Merge pull request #16 from tuankhainguy/bugfix/hash-search-pseudocod…
JoshuaLapitan Sep 20, 2024
aaee8ea
Added HashSearch tests
nicked1205 Sep 24, 2024
415962e
Merge pull request #17 from tuankhainguy/nick_add_search_test_file
nicked1205 Sep 24, 2024
07d7ecd
Updated psudocode for insertion of elements into the hash table so th…
JoshuaLapitan Sep 24, 2024
fd7d00d
added testing workflow
nicked1205 Sep 24, 2024
0f159bb
Merge pull request #19 from tuankhainguy/nick_add_workflow
nicked1205 Sep 24, 2024
bf62563
Merge branch '2024_sem2' into josh_pseudocode_update
JoshuaLapitan Sep 24, 2024
d4df8aa
Merge pull request #21 from tuankhainguy/josh_pseudocode_update
JoshuaLapitan Sep 24, 2024
e7b093b
Updated instructions for search and insertions, as well as changed th…
JoshuaLapitan Sep 24, 2024
14edea8
Merge pull request #22 from tuankhainguy/josh_modify_instructions
JoshuaLapitan Sep 24, 2024
d99d31b
Updated psudocode for insertion of elements into the hash table so th…
JoshuaLapitan Sep 24, 2024
6aadbcc
Added HashSearch tests
nicked1205 Sep 24, 2024
6095eb6
added testing workflow
nicked1205 Sep 24, 2024
8f583f1
Updated instructions for search and insertions, as well as changed th…
JoshuaLapitan Sep 24, 2024
421dc99
Fix bug number 8, duplicate inserts now do not modify the table.
JoshuaLapitan Sep 24, 2024
b4a9284
Merge pull request #23 from tuankhainguy/josh_bugfix8
JoshuaLapitan Sep 24, 2024
9ea6065
Added graph colors, changed pointer for insertion to i, fixed small g…
nicked1205 Sep 24, 2024
2417358
Merge pull request #24 from tuankhainguy/nick_add_graph_colors
nicked1205 Sep 24, 2024
2354a5d
Added bulk insert, without instant insertion when encounter bulk
nicked1205 Sep 24, 2024
6feb411
Merge pull request #25 from tuankhainguy/nick_add_bulk_insert
nicked1205 Sep 24, 2024
824255a
Change larger table layout (#27)
tuankhainguy Sep 25, 2024
0f62ff8
khai/array (#28)
tuankhainguy Sep 25, 2024
e7bc26b
fixed bug 10
nicked1205 Sep 25, 2024
063bc6d
Merge pull request #29 from tuankhainguy/nick_fixbug10
nicked1205 Sep 25, 2024
11a0ed7
Added comments and did minor cleanups
nicked1205 Sep 25, 2024
8aacca8
Merge branch '2024_sem2' into nick_add_comments_cleanup
nicked1205 Sep 25, 2024
239a319
Update HashingSearch.js to get rid of deployment bug
nicked1205 Sep 25, 2024
3fdccf3
Merge pull request #30 from tuankhainguy/nick_add_comments_cleanup
nicked1205 Sep 25, 2024
e514263
Fixed deployment bug missed from merging
nicked1205 Sep 25, 2024
92023c7
improved array display
nicked1205 Sep 25, 2024
7d21908
Merge pull request #31 from tuankhainguy/nick_modify_table_display
nicked1205 Sep 25, 2024
ebea778
Made bulk insert takes less time, still not instant
nicked1205 Sep 26, 2024
4d24cc0
Merge pull request #32 from tuankhainguy/nick_modify_bulk_insert
nicked1205 Sep 26, 2024
f44d0a3
Small modifications and small bugs fixed, added check for valid ranges
nicked1205 Sep 26, 2024
e503c5a
Merge pull request #33 from tuankhainguy/nick_modify_bulk_insert
nicked1205 Sep 26, 2024
fc62485
Modified insertion test file for new inputting method, added bulk ins…
nicked1205 Sep 28, 2024
54f9c9a
Merge pull request #34 from tuankhainguy/nick_modify_insert_test_file
nicked1205 Sep 28, 2024
d001b69
Added deletion function and updated relevant indexes. Did not update …
JoshuaLapitan Sep 28, 2024
4aabb1f
Merge pull request #35 from tuankhainguy/josh_add_hash_delete
JoshuaLapitan Sep 28, 2024
a846dbe
Added hash delete input checks and made it functional, major tweaks o…
nicked1205 Sep 28, 2024
0c86ff8
Merge pull request #36 from tuankhainguy/nick_modify_hash_delete
nicked1205 Sep 28, 2024
1cc8db1
fix: Typo resulted in TypeError when executing translateInput function
tuankhainguy Sep 28, 2024
e4cdb19
Small modifications to code lines, changed stat display to distinguis…
nicked1205 Sep 29, 2024
8682dba
Merge pull request #37 from tuankhainguy/nick_modify_stats_display
nicked1205 Sep 29, 2024
1372fab
Changed fullness check from the start to during runtime of algo
nicked1205 Sep 29, 2024
6148cc1
Merge pull request #38 from tuankhainguy/nick_modify_check_fullness
nicked1205 Sep 29, 2024
81d2a42
Merge remote-tracking branch 'origin/2024_sem2' into 2024_sem2
WesleyJuraschek Oct 1, 2024
0715135
Added extra information to "more" tab, also fixed bug 13
WesleyJuraschek Oct 1, 2024
771ad48
Updated instructions and slightly modified Background
WesleyJuraschek Oct 1, 2024
76d8196
Fixed typos and included instructions for better specificity as well …
JoshuaLapitan Oct 1, 2024
4043389
Merge pull request #39 from tuankhainguy/josh_modify_instructions
JoshuaLapitan Oct 1, 2024
52940bd
Revised instructions to introduce formatting and update valid inputs/
JoshuaLapitan Oct 1, 2024
7baeb1b
Finalised background tab
WesleyJuraschek Oct 1, 2024
f9681b4
Merge branch '2024_sem2' into wes_update_extra_tabs
WesleyJuraschek Oct 1, 2024
c32321f
Merge pull request #41 from tuankhainguy/wes_update_extra_tabs
WesleyJuraschek Oct 1, 2024
ff6d9ae
Merge pull request #40 from tuankhainguy/josh_modify_instructions_2
JoshuaLapitan Oct 3, 2024
b7a7942
feat: extend table when full
tuankhainguy Oct 3, 2024
2cf5182
feat: table check for 80% full
tuankhainguy Oct 3, 2024
a0d067b
fix: Array2DTracer set function for split table keeps old array data bug
tuankhainguy Oct 3, 2024
ebfd890
feat: allow table of size 23 to have pointer
tuankhainguy Oct 3, 2024
21e44ea
feat: implement instant bulk insert
tuankhainguy Oct 5, 2024
d462c8a
khai/bulk_instant
tuankhainguy Oct 5, 2024
a571fac
feat: differentiate between index and value row
tuankhainguy Oct 5, 2024
6d1c034
fix: highlights not overriding properly
tuankhainguy Oct 5, 2024
fa5312c
refactor: change magic number to existing var
tuankhainguy Oct 5, 2024
bf5575a
khai/index_value_diff
tuankhainguy Oct 5, 2024
43856b1
Merge branch '2024_sem2' into khai/extend_table
tuankhainguy Oct 5, 2024
e001378
fix: highlights not showing
tuankhainguy Oct 5, 2024
6487e6f
fix: highlights not bypassed
tuankhainguy Oct 6, 2024
5c065c7
feat: added radio button to toggle extend table
tuankhainguy Oct 6, 2024
820f440
feat: implement reinsertion according to client's
tuankhainguy Oct 8, 2024
e6efa44
Created hash delete tests, and rewrote hash_search and hash_delete wh…
JoshuaLapitan Oct 8, 2024
4ae8750
Merge pull request #44 from tuankhainguy/josh_add_deletion_tests
JoshuaLapitan Oct 8, 2024
a830d72
Changed DH function to be side by side
WesleyJuraschek Oct 8, 2024
7eb7df6
Merge pull request #45 from tuankhainguy/wes_change_DH_function_position
WesleyJuraschek Oct 8, 2024
75f4909
Merge remote-tracking branch 'upstream/2024_sem2' into 2024_sem2
tuankhainguy Oct 8, 2024
ceeeea1
fix: temporary fix for controller to work with pseudocode
tuankhainguy Oct 8, 2024
9058f10
fix: npm error
tuankhainguy Oct 8, 2024
9209fe3
Merge branch '2024_sem2' into khai_extend_table
tuankhainguy Oct 8, 2024
de408e7
feat: Reinsertion keys in caption
tuankhainguy Oct 10, 2024
a851d97
fix: wrong captions during table expansion
tuankhainguy Oct 10, 2024
62357ff
feat: improve caption for reinsertions
tuankhainguy Oct 10, 2024
cc2b072
feat: implement table expansion
tuankhainguy Oct 10, 2024
f890bee
fix: bulk insert not working
tuankhainguy Oct 15, 2024
83e30c3
Merge pull request #48 from tuankhainguy/khai_hotfix
tuankhainguy Oct 15, 2024
36f70aa
fix: bulk insert not update total insertions
tuankhainguy Oct 15, 2024
1c783b2
Merge pull request #49 from tuankhainguy/khai_hotfix
tuankhainguy Oct 15, 2024
0bd72d5
fix: wrong check table full caption
tuankhainguy Oct 15, 2024
eb7e57c
Merge pull request #50 from tuankhainguy/khai_hotfix
tuankhainguy Oct 15, 2024
d7ba388
fix: FULL_SIGNAL is not correctly caught
tuankhainguy Oct 15, 2024
3dbe37b
Merge pull request #51 from tuankhainguy/khai_hotfix
tuankhainguy Oct 15, 2024
11a5369
feat: added set zoom for 2DArray and Graph
nicked1205 Oct 17, 2024
3375a5c
feat: make set zoom accessible to all data structures
tuankhainguy Oct 19, 2024
e0227bc
Merge branch '2024_sem2' into nick_add_set_zoom
tuankhainguy Oct 19, 2024
705f8a9
Merge pull request #52 from tuankhainguy/nick_add_set_zoom
tuankhainguy Oct 19, 2024
4cc3dd2
feat: update tests
tuankhainguy Oct 19, 2024
88310f4
Merge pull request #53 from tuankhainguy/khai_update_tests
tuankhainguy Oct 19, 2024
3d55153
feat: add chaining prototype
nicked1205 Oct 20, 2024
d332b15
Updated Instructions to include expanding. Also added URL-Code-Implem…
WesleyJuraschek Oct 20, 2024
2c8fb7b
feat: allow array extraction for hash chaining
tuankhainguy Oct 20, 2024
e2ac786
feat: implement search for chaining
tuankhainguy Oct 20, 2024
7e25261
Merge pull request #54 from tuankhainguy/wes_update_instructions
WesleyJuraschek Oct 20, 2024
763744e
Merge branch '2024_sem2' into nick_add_chaining
tuankhainguy Oct 20, 2024
929b3d6
Merge pull request #55 from tuankhainguy/nick_add_chaining
tuankhainguy Oct 20, 2024
db2921a
feat: remove expand button for larger tables of LP and DH
tuankhainguy Oct 20, 2024
1404353
hotfix: instructions for chaining
nicked1205 Oct 20, 2024
98ff2e5
Merge pull request #56 from tuankhainguy/khai_expand_param
tuankhainguy Oct 20, 2024
82f7153
Merge pull request #57 from tuankhainguy/nick_hotfix_instruction
nicked1205 Oct 20, 2024
0f47420
Merge branch '2024_sem2' into 2024_sem2
tuankhainguy Oct 20, 2024
d5c4470
chore: clean up code
tuankhainguy Oct 20, 2024
e1f082d
fix: automated tests
tuankhainguy Oct 20, 2024
39b02d3
fix: automated tests
tuankhainguy Oct 20, 2024
b0a1289
chore: added comments
tuankhainguy Oct 26, 2024
acad150
Merge branch '2024_sem2' of github.com:algorithms-in-action/algorithm…
tuankhainguy Nov 18, 2024
ca6f8a2
feat: added hashing to menu
tuankhainguy Nov 18, 2024
dbd8397
fix: animation not showing
tuankhainguy Nov 18, 2024
c7f5bd0
fix: hashing (chaining) undefined bug
tuankhainguy Nov 18, 2024
e5ea6ef
fix: hashing search and delete using wrong table size
tuankhainguy Nov 18, 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
26 changes: 26 additions & 0 deletions .github/workflows/hashing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Hashing Algorithms CI

on:
push:
branches: [2024_sem2]
paths-ignore:
- 'doc/**' # Ignore all files and subdirectories under "doc/"
- 'docs/**' # Ignore all files and subdirectories under "docs/"
pull_request:
branches: [2024_sem2]

jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v2.3.1
with:
persist-credentials: false

- name: Install and Test 🔧
run: |
npm install
npm run test-hashinsert
npm run test-hashsearch
npm run test-hashdelete
6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

57 changes: 57 additions & 0 deletions .idea/workspace.xml

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

2 changes: 2 additions & 0 deletions package-lock.json

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

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
"test-msdrs": "npm test -- ./src/algorithms/controllers/MSDRadixSort.test.js",
"test-uf": "npm test -- ./src/algorithms/controllers/unionFind.test.js",
"test-234t": "npm test -- ./src/algorithms/controllers/TTFTree.test.js",
"test-hashinsert": "npm test -- ./src/algorithms/controllers/tests/HashingInsertion.test.js",
"test-hashsearch": "npm test -- ./src/algorithms/controllers/tests/HashingSearch.test.js",
"test-hashdelete": "npm test -- ./src/algorithms/controllers/tests/HashingDeletion.test.js",
"test-234t": "npm test -- ./src/algorithms/controllers/TTFTree.test.js",
"test-avl": "npm test -- ./src/algorithms/controllers/AVLTree.test.js",
"test-url": "npm test -- ./src/algorithms/parameters/helpers/urlHelpers.test.js"
},
Expand Down Expand Up @@ -63,6 +67,7 @@
"@mui/lab": "latest",
"@mui/material": "^5.14.4",
"@mui/styles": "^5.14.4",
"@popperjs/core": "^2.11.8",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^12.1.2",
"@testing-library/react-hooks": "^8.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/algorithms/controllers/AStar.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export default {
5,
(vis, v) => {
vis.array.set(v, algNameStr);
vis.array.getRendererClass().zoom = 8;
vis.array.setZoom(0.8);
},
[[nodes, heuristics, minCosts, parents, finalCosts], 0]
);
Expand Down
Loading
Loading