src/cube.rs

Fri, 06 Dec 2024 14:27:14 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Fri, 06 Dec 2024 14:27:14 -0500
changeset 45
cac6978dc7dd
parent 37
d7cd14b8ccc0
child 46
90cc221eb52b
permissions
-rw-r--r--

Adjust plot style

13
f67949050a32 documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 12
diff changeset
1 /*!
f67949050a32 documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 12
diff changeset
2 Implementation of the surface of the 3D cube as a [`ManifoldPoint`].
f67949050a32 documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 12
diff changeset
3 */
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
4
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
5 use serde_repr::*;
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
6 use serde::Serialize;
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
7 use alg_tools::loc::Loc;
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
8 use alg_tools::norms::{Norm, L2};
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
9 use crate::manifold::{EmbeddedManifoldPoint, FacedManifoldPoint, ManifoldPoint};
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
10
13
f67949050a32 documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 12
diff changeset
11 /// All the difference faces of a [`OnCube`].
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
12 #[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize_repr, Deserialize_repr)]
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
13 #[repr(u8)]
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
14 pub enum Face {F1 = 1, F2 = 2, F3 = 3, F4 = 4, F5 = 5, F6 = 6}
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
15 use Face::*;
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
16
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
17 pub type Point = Loc<f64, 2>;
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
18
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
19 pub type AdjacentFaces = [Face; 4];
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
20
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
21 #[derive(Clone, Debug, Serialize)]
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
22 pub enum Path {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
23 Direct { destination : Face },
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
24 Indirect { destination : Face, intermediate : Face },
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
25 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
26
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
27 /// An iterator over paths on a cube, from a source face to a destination face.
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
28 #[derive(Clone, Debug)]
34
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
29 pub enum PathIter {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
30 Same {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
31 destination : Face,
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
32 exhausted : bool
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
33 },
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
34 Indirect {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
35 destination : Face,
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
36 intermediate : AdjacentFaces,
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
37 current : usize
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
38 }
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
39 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
40
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
41 impl std::iter::Iterator for PathIter {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
42 type Item = Path;
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
43
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
44 fn next(&mut self) -> Option<Self::Item> {
34
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
45 match *self {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
46 PathIter::Same { destination, ref mut exhausted } => {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
47 if !*exhausted {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
48 *exhausted = true;
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
49 return Some(Path::Direct { destination })
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
50 }
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
51 None
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
52 },
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
53 PathIter::Indirect { destination, intermediate : ref i, ref mut current } => {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
54 while *current < i.len() {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
55 let intermediate = i[*current];
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
56 *current += 1;
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
57 if intermediate == destination {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
58 return Some(Path::Direct { destination })
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
59 } else if intermediate != destination.opposing_face() {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
60 return Some(Path::Indirect{ destination, intermediate })
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
61 }
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
62 // Paths should never go through a face opposing the destination.
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
63 }
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
64 None
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
65 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
66 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
67 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
68 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
69
11
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
70 impl std::fmt::Display for Face {
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
71 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
72 let s = match *self {
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
73 F1 => "F1",
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
74 F2 => "F2",
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
75 F3 => "F3",
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
76 F4 => "F4",
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
77 F5 => "F5",
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
78 F6 => "F6",
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
79 };
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
80 write!(f, "{}", s)
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
81 }
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
82 }
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
83
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
84 impl Face {
11
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
85 /// Return an aray of all faces
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
86 pub fn all() -> [Face; 6] {
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
87 [F1, F2, F3, F4, F5, F6]
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
88 }
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 10
diff changeset
89
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
90 /// Returns an array of the four faces adjacent to `self` in the
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
91 /// order [left, right, down, up] in the `self`-relative unfolding.
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
92 pub fn adjacent_faces(&self) -> AdjacentFaces {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
93 match *self {
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
94 F1 => [F3, F2, F4, F5],
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
95 F2 => [F4, F5, F1, F6],
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
96 F3 => [F5, F4, F1, F6],
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
97 F4 => [F3, F2, F1, F6],
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
98 F5 => [F2, F3, F1, F6],
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
99 F6 => [F3, F2, F4, F5],
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
100 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
101 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
102
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
103 /// Returns the face opposing `self`.
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
104 pub fn opposing_face(&self) -> Face {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
105 match *self {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
106 F1 => F6,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
107 F2 => F3,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
108 F3 => F2,
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
109 F4 => F5,
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
110 F5 => F4,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
111 F6 => F1,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
112 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
113 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
114
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
115 /// Converts a point on an adjacent face to the coordinate system of `self`.
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
116 pub fn convert_adjacent(&self, adjacent : Face, p: &Point) -> Option<Point> {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
117 let Loc([x, y]) = *p;
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
118 let mk = |x, y| Some(Loc([x, y]));
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
119 match adjacent {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
120 F1 => match *self {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
121 F2 => mk(y, x - 1.0),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
122 F3 => mk(1.0 - y, -x),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
123 F4 => mk(x, -y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
124 F5 => mk(1.0 - x, y - 1.0),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
125 F1 => mk(x, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
126 F6 => None,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
127 },
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
128 F2 => match *self {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
129 F1 => mk(y + 1.0, x),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
130 F4 => mk(x + 1.0, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
131 F5 => mk(x - 1.0, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
132 F6 => mk(2.0 - y, x),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
133 F2 => mk(x, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
134 F3 => None,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
135 },
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
136 F3 => match *self {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
137 F1 => mk(-y, 1.0 - x),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
138 F4 => mk(x - 1.0, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
139 F5 => mk(x + 1.0, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
140 F6 => mk(y - 1.0, 1.0 - x),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
141 F3 => mk(x, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
142 F2 => None,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
143 },
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
144 F4 => match *self {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
145 F1 => mk(x, -y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
146 F2 => mk(x - 1.0, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
147 F3 => mk(x + 1.0, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
148 F6 => mk(x, y - 1.0),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
149 F4 => mk(x, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
150 F5 => None,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
151 },
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
152 F5 => match *self {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
153 F1 => mk(1.0 -x, y + 1.0),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
154 F2 => mk(x + 1.0, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
155 F3 => mk(x - 1.0, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
156 F6 => mk(1.0 -x, 2.0 - y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
157 F5 => mk(x, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
158 F4 => None,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
159 },
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
160 F6 => match *self {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
161 F2 => mk(y, 2.0 - x),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
162 F3 => mk(1.0 - y, x + 1.0),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
163 F4 => mk(x, y + 1.0),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
164 F5 => mk(1.0 - x, 2.0 - y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
165 F6 => mk(x, y),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
166 F1 => None,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
167 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
168 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
169 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
170
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
171 /// Converts a point behind a path to the coordinate system of `self`.
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
172 pub fn convert(&self, path : &Path, p: &Point) -> Point {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
173 use Path::*;
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
174 //dbg!(*self, path);
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
175 match path {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
176 &Direct{ destination : d} => self.convert_adjacent(d, p),
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
177 &Indirect{ destination : d, intermediate : i }
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
178 => {self.convert_adjacent(i, &i.convert_adjacent(d, p).unwrap())}
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
179 }.unwrap()
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
180 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
181
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
182
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
183 /// Returns an iterator over all the paths from `self` to `other`.
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
184 fn paths(&self, other : Face) -> PathIter {
34
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
185 if other == *self {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
186 PathIter::Same {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
187 destination : other,
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
188 exhausted : false
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
189 }
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
190 } else {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
191 PathIter::Indirect {
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
192 intermediate : self.adjacent_faces(),
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
193 destination : other,
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
194 current : 0
aa6129697116 Same face path optimisation / possible fix
Tuomo Valkonen <tuomov@iki.fi>
parents: 30
diff changeset
195 }
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
196 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
197 }
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
198
13
f67949050a32 documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 12
diff changeset
199 /// Indicates whether an unfolded point `p` is on this face, i.e.,
f67949050a32 documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 12
diff changeset
200 /// has coordinates in [0,1]².
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
201 pub fn is_in_face(&self, p: &Point) -> bool {
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
202 p.iter().all(|t| 0.0 <= *t && *t <= 1.0)
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
203 }
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
204
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
205 /// Given an unfolded point `p` and a destination point `d` in unfolded coordinates,
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
206 /// but possibly outside this face, find the crossing point of the line between
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
207 /// `p` and `d` on an edge of (`self`). Return the point and the edge presented
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
208 /// by an adjacent face.
13
f67949050a32 documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 12
diff changeset
209 ///
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
210 /// Crossing at corners is decided arbitrarily.
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
211 pub fn find_crossing(&self, p :& Point, d : &Point) -> (Face, Point) {
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
212 //assert!(self.is_in_face(p));
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
213
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
214 if self.is_in_face(d) {
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
215 return (*self, *p)
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
216 }
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
217
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
218 use std::cmp::Ordering::*;
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
219
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
220 let &Loc([x, y]) = p;
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
221 let &Loc([xd, yd]) = d;
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
222 let tx = xd - x;
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
223 let ty = yd - y;
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
224
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
225 // Move towards tangent as (x + s tx, y + s ty) for the largest s<=1.0 for which
15
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
226 // both coordinates is within [0, 1]. Also gives the direction of move along
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
227 // each coordinate.
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
228 let (sx, dirx) = match tx.partial_cmp(&0.0) {
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
229 Some(Less) => (1.0f64.min(-x/tx), Less),
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
230 Some(Greater) => (1.0f64.min((1.0-x)/tx), Greater),
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
231 _ => (1.0, Equal)
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
232 };
15
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
233 let (sy, diry) = match ty.partial_cmp(&0.0) {
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
234 Some(Less) => (1.0f64.min(-y/ty), Less),
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
235 Some(Greater) => (1.0f64.min((1.0-y)/ty), Greater),
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
236 _ => (1.0, Equal),
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
237 };
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
238
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
239 // TODO: how to properly handle corners? Just throw an error?
15
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
240 let (crossing, c) = match (sx < sy, dirx, diry) {
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
241 // x move is less than y move, so crossing is either on left or right edge
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
242 (true, Less, _) => (self.adjacent_faces()[0], sx),
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
243 (true, Greater, _) => (self.adjacent_faces()[1], sx),
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
244 (true, Equal, _) => (*self, sx),
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
245 // y move is less than x move, so crossing is either on bottom or top edge
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
246 (false, _, Less) => (self.adjacent_faces()[2], sy),
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
247 (false, _, Greater) => (self.adjacent_faces()[3], sy),
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
248 (false, _, Equal) => (*self, sy),
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
249 };
15
2f4af30af476 Simplify crossing calculations
Tuomo Valkonen <tuomov@iki.fi>
parents: 14
diff changeset
250 (crossing, Loc([x + c*tx, y + c*ty]))
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
251 }
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
252
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
253 /// Get embedded 3D coordinates
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
254 pub fn embedded_coords(&self, p : &Point) -> Loc<f64, 3> {
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
255 let &Loc([x, y]) = p;
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
256 Loc(match *self {
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
257 F1 => [x, y, 0.0],
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
258 F2 => [1.0, x, y],
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
259 F3 => [0.0, 1.0-x, y],
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
260 F4 => [x, 0.0, y],
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
261 F5 => [1.0 - x, 1.0, y],
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
262 F6 => [x, y, 1.0],
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
263 })
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
264 }
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
265 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
266
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
267 #[derive(Clone, Debug, PartialEq, Serialize)]
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
268 pub struct OnCube {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
269 face : Face,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
270 point : Point,
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
271 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
272
5
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
273 impl OnCube {
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
274 /// Creates a new point on the cube, given a face and face-relative coordinates
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
275 /// in [0, 1]^2
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
276 pub fn new(face : Face, point : Point) -> Self {
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
277 assert!(face.is_in_face(&point));
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
278 OnCube { face, point }
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
279 }
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
280
5
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
281 /// Calculates both the logarithmic map and distance to another point
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
282 fn log_dist(&self, other : &Self) -> (<Self as ManifoldPoint>::Tangent, f64) {
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
283 let mut best_len = f64::INFINITY;
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
284 let mut best_tan = Loc([0.0, 0.0]);
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
285 for path in self.face.paths(other.face) {
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
286 let tan = self.face.convert(&path, &other.point) - &self.point;
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
287 let len = tan.norm(L2);
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
288 if len < best_len {
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
289 best_tan = tan;
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
290 best_len = len;
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
291 }
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
292 }
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
293 (best_tan, best_len)
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
294 }
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
295 }
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
296
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
297 impl FacedManifoldPoint for OnCube {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
298 type Face = Face;
13
f67949050a32 documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 12
diff changeset
299 /// Returns the face of this point.
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
300 fn face(&self) -> Face {
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
301 self.face
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
302 }
5
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
303 }
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
304
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
305
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
306 impl EmbeddedManifoldPoint for OnCube {
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
307 type EmbeddedCoords = Loc<f64, 3>;
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
308
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
309 /// Get embedded 3D coordinates
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
310 fn embedded_coords(&self) -> Loc<f64, 3> {
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
311 self.face.embedded_coords(&self.point)
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
312 }
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
313 }
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
314
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
315 impl ManifoldPoint for OnCube {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
316 type Tangent = Point;
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
317
8
17d71ca4ce84 Make exp consuming
Tuomo Valkonen <tuomov@iki.fi>
parents: 7
diff changeset
318 fn exp(self, tangent : &Self::Tangent) -> Self {
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
319 let mut face = self.face;
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
320 let mut point = self.point;
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
321 let mut dest = self.point + tangent;
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
322 loop {
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
323 let (next_face, cross) = face.find_crossing(&point, &dest);
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
324 if next_face == face {
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
325 break
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
326 }
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
327 point = next_face.convert_adjacent(face, &cross).unwrap();
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
328 dest = next_face.convert_adjacent(face, &dest).unwrap();
3
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
329 face = next_face;
ff4656da04af Sketch exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
330 }
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
331 OnCube { face, point : dest }
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
332 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
333
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
334 fn log(&self, other : &Self) -> Self::Tangent {
5
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
335 self.log_dist(other).0
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
336 }
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
337
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
338 fn dist_to(&self, other : &Self) -> f64 {
f248e1434c3b Some distance functions etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 3
diff changeset
339 self.log_dist(other).1
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
340 }
6
df9628092285 Add a zero function on manifolds
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
341
df9628092285 Add a zero function on manifolds
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
342 fn tangent_origin(&self) -> Self::Tangent {
df9628092285 Add a zero function on manifolds
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
343 Loc([0.0, 0.0])
df9628092285 Add a zero function on manifolds
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
344 }
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
345 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
346
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
347 #[cfg(test)]
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
348 mod tests {
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
349 use super::*;
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
350
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
351 #[test]
29
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
352 fn center_distance() {
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
353 let center = Loc([0.5, 0.5]);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
354
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
355 for f1 in Face::all() {
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
356 let p1 = OnCube { face : f1, point : center.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
357 for f2 in Face::all() {
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
358 let p2 = OnCube { face : f2, point : center.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
359 if f1==f2 {
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
360 assert_eq!(p1.dist_to(&p2), 0.0);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
361 } else if f1.opposing_face()==f2 {
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
362 assert_eq!(p1.dist_to(&p2), 2.0);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
363 } else {
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
364 assert_eq!(p1.dist_to(&p2), 1.0);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
365 }
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
366 }
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
367 }
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
368 }
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
369
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
370 #[test]
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
371 fn boundary_distance() {
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
372 let left = Loc([0.0, 0.5]);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
373 let right = Loc([1.0, 0.5]);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
374 let down = Loc([0.5, 0.0]);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
375 let up = Loc([0.5, 1.0]);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
376 let center = Loc([0.5, 0.5]);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
377
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
378 for f1 in Face::all() {
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
379 let pl = OnCube { face : f1, point : left.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
380 let pr = OnCube { face : f1, point : right.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
381 let pd = OnCube { face : f1, point : down.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
382 let pu = OnCube { face : f1, point : up.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
383 let a = f1.adjacent_faces();
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
384 let al = OnCube { face : a[0], point : center.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
385 let ar = OnCube { face : a[1], point : center.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
386 let ad = OnCube { face : a[2], point : center.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
387 let au = OnCube { face : a[3], point : center.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
388 let ao = OnCube { face : f1.opposing_face(), point : center.clone() };
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
389
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
390 assert_eq!(pl.dist_to(&al), 0.5);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
391 assert_eq!(pr.dist_to(&ar), 0.5);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
392 assert_eq!(pd.dist_to(&ad), 0.5);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
393 assert_eq!(pu.dist_to(&au), 0.5);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
394 assert_eq!(pl.dist_to(&ao), 1.5);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
395 assert_eq!(pr.dist_to(&ao), 1.5);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
396 assert_eq!(pd.dist_to(&ao), 1.5);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
397 assert_eq!(pu.dist_to(&ao), 1.5);
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
398 }
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
399 }
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
400
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
401
76f9ec073a83 More tests
Tuomo Valkonen <tuomov@iki.fi>
parents: 15
diff changeset
402 #[test]
10
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
403 fn convert_adjacent() {
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
404 let point = Loc([0.4, 0.6]);
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
405
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
406 for f1 in Face::all() {
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
407 for f2 in Face::all() {
10
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
408 println!("{:?}-{:?}", f1, f2);
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
409 match f1.convert_adjacent(f2, &point) {
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
410 None => assert_eq!(f2.opposing_face(), f1),
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
411 Some(q) => {
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
412 match f2.convert_adjacent(f1, &q) {
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
413 None => assert_eq!(f1.opposing_face(), f2),
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
414 Some(p) => assert!((p-&point).norm(L2) < 1e-9),
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
415 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
416 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
417 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
418 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
419 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
420 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
421
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
422 // This will fail, as different return path does not guarantee
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
423 // that a point outside the face will be returned to its point of origin.
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
424 // #[test]
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
425 // fn convert_paths() {
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
426 // let point = Loc([0.4, 0.6]);
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
427
14
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
428 // for f1 in Face::all() {
d0f20c6cb49c Fixes to find_crossing and exp
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
429 // for f2 in Face::all() {
10
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
430 // for p1 in f2.paths(f1) {
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
431 // for p2 in f1.paths(f2) {
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
432 // println!("{:?}-{:?}; {:?} {:?}", f1, f2, p1, p2);
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
433 // let v = &f2.convert(&p1, &point);
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
434 // let q = f1.convert(&p2, v);
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
435 // assert!((q-&point).norm(L2) < 1e-9,
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
436 // "norm({}-{}) ≥ 1e-9 (dest {})", q, &point, &v);
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
437 // }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
438 // }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
439 // }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
440 // }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
441 // }
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
442
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
443 #[test]
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
444 fn log_adjacent() {
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
445 let p1 = OnCube{ face : F1, point : Loc([0.5, 0.5])};
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
446 let p2 = OnCube{ face : F2, point : Loc([0.5, 0.5])};
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
447
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
448 assert_eq!(p1.log(&p2).norm(L2), 1.0);
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
449 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
450
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
451 #[test]
10
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
452 fn log_opposing_equal() {
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
453 let p1 = OnCube{ face : F1, point : Loc([0.5, 0.5])};
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
454 let p2 = OnCube{ face : F6, point : Loc([0.5, 0.5])};
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
455
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
456 assert_eq!(p1.log(&p2).norm(L2), 2.0);
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
457 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
458
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
459 #[test]
10
Tuomo Valkonen <tuomov@iki.fi>
parents: 8
diff changeset
460 fn log_opposing_unique_shortest() {
0
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
461 let p1 = OnCube{ face : F1, point : Loc([0.3, 0.25])};
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
462 let p2 = OnCube{ face : F6, point : Loc([0.3, 0.25])};
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
463
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
464 assert_eq!(p1.log(&p2).norm(L2), 1.5);
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
465 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
466 }
989e2fe08db2 Basic cube logarithm
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
467

mercurial