From ceef3a7fb728f48b179d54c5110557742c37418e Mon Sep 17 00:00:00 2001
From: Mikolaj Wielgus <wielgusmikolaj@gmail.com>
Date: Tue, 29 Aug 2023 01:59:11 +0200
Subject: [PATCH] Take `&impl Interior` argument in path removal method

---
 src/layout.rs |  6 +++---
 src/router.rs | 17 ++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/layout.rs b/src/layout.rs
index 28c5a9c..aec4beb 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -30,15 +30,15 @@ impl Layout {
         }
     }
 
-    pub fn remove_open_set(&mut self, set: Vec<TaggedIndex>) {
-        for index in set.iter().filter(|index| !index.is_dot()) {
+    pub fn remove_interior(&mut self, path: &impl Interior<TaggedIndex>) {
+        for index in path.interior().iter().filter(|index| !index.is_dot()) {
             untag!(index, self.remove(*index));
         }
 
         // We must remove the dots only after the segs and bends because we need dots to calculate
         // the shapes, which we need to remove the segs and bends from the R-tree.
 
-        for index in set.iter().filter(|index| index.is_dot()) {
+        for index in path.interior().iter().filter(|index| index.is_dot()) {
             untag!(index, self.remove(*index));
         }
     }
diff --git a/src/router.rs b/src/router.rs
index 2b2486f..82645d9 100644
--- a/src/router.rs
+++ b/src/router.rs
@@ -5,6 +5,7 @@ use std::cell::{Ref, RefCell};
 use std::rc::Rc;
 
 use crate::astar::astar;
+use crate::bow::Bow;
 use crate::graph::{BendIndex, DotIndex, Ends, Interior, SegIndex, TaggedIndex};
 use crate::graph::{BendWeight, DotWeight, SegWeight, TaggedWeight};
 use crate::guide::Guide;
@@ -248,15 +249,12 @@ impl Router {
     }
 
     fn reroute_outward(&mut self, bend: BendIndex) -> Result<(), ()> {
-        let mut endss: Vec<(DotIndex, DotIndex)> = vec![];
-        let mut interiors: Vec<Vec<TaggedIndex>> = vec![];
+        let mut bows: Vec<Bow> = vec![];
         let cw = self.layout.primitive(bend).weight().cw;
 
         let mut cur_bend = bend;
         loop {
-            let bow = self.layout.bow(cur_bend);
-            endss.push(bow.ends());
-            interiors.push(bow.interior());
+            bows.push(self.layout.bow(cur_bend));
 
             cur_bend = match self.layout.primitive(cur_bend).outer() {
                 Some(new_bend) => new_bend,
@@ -267,11 +265,12 @@ impl Router {
         let core = self.layout.primitive(bend).core().unwrap();
         let mut maybe_inner = self.layout.primitive(bend).inner();
 
-        for interior in interiors {
-            self.layout.remove_open_set(interior);
+        for bow in &bows {
+            self.layout.remove_interior(bow);
         }
 
-        for ends in endss {
+        for bow in &bows {
+            let ends = bow.ends();
             let mut head = self.draw_start(ends.0);
             let width = 5.0;
 
@@ -337,7 +336,7 @@ impl Router {
         let bow = self.layout.bow(bend);
         let ends = bow.ends();
 
-        self.layout.remove_open_set(bow.interior());
+        self.layout.remove_interior(&bow);
 
         let head = self.draw_start(ends.0);
         let _ = self.draw_finish(head, ends.1, 5.0);