Minor refactorings

Author: an-Iceberg

Cargo.toml

@@ -8,6 +8,4 @@ edition = "2021"
 [dependencies]
 itertools = "0.11.0"
 macroquad = { version = "0.4.2" }
-
-[dev-dependencies]
 rand = { version = "0.8.5" }

rustfmt.toml

@@ -16,3 +16,7 @@ single_line_if_else_max_width = 120
 tab_spaces = 2
 use_field_init_shorthand = true
 # use_small_heuristics = "Max"
+fn_single_line = true
+where_single_line = true
+struct_lit_single_line = true
+empty_item_single_line = true

src/graph.rs

@@ -1,10 +1,11 @@
 use crate::{draw_pill, utils};
 use itertools::Itertools;
 use macroquad::{
-  prelude::{mouse_position, Color, IVec2, BLACK, GREEN, MAGENTA, ORANGE, YELLOW},
+  prelude::{mouse_position, Color, IVec2, BLACK, GREEN, MAGENTA, ORANGE, WHITE, YELLOW},
   shapes::{draw_circle, draw_circle_lines, draw_line, draw_triangle},
   text::{draw_text, get_text_center, measure_text},
 };
+use rand::Rng;
 use std::{
   collections::{BTreeMap, HashMap},
   fmt::Display,
@@ -266,14 +267,9 @@ impl Graph {
         break;
       }
 
-      let current_node_id = untested_nodes
-        .first()
-        .unwrap();
-      let current_node_copy = self
-        .points
-        .get_mut(current_node_id)
-        .unwrap()
-        .clone();
+      let Some(current_node_id) = untested_nodes.first() else { return; };
+      let Some(current_node) = self.points.get_mut(current_node_id) else { return; };
+      let current_node_distance = current_node.distance;
 
       // Set the current node to visited
       self
@@ -282,6 +278,11 @@ impl Graph {
         .unwrap()
         .visited = true;
 
+      // Skip testing the neighbours if the node is the end
+      if *current_node_id == end {
+        continue;
+      }
+
       let mut new_untested_nodes = Vec::<u8>::new();
 
       // Test the neighbours of the current node
@@ -294,16 +295,18 @@ impl Graph {
           continue;
         }
 
-        let neighbour = self
-          .points
-          .get_mut(&line.to)
-          .unwrap();
+        let Some(neighbour) = self.points.get_mut(&line.to) else { continue; };
 
         new_untested_nodes.push(line.to);
 
-        if current_node_copy.distance + (*line_length as u32) < neighbour.distance {
+        if current_node_distance + (*line_length as u32) < neighbour.distance {
           neighbour.parent = *current_node_id;
-          neighbour.distance = current_node_copy.distance + (*line_length as u32);
+          neighbour.distance = current_node_distance + (*line_length as u32);
+        } else if current_node_distance + (*line_length as u32) == neighbour.distance {
+          if rand::thread_rng().gen::<bool>() {
+            neighbour.parent = *current_node_id;
+            neighbour.distance = current_node_distance + (*line_length as u32);
+          }
         }
       }
 
@@ -385,7 +388,7 @@ impl Graph {
             .position
             .y as f32,
           2.0,
-          GREEN,
+          WHITE,
         );
       }
     }
@@ -852,15 +855,15 @@ impl Graph {
       .points
       .iter()
       .for_each(|point| {
-        println!("{}: {:?}", point.0, point.1);
+        println!("{} => {:?}", point.0, point.1);
       });
 
     println!("Lines:");
     self
       .lines
       .iter()
       .for_each(|line| {
-        println!("{}: {}", line.0, line.1);
+        println!("{} => {}", line.0, line.1);
       });
 
     match self.start {