Merge branch 'hotfix/1.0.1'

node/PublicResources/css/style.css

@@ -80,14 +80,18 @@ body {
   color: #fff;
 }
 
+.options-container {
+  transform: translateY(-40%);
+}
+
 .content h1 {
   margin-top: 80px;
   font-size: 50px;
   text-transform: uppercase;
 }
 
 .options-container h1 {
-  margin-top: 240px;
+  margin-top: 80px;
   font-size: 40px;
   text-transform: uppercase;
 }
@@ -207,10 +211,6 @@ div.cy.headless {
   margin-left: 50px;
 }
 
-div.slider-container {
-  padding-top: 50px;
-}
-
 .control-center input {
   margin-left: 50px;
   width: 170px;

node/PublicResources/html/index.html

@@ -18,12 +18,10 @@
         <ul>
           <li><a href="/">Home</a></li>
           <li>
-            <a href="https://github.com/KarmaKamikaze/P2-Project">Project</a>
+            <a href="https://github.com/KarmaKamikaze/FCDS">Project</a>
           </li>
           <li>
-            <a href="https://github.com/KarmaKamikaze/P2-Project#readme"
-              >About</a
-            >
+            <a href="https://github.com/KarmaKamikaze/FCDS#readme">About</a>
           </li>
         </ul>
       </div>

node/PublicResources/js/cytoStylesheet.js

@@ -6,6 +6,7 @@ export { CytoStyle, TestCytoStyle };
  * Applies the stylesheet to the cytoscape graph
  * @param {string} containerId The id of the given graph
  * @param {string} graphSize The size of the graph, either "small" or "large", that the stylesheet is to be applied to
+ * @param {boolean} headless Whether the graph should be rendered or not
  * @returns The finished graph object
  */
 function CytoStyle(containerId, graphSize, headless) {

node/PublicResources/js/dijkstra.js

@@ -3,7 +3,7 @@ import { initializeSingleSource, relax } from "../js/pathModules.js";
 
 /**
  * Dijkstra's algorithm will find the shortest path between all nodes in a weighted graph.
- * @param {Object} cyGraph The graph nodes will be updated with new distances
+ * @param {Class} cyGraph The graph nodes will be updated with new distances
  * and parents in terms of the new starting point.
  * @param {Object} startNode The starting point node. Also called source.
  */

node/PublicResources/js/dynamicPageGeneration.js

@@ -33,7 +33,6 @@ const generateVisualizationHTML = (graphs) => {
           <img class="legend disable-select" src="../html/legend.png" alt="Graph legend reference" title="Graph legend reference">
           <!-- Load application code at the end to ensure DOM is loaded -->
           <script src="../js/graphCore.js" type="module"></script>
-          <script src="../js/darkMode.js" type="module"></script>
         </body>
       </html>
       `;
@@ -170,13 +169,10 @@ const generateOptionsHTML = (pageObject) => {
             <ul>
               <li><a href="/">Home</a></li>
               <li>
-                <a href="https://github.com/KarmaKamikaze/P2-Project">Project</a>
+                <a href="https://github.com/KarmaKamikaze/FCDS">Project</a>
               </li>
               <li>
-                <a
-                  href="https://github.com/KarmaKamikaze/P2-Project/blob/master/README.md"
-                  >About</a
-                >
+                <a href="https://github.com/KarmaKamikaze/FCDS#readme">About</a>
               </li>
             </ul>
           </div>
@@ -369,7 +365,6 @@ const generateHeadlessHTML = (graph, infoDiv) => {
     ${infoDiv}
       <!-- Load application code at the end to ensure DOM is loaded -->
       <script src="../js/graphCore.js" type="module"></script>
-      <script src="../js/darkMode.js" type="module"></script>
     </body>
   </html>
   `;

node/PublicResources/js/graphCore.js

@@ -2,24 +2,24 @@ import { CyGraph } from "./graphHelper.js";
 import { CytoStyle } from "./cytoStylesheet.js";
 import { dijkstra } from "./dijkstra.js";
 import { aStar } from "./aStar.js";
-import { addDarkBtn } from "./darkMode.js";
 import { greedyBestFirstSearch } from "./greedyBestFirstSearch.js";
 import { startSimulation } from "./orderGeneration.js";
-import * as tests from "./tests.js";
+import { runAllTests } from "./tests.js";
 
 export { SetupGraph, simulationTest, getAlgorithm, startSim };
 
 /**
  * Performs setup and initialization of the input Cytoscape graph
- * @param {CyGraph} cyGraph The CyGraph class to set up
+ * @param {Class} cyGraph The CyGraph class to set up
  * @param {File} presetFile The graph preset file to load
  * @param {Function} startSimulationCallback Callback function which starts the simulation
+ * @param {Number} tickDuration the desired miliseconds per simulation tick
  */
 function SetupGraph(
   cyGraph,
   presetFile = null,
   startSimulationCallback,
-  tickSpeed
+  tickDuration
 ) {
   if (presetFile === null) {
     startSimulation(cyGraph);
@@ -35,16 +35,18 @@ function SetupGraph(
       cyGraph.initializeNodes();
       cyGraph.graph.fit(cyGraph.graph.elements());
       // then call the given start simulation function for this graph
-      startSimulationCallback(cyGraph, tickSpeed);
+      startSimulationCallback(cyGraph, tickDuration);
     });
 }
 
 /**
  * Callback function which starts the simulation once the graph is initialized
- * @param {CyGraph} cyGraph The graph to perform the simulation on
+ * @param {Class} cyGraph The graph to perform the simulation on
+ * @param {Number} tickDuration the desired miliseconds per simulation tick
  */
-function simulationTest(cyGraph, tickSpeed) {
-  startSimulation(cyGraph, tickSpeed);
+function simulationTest(cyGraph, tickDuration) {
+  startSimulation(cyGraph, tickDuration);
+  runAllTests();
   console.log(`[${cyGraph.name}] Started simulation`);
 }
 
@@ -87,7 +89,7 @@ async function startSim() {
       : graphSettings["graph-size"] === "large"
       ? BIG_GRAPH_PRESET_FILE
       : AALBORG_GRAPH;
-  let tickSpeed = 1000 / graphSettings["ticks-per-second"];
+  let tickDuration = 1000 / graphSettings["ticks-per-second"];
 
   for (let i = 0; i < graphSettings["number-of-graphs"]; i++) {
     let cytoStyle = new CytoStyle(
@@ -105,11 +107,11 @@ async function startSim() {
       graphSettings["idle-zones"], // use idle zones
       graphDivs[i].classList.contains("headless"), // headless traversal
       graphSettings["courier-frequency"], // max number of couriers
-      tickSpeed, // ms per tick
+      tickDuration, // ms per tick
       graphSettings["obstruction-level"]
     );
     graphArray.push(cyGraph);
-    SetupGraph(cyGraph, graphSize, simulationTest, tickSpeed);
+    SetupGraph(cyGraph, graphSize, simulationTest, tickDuration);
   }
 }
 
@@ -122,5 +124,3 @@ const DISTANCE_PER_TICK = 300; // 300 units per tick -> meters per minute -> 18
 let graphArray = [];
 
 startSim();
-
-addDarkBtn(graphArray);