fix: debug output, sub overflow gridnode and station overlap edge loc…

…al_search
CalliEve · Nov 1, 2024 · 126b87d · 126b87d
1 parent 56b244b
commit 126b87d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/algorithm/local_search.rs b/src/algorithm/local_search.rs
@@ -150,6 +150,13 @@ pub fn try_station_pos(
         }
     }
 
+    occupied.insert(
+        station_pos,
+        target_station
+            .get_id()
+            .into(),
+    );
+
     Ok(StationPos::new(
         target_station,
         edges_after,

diff --git a/src/components/molecules/settings_modal.rs b/src/components/molecules/settings_modal.rs
@@ -57,10 +57,10 @@ where
                     on_input=move |b| {
                         map_state
                             .update(|state| state.update_algorithm_settings(|settings| {
-                                if b {
-                                    settings.set_log_level(LogType::Debug);
+                                if settings.log_level == LogType::Warn {
+                                    *settings = settings.set_log_level(LogType::Debug);
                                 } else {
-                                    settings.set_log_level(LogType::Warn);
+                                    *settings = settings.set_log_level(LogType::Warn);
                                 }
                             }));
                     }/>

diff --git a/src/components/state/canvas.rs b/src/components/state/canvas.rs
@@ -244,6 +244,7 @@ impl CanvasState {
     }
 
     /// Returns true if the given grid node is on the canvas.
+    #[inline]
     pub fn is_on_canvas(&self, node: GridNode) -> bool {
         self.x_limit
             .0

diff --git a/src/models/grid_node.rs b/src/models/grid_node.rs
@@ -43,6 +43,10 @@ impl GridNode {
     /// Translate the [`GridNode`] to a canvas coordinate, given the state of
     /// the canvas.
     pub fn to_canvas_pos(self, state: CanvasState) -> (f64, f64) {
+        if !state.is_on_canvas(self) {
+            return (f64::MIN, f64::MIN);
+        }
+
         let square_size = state.drawn_square_size();
         (
             f64::from(