Menus tinkering

Removed prims_old, added hashing to search fn

Author: lee-naish

src/algorithms/index.js

@@ -22,6 +22,12 @@ import * as Instructions from './instructions';
  src/context/actions.js had better be deployed!
  XXX Design of noDeploy stuff was done with the aim of minimal code change
  and could be re-thought when there are fewer merges going on.
+XXX This has now been totally ****ed up, with multiple lists of
+algorithms elsewhere (see components/mainmenu/index.js
+components/mainmenu/GraphAlgorithms.js components/AlgorithmMenu.js) as
+well as this file, algorithms/index.js. There should be *one* master
+list (eg, this one, possibly with extra info for each algorithm) and the
+other lists should be generated from the master list!
 
  Each imported algorithm is expected to be an object of the form:
  { pseudocode: String, explanation: String, run: Function }
@@ -332,7 +338,6 @@ const allalgs = {
     },
     controller: {
       find: Controller.dijkstra,
-
     },
   },
   'aStar': {
@@ -347,7 +352,6 @@ const allalgs = {
     },
     controller: {
       find: Controller.AStar,
-
     },
   },
   'prim': {
@@ -365,8 +369,10 @@ const allalgs = {
       find: Controller.prim,
     },
   },
+  // Prim's (simpler code) is superseeded + could do with some work;
+  // it's included here so it can be run but it's not included in menus
   'prim_old': {
-    noDeploy: false,
+    noDeploy: true,
     name: 'Prim\'s (simpler code)',
     category: 'Graph',
     explanation: Explanation.Prims_oldExp,

src/components/AlgorithmMenu.js

@@ -5,6 +5,7 @@ import '../styles/AlgorithmMenu.scss';
 const baseUrl = window.location.origin;
 
 // XXX construct this from master list of algorithms!
+// or use this as master list
 const algorithms = {
   Sort: {
     Heapsort: `${baseUrl}/?alg=heapSort&mode=sort`,
@@ -23,7 +24,7 @@ const algorithms = {
     "Dijkstra's (shortest path)": `${baseUrl}/?alg=dijkstra&mode=find`,
     'A* (heuristic search)': `${baseUrl}/?alg=aStar&mode=find`,
     "Prim's (min. spanning tree)": `${baseUrl}/?alg=prim&mode=find`,
-    "Prim's (simpler code)": `${baseUrl}/?alg=prim_old&mode=find`,
+    // "Prim's (simpler code)": `${baseUrl}/?alg=prim_old&mode=find`,
     "Kruskal's (min. spanning tree)": `${baseUrl}/?alg=kruskal&mode=find`,
     "Warshall's (transitive closure)": `${baseUrl}/?alg=transitiveClosure&mode=tc`,
   },

src/components/mainmenu/GraphAlgorithms.js

@@ -4,14 +4,15 @@ import '../../styles/GraphAlgorithms.scss';
 // Get the base URL dynamically
 const baseUrl = window.location.origin;
 
+// XXX should have *one* list of algorithms and select based on category
 const graphAlgorithms = [
   { name: 'Depth First Search', url: `${baseUrl}/?alg=DFSrec&mode=find` },
   { name: 'DFS (iterative)', url: `${baseUrl}/?alg=DFS&mode=find` },
   { name: 'Breadth First Search', url: `${baseUrl}/?alg=BFS&mode=find` },
   { name: "Dijkstra's (shortest path)", url: `${baseUrl}/?alg=dijkstra&mode=find` },
   { name: 'A* (heuristic search)', url: `${baseUrl}/?alg=aStar&mode=find` },
   { name: "Prim's (min. spanning tree)", url: `${baseUrl}/?alg=prim&mode=find` },
-  { name: "Prim's (simpler code)", url: `${baseUrl}/?alg=prim_old&mode=find` },
+  // { name: "Prim's (simpler code)", url: `${baseUrl}/?alg=prim_old&mode=find` },
   { name: "Kruskal's (min. spanning tree)", url: `${baseUrl}/?alg=kruskal&mode=find` },
   { name: "Warshall's (transitive closure)", url: `${baseUrl}/?alg=transitiveClosure&mode=tc` }
 ];

src/components/mainmenu/index.js

@@ -11,13 +11,14 @@ import StringSearchAlgorithms from './StringSearchAlgorithms';
 // Get the base URL dynamically
 const baseUrl = window.location.origin;
 
-// XXX should have algorithms just listed in one place
+// XXX should have algorithms just listed in one place!
 // (eg src/algorithms/index.js)
 // and filtered appropriately rather
 // than have multiple algorithm lists (here, above, SortingAlgorithms.js,
 // InsertSearchAlgorithms.js etc), as was done previously...
 // XXX also fix display code (see XXX elsewhere) - currently ugly and
 // broken; best just use something simple!
+// This version is used just(?) for the main menu search function
 const allAlgorithms = [
     { name: 'Brute Force', url: `${baseUrl}/?alg=bruteForceStringSearch&mode=search` },
     { name: "Horspool's", url: `${baseUrl}/?alg=horspoolStringSearch&mode=search` },
@@ -27,20 +28,25 @@ const allAlgorithms = [
     { name: "Dijkstra's (shortest path)", url: `${baseUrl}/?alg=dijkstra&mode=find` },
     { name: 'A* (heuristic search)', url: `${baseUrl}/?alg=aStar&mode=find` },
     { name: "Prim's (min. spanning tree)", url: `${baseUrl}/?alg=prim&mode=find` },
+    // prim_old not included in menus
     { name: "Prim's (simpler code)", url: `${baseUrl}/?alg=prim_old&mode=find` },
     { name: "Kruskal's (min. spanning tree)", url: `${baseUrl}/?alg=kruskal&mode=find` },
     { name: "Warshall's (transitive closure)", url: `${baseUrl}/?alg=transitiveClosure&mode=tc` },
     { name: 'Binary Search Tree', url: `${baseUrl}/?alg=binarySearchTree&mode=search` },
     { name: '2-3-4 Tree', url: `${baseUrl}/?alg=TTFTree&mode=search` },
     { name: 'AVL Tree', url: `${baseUrl}/?alg=AVLTree&mode=search` },
+    { name: 'Hashing (Linear Probing)', url: `${baseUrl}/?alg=HashingLP&mode=search` },
+    { name: 'Hashing (Double Hashing)', url: `${baseUrl}/?alg=HashingDH&mode=search` },
+    { name: 'Hashing (Chaining)', url: `${baseUrl}/?alg=HashingCH&mode=search` },
     { name: 'Union Find', url: `${baseUrl}/?alg=unionFind&mode=find` },
     { name: 'Heapsort', url: `${baseUrl}/?alg=heapSort&mode=sort` },
     { name: 'Quicksort', url: `${baseUrl}/?alg=quickSort&mode=sort` },
     { name: 'Quicksort (Median of 3)', url: `${baseUrl}/?alg=quickSortM3&mode=sort` },
     { name: 'Merge Sort', url: `${baseUrl}/?alg=msort_arr_td&mode=sort` },
     { name: 'Merge Sort (Bottom-up)', url: `${baseUrl}/?alg=msort_arr_bup&mode=sort` },
     { name: 'Merge Sort (Natural)', url: `${baseUrl}/?alg=msort_arr_nat&mode=sort` },
-    // XXX don't include list-array mergesort? msort_lista_td
+    // msort_lista_td not included in menus
+    { name: 'Merge Sort (list rep. as array)', url: `${baseUrl}/?alg=msort_lista_td&mode=sort` },
     { name: 'Radix Sort (MSD/Exchange)', url: `${baseUrl}/?alg=radixSortMSD&mode=sort` },
     { name: 'Radix Sort (LSD/Straight)', url: `${baseUrl}/?alg=radixSortStraigh&mode=sort` },
   ];
@@ -75,6 +81,7 @@ const Mainmenu = () => {
 
     const filteredAlgorithms = allAlgorithms.filter(algorithm =>
     algorithm.name.toLowerCase().includes(searchTerm.toLowerCase())
+    // XXX nice to add keyword search also
   );
   return (
     <div className="mainmenu-container">