src/cube.rs

Thu, 07 Nov 2024 13:35:28 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Thu, 07 Nov 2024 13:35:28 -0500
changeset 30
4fc8c93ed7e8
parent 29
76f9ec073a83
child 34
aa6129697116
permissions
-rw-r--r--

Add missing path options

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

mercurial