aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlotte Pabst <charlotte.pabst@stud.tu-darmstadt.de>2024-01-17 21:24:39 +0100
committerCharlotte Pabst <charlotte.pabst@stud.tu-darmstadt.de>2024-03-24 17:19:51 +0100
commit665e4b5f8c5bd770654d7cdf7860eb3c4cb9c732 (patch)
tree26dbfe6913eb669555e0834887957009e9082a88
parent81bce1d38758d3a7d000b3fdf0b1821621885782 (diff)
downloaddcel-665e4b5f8c5bd770654d7cdf7860eb3c4cb9c732.tar.xz
-rw-r--r--src/main.rs15
-rw-r--r--x.dot4
-rw-r--r--x.svg16
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 @@
<polygon fill="black" stroke="black" points="418.49,-28.73 427.94,-23.94 417.56,-21.79 418.49,-28.73"/>
<text text-anchor="middle" x="377.15" y="-33.46" font-family="Times,serif" font-size="14.00">4</text>
</g>
-<!-- edge_4&#45;&gt;edge_2 -->
+<!-- edge_4&#45;&gt;edge_3 -->
<g id="edge15" class="edge">
-<title>edge_4&#45;&gt;edge_2</title>
-<path fill="none" stroke="green" d="M342.62,-35.4C353.43,-35.4 502.63,-35.4 546.16,-35.4"/>
-<polygon fill="green" stroke="green" points="545.9,-38.9 555.9,-35.4 545.9,-31.9 545.9,-38.9"/>
+<title>edge_4&#45;&gt;edge_3</title>
+<path fill="none" stroke="green" d="M342.62,-35.32C353.43,-33.88 502.63,-13.98 546.16,-8.18"/>
+<polygon fill="green" stroke="green" points="546.47,-11.67 555.92,-6.88 545.54,-4.73 546.47,-11.67"/>
</g>
<!-- edge_1&#45;&gt;0 -->
<g id="edge5" class="edge">
@@ -165,11 +165,11 @@
<polygon fill="black" stroke="black" points="636.87,-28.42 646.32,-23.62 635.94,-21.48 636.87,-28.42"/>
<text text-anchor="middle" x="594.36" y="-33.3" font-family="Times,serif" font-size="14.00">2</text>
</g>
-<!-- edge_2&#45;&gt;edge_3 -->
+<!-- edge_2&#45;&gt;edge_1 -->
<g id="edge9" class="edge">
-<title>edge_2&#45;&gt;edge_3</title>
-<path fill="none" stroke="green" d="M558,-34.69C558,-32.43 558,-25.17 558,-18.6"/>
-<polygon fill="green" stroke="green" points="561.5,-18.7 558,-8.7 554.5,-18.7 561.5,-18.7"/>
+<title>edge_2&#45;&gt;edge_1</title>
+<path fill="none" stroke="green" d="M557.3,-35.35C539.95,-34.2 205.69,-11.91 137.92,-7.39"/>
+<polygon fill="green" stroke="green" points="138.39,-3.92 128.18,-6.75 137.92,-10.9 138.39,-3.92"/>
</g>
<!-- edge_3&#45;&gt;2 -->
<g id="edge11" class="edge">