From 665e4b5f8c5bd770654d7cdf7860eb3c4cb9c732 Mon Sep 17 00:00:00 2001 From: Charlotte Pabst Date: Wed, 17 Jan 2024 21:24:39 +0100 Subject: --- src/main.rs | 15 +++++++++++---- x.dot | 4 ++-- x.svg | 16 ++++++++-------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/main.rs b/src/main.rs index 960c334..4c4fa0d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -327,14 +327,14 @@ impl<'brand, 'arena, V: Default> Dcel<'brand, 'arena, V> { //let fb = b1.borrow(&self.token).face?; let mut a3 = a1.borrow(&self.token).next?; - if a3.borrow(&self.token) == b1.borrow(&self.token) { + /*if a3.borrow(&self.token) == b1.borrow(&self.token) { a3 = b2; - } + }*/ let mut b3 = b1.borrow(&self.token).prev?; - if b3.borrow(&self.token) == a1.borrow(&self.token) { + /*if b3.borrow(&self.token) == a1.borrow(&self.token) { b3 = a2; - } + }*/ self.twin(a2, b2); @@ -352,6 +352,13 @@ impl<'brand, 'arena, V: Default> Dcel<'brand, 'arena, V> { } pub fn mel(&mut self, v1: cell!(Vertex), v2: cell!(Vertex)) -> Option<()> { + let a = self.half_edges.alloc(&mut self.token, ()); + let b = self.half_edges.alloc(&mut self.token, ()); + + self.twin(a, b); + + //self.origin(); + Some(()) } diff --git a/x.dot b/x.dot index 77dea66..573b826 100644 --- a/x.dot +++ b/x.dot @@ -16,7 +16,7 @@ edge_1 -> edge_0 [color="green"] edge_2 [pos="7.5,0.2!", shape=point, width=0.01, height=0.01] 2 -> edge_2 [arrowhead=none] edge_2 -> 1 [label="2"] -edge_2 -> edge_3 [color="green"] +edge_2 -> edge_1 [color="green"] edge_3 [pos="7.5,-0.2!", shape=point, width=0.01, height=0.01] 1 -> edge_3 [arrowhead=none] edge_3 -> 2 [label="3"] @@ -24,7 +24,7 @@ edge_3 -> edge_5 [color="green"] edge_4 [pos="4.5,0.2!", shape=point, width=0.01, height=0.01] 3 -> edge_4 [arrowhead=none] edge_4 -> 2 [label="4"] -edge_4 -> edge_2 [color="green"] +edge_4 -> edge_3 [color="green"] edge_5 [pos="4.5,-0.2!", shape=point, width=0.01, height=0.01] 2 -> edge_5 [arrowhead=none] edge_5 -> 3 [label="5"] diff --git a/x.svg b/x.svg index 16f61db..260b597 100644 --- a/x.svg +++ b/x.svg @@ -139,11 +139,11 @@ 4 - + -edge_4->edge_2 - - +edge_4->edge_3 + + @@ -165,11 +165,11 @@ 2 - + -edge_2->edge_3 - - +edge_2->edge_1 + + -- cgit v1.2.3