src/main.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 42
271fba635bce
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 Optimisation on non-Riemannian manifolds.
f67949050a32 documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 12
diff changeset
3 */
4
e09437844ad9 Forward-backward skeleton
Tuomo Valkonen <tuomov@iki.fi>
parents: 1
diff changeset
4
e09437844ad9 Forward-backward skeleton
Tuomo Valkonen <tuomov@iki.fi>
parents: 1
diff changeset
5 // We use unicode. We would like to use much more of it than Rust allows.
e09437844ad9 Forward-backward skeleton
Tuomo Valkonen <tuomov@iki.fi>
parents: 1
diff changeset
6 // Live with it. Embrace it.
e09437844ad9 Forward-backward skeleton
Tuomo Valkonen <tuomov@iki.fi>
parents: 1
diff changeset
7 #![allow(uncommon_codepoints)]
e09437844ad9 Forward-backward skeleton
Tuomo Valkonen <tuomov@iki.fi>
parents: 1
diff changeset
8 #![allow(mixed_script_confusables)]
e09437844ad9 Forward-backward skeleton
Tuomo Valkonen <tuomov@iki.fi>
parents: 1
diff changeset
9 #![allow(confusable_idents)]
1
29738fae471e Added some missing files
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
10
19
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
11 mod manifold;
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
12 mod fb;
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
13 mod cube;
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
14 mod cylinder;
19
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
15 mod dist;
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
16 mod zero;
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
17 mod scaled;
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
18 mod newton;
19
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
19
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
20 use serde::{Serialize, Deserialize};
16
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
21 use alg_tools::logger::Logger;
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
22 use alg_tools::tabledump::{TableDump, write_csv};
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
23 use alg_tools::error::DynError;
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
24 use alg_tools::lingrid::LinSpace;
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
25 use alg_tools::loc::Loc;
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
26 use alg_tools::types::*;
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
27 use alg_tools::mapping::{Sum, Apply};
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
28 use alg_tools::iterate::{AlgIteratorOptions, AlgIteratorFactory, Verbose};
24
8b4b014277fa Multiple trajectories
Tuomo Valkonen <tuomov@iki.fi>
parents: 20
diff changeset
29 use alg_tools::mapping::Mapping;
16
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
30 use image::{ImageFormat, ImageBuffer, Rgb};
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
31
19
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
32 use dist::{DistTo, DistToSquaredDiv2};
24
8b4b014277fa Multiple trajectories
Tuomo Valkonen <tuomov@iki.fi>
parents: 20
diff changeset
33 use fb::{forward_backward, IterInfo, Desc, Prox};
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
34 use manifold::{EmbeddedManifoldPoint, ManifoldPoint, FacedManifoldPoint};
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
35 use cube::OnCube;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
36 use cylinder::{CylCoords, Cylinder, CylinderConfig, OnCylinder, normalise_angle};
19
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
37 #[allow(unused_imports)]
16
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
38 use zero::ZeroFn;
19
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
39 use scaled::Scaled;
1
29738fae471e Added some missing files
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
40
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
41 /// Location for saving results
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
42 static PREFIX : &str = "res";
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
43
13
f67949050a32 documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 12
diff changeset
44 /// Program entry point
1
29738fae471e Added some missing files
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
45 fn main() {
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
46 simple_cube_test(format!("{PREFIX}/cube").as_str()).unwrap();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
47 simple_cylinder_test(format!("{PREFIX}/cylinder").as_str()).unwrap();
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
48 }
1
29738fae471e Added some missing files
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
49
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
50 /// Helper structure for saving a point on a cube into a CSV file
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
51 #[derive(Serialize,Deserialize,Debug)]
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
52 struct CSVPoint<Face> {
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
53 face : Face,
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
54 x : f64,
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
55 y : f64,
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
56 z : f64
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
57 }
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
58
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
59 impl<M> From<&M> for CSVPoint<M::Face>
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
60 where M : EmbeddedManifoldPoint<EmbeddedCoords = Loc<f64, 3>> + FacedManifoldPoint {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
61 fn from(point : &M) -> Self {
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
62 let Loc([x,y,z]) = point.embedded_coords();
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
63 let face = point.face();
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
64 CSVPoint { face, x, y, z }
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
65 }
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
66 }
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
67
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
68 /// Helper structure for saving a point on a cylinder into a CSV file
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
69 #[derive(Serialize,Deserialize,Debug)]
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
70 struct CSVCylPoint<Face> {
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
71 face : Face,
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
72 angle : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
73 r : f64,
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
74 z : f64
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
75 }
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
76
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
77 impl<'a> From<&'a crate::cylinder::OnCylinder<'a>> for CSVCylPoint<crate::cylinder::Face> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
78 fn from(point : &'a OnCylinder<'a>) -> Self {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
79 let CylCoords {r, angle, z} = point.cyl_coords();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
80 let face = point.face();
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
81 CSVCylPoint { face, r, angle, z }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
82 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
83 }
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
84
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
85 /// A simple test on the cube
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
86 fn simple_cube_test(dir : &str) -> DynError {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
87 use crate::cube::Face;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
88 use crate::cube::Face::*;
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
89
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
90 let points = [
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
91 OnCube::new(F1, Loc([0.5, 0.7])),
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
92 OnCube::new(F2, Loc([0.3, 0.5])),
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
93 OnCube::new(F4, Loc([0.9, 0.9])),
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
94 OnCube::new(F6, Loc([0.4, 0.3])),
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
95 OnCube::new(F4, Loc([0.3, 0.7])),
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
96 OnCube::new(F3, Loc([0.3, 0.7])),
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
97 ];
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
98
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
99 let origin = OnCube::new(F4, Loc([0.5, 0.5]));
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
100
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
101 std::fs::create_dir_all(dir)?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
102 write_csv(points.iter().map(CSVPoint::from), format!("{dir}/data.csv"))?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
103 write_csv(std::iter::once(&origin).map(CSVPoint::from), format!("{dir}/origin.csv"))?;
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
104
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
105 let f = Sum::new(points.into_iter().map(DistToSquaredDiv2));
19
bc7f268b324a test change
Tuomo Valkonen <tuomov@iki.fi>
parents: 18
diff changeset
106 //let g = ZeroFn::new();
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
107 let g = Scaled::new(0.5, DistTo(origin));
32
eb07aee01d57 Higher τ and lower maxiter
Tuomo Valkonen <tuomov@iki.fi>
parents: 31
diff changeset
108 let τ = 0.1;
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
109
24
8b4b014277fa Multiple trajectories
Tuomo Valkonen <tuomov@iki.fi>
parents: 20
diff changeset
110 for face in Face::all() {
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
111 write_cube_face_csv(format!("{dir}/{face}"), face, 32, |x| f.apply(x) + g.apply(x))?;
24
8b4b014277fa Multiple trajectories
Tuomo Valkonen <tuomov@iki.fi>
parents: 20
diff changeset
112 }
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
113 write_cube_face_imgs(dir, 128, |x| f.apply(x) + g.apply(x))?;
24
8b4b014277fa Multiple trajectories
Tuomo Valkonen <tuomov@iki.fi>
parents: 20
diff changeset
114
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
115 /// Helper structure for saving the log into a CSV file
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
116 #[derive(Serialize,Deserialize,Debug)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
117 struct CSVLog<Face> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
118 iter : usize,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
119 value : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
120 // serde is junk
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
121 //#[serde(flatten)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
122 //point : CSVPoint
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
123 face : Face,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
124 x : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
125 y : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
126 z : f64
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
127 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
128
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
129 let logmap = |iter, IterInfo { value, point } : IterInfo<OnCube>| {
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
130 let CSVPoint {x , y, z, face} = CSVPoint::from(&point);
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
131 CSVLog {
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
132 iter, value, //point : CSVPoint::from(&point)
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
133 x, y, z, face
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
134 }
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
135 };
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
136
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
137 run_and_save(dir, "x1", &f, &g, OnCube::new(F3, Loc([0.1, 0.7])), τ, logmap)?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
138 run_and_save(dir, "x2", &f, &g, OnCube::new(F2, Loc([0.3, 0.1])), τ, logmap)?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
139 run_and_save(dir, "x3", &f, &g, OnCube::new(F6, Loc([0.6, 0.2])), τ, logmap)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
140 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
141
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
142
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
143 /// A simple test on the cube
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
144 fn simple_cylinder_test(dir : &str) -> DynError {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
145 let π = f64::PI;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
146
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
147 let cyl = Cylinder {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
148 radius : 1.0,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
149 height : 1.0,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
150 config : CylinderConfig { newton_iters : 100 },
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
151 //Default::default(),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
152 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
153
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
154 let points = [
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
155 cyl.on_side(π/2.0, 0.4),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
156 cyl.on_side(π*3.0/2.0, -0.1),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
157 cyl.on_side(π, 0.2),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
158 cyl.on_side(-π/5.0, -0.2),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
159 cyl.on_side(π*2.0/3.0, -0.45),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
160 cyl.on_top(π*3.0/4.0, 0.7),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
161 cyl.on_bottom(π*5.0/4.0, 0.3),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
162 ];
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
163
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
164 let origin = cyl.on_side(0.0, 0.0);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
165
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
166 std::fs::create_dir_all(dir)?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
167 write_csv(points.iter().map(CSVCylPoint::from), format!("{dir}/data.csv"))?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
168 write_csv(std::iter::once(&origin).map(CSVCylPoint::from), format!("{dir}/origin.csv"))?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
169
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
170 let f = Sum::new(points.into_iter().map(DistToSquaredDiv2));
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
171 let g = Scaled::new(4.0, DistTo(origin));
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
172 let τ = 0.1;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
173
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
174 write_cylinder_faces_csv(dir, &cyl, 32, 32, 32, |x| f.apply(x) + g.apply(x))?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
175
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
176 /// Helper structure for saving the log into a CSV file
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
177 #[derive(Serialize,Deserialize,Debug)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
178 struct CSVLog<Face> {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
179 iter : usize,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
180 value : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
181 // serde is junk
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
182 //#[serde(flatten)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
183 //point : CSVCylPoint
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
184 face : Face,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
185 angle : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
186 r : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
187 z : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
188 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
189
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
190 let logmap = |iter, IterInfo { value, point } : IterInfo<OnCylinder<'_>>| {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
191 let CSVCylPoint {r, angle, z, face} = CSVCylPoint::from(&point);
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
192 CSVLog {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
193 iter, value, //point : CSVPoint::from(&point)
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
194 r, angle, z, face
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
195 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
196 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
197
42
271fba635bce Adjust demonstrations
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
198 run_and_save(dir, "x1", &f, &g, cyl.on_top(π*0.7, 0.8), τ, logmap)?;
271fba635bce Adjust demonstrations
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
199 run_and_save(dir, "x2", &f, &g, cyl.on_side(-π*0.42, -0.38), τ, logmap)?;
271fba635bce Adjust demonstrations
Tuomo Valkonen <tuomov@iki.fi>
parents: 37
diff changeset
200 run_and_save(dir, "x3", &f, &g, cyl.on_bottom(-π*0.3, 0.9), τ, logmap)
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
201
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
202 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
203
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
204
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
205 /// Runs [forward_backward] and saves the results.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
206 pub fn run_and_save<F, G, M, I>(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
207 dir : &str,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
208 name : &str,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
209 f : &F,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
210 g : &G,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
211 x : M,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
212 τ : f64,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
213 logmap : impl Fn(usize, IterInfo<M>) -> I
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
214 ) -> DynError
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
215 where M : ManifoldPoint
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
216 + EmbeddedManifoldPoint<EmbeddedCoords = Loc<f64, 3>>
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
217 + FacedManifoldPoint,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
218 F : Desc<M> + Mapping<M, Codomain = f64>,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
219 G : Prox<M> + Mapping<M, Codomain = f64>,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
220 I : Serialize {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
221
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
222 let mut logger = Logger::new();
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
223 let iter = AlgIteratorOptions{
32
eb07aee01d57 Higher τ and lower maxiter
Tuomo Valkonen <tuomov@iki.fi>
parents: 31
diff changeset
224 max_iter : 20,
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
225 verbose_iter : Verbose::Every(1),
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
226 .. Default::default()
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
227 }.mapped(logmap)
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
228 .into_log(&mut logger);
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
229
24
8b4b014277fa Multiple trajectories
Tuomo Valkonen <tuomov@iki.fi>
parents: 20
diff changeset
230 let x̂ = forward_backward(f, g, x, τ, iter);
7
8979a6638424 A simple test
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
231 println!("result = {}\n{:?}", x̂.embedded_coords(), &x̂);
11
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 9
diff changeset
232
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
233 logger.write_csv(format!("{dir}/{name}_log.csv"))?;
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
234
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
235 Ok(())
1
29738fae471e Added some missing files
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
236 }
11
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 9
diff changeset
237
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
238 /// Writes the values of `f` on `face` of a [`OnCube`] into a PNG file
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
239 /// with resolution `n × n`.
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
240 fn write_cube_face_imgs(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
241 dir : &str,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
242 n : usize,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
243 mut f : impl FnMut(&OnCube) -> f64
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
244 ) -> DynError {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
245 use crate::cube::Face;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
246
11
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 9
diff changeset
247 let grid = LinSpace {
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 9
diff changeset
248 start : Loc([0.0, 0.0]),
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 9
diff changeset
249 end : Loc([1.0, 1.0]),
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 9
diff changeset
250 count : [n, n]
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 9
diff changeset
251 };
31
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
252
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
253 let mut m = 0.0;
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
254 let mut datas = Vec::new();
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
255
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
256 for face in Face::all() {
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
257 let rawdata : Vec<_> = grid.into_iter()
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
258 .map(|Loc([x,y])| f(&OnCube::new(face, Loc([x, 1.0-y]))))
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
259 .collect();
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
260 m = rawdata.iter().copied().fold(m, f64::max);
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
261 datas.push((face, rawdata));
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
262 }
11
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 9
diff changeset
263
31
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
264 for (face, rawdata) in datas {
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
265 let mut img = ImageBuffer::new(n as u32, n as u32);
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
266 img.pixels_mut()
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
267 .zip(rawdata)
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
268 .for_each(|(p, v)| {
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
269 let t = v/m;
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
270 // A very colourful option for bug hunting.
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
271 //let rgb = [(50.0*t).cos(), (20.0*t).sin(), (3.0*t).cos()];
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
272 let rgb = [1.0-t, 1.0-t, 1.0];
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
273 *p = Rgb(rgb.map(|v| (v*(u8::RANGE_MAX as f64)) as u8))
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
274 });
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
275
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
276 img.save_with_format(format!("{dir}/{face}.png"), ImageFormat::Png)?;
31
49227d097d14 image saving changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 25
diff changeset
277 }
12
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
278
3b05a8b45b95 Save log to a CSV file
Tuomo Valkonen <tuomov@iki.fi>
parents: 11
diff changeset
279 Ok(())
11
933242e0f3b8 Basic face image export
Tuomo Valkonen <tuomov@iki.fi>
parents: 9
diff changeset
280 }
16
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
281
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
282 /// Writes the values of `f` on `face` of a [`OnCube`] into a CSV file
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
283 /// with resolution `n × n`.
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
284 fn write_cube_face_csv(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
285 filename : String,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
286 face : crate::cube::Face,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
287 n : usize,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
288 mut f : impl FnMut(&OnCube) -> f64
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
289 ) -> DynError {
16
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
290
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
291 #[derive(Serialize)]
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
292 struct CSVFace { u : f64, v : f64, value : f64 }
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
293
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
294 let grid = LinSpace {
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
295 start : Loc([0.0, 0.0]),
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
296 end : Loc([1.0, 1.0]),
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
297 count : [n, n]
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
298 };
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
299
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
300 let data = grid.into_iter()
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
301 .map(|p@Loc([u,v])| CSVFace{ u, v, value : f(&OnCube::new(face, p)) });
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
302
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
303 write_csv(data, format!("{filename}.csv"))?;
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
304
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
305 Ok(())
a6efe0fafd90 CSV output of face data
Tuomo Valkonen <tuomov@iki.fi>
parents: 13
diff changeset
306 }
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
307
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
308 /// Writes the values of `f` on the faces of a `cylinder`.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
309 fn write_cylinder_faces_csv<'a>(
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
310 dir : &str,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
311 cyl : &'a Cylinder,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
312 n_height : usize,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
313 n_radius : usize,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
314 n_angle : usize,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
315 mut f : impl FnMut(&OnCylinder<'a>) -> f64
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
316 ) -> DynError {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
317 let π = f64::PI;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
318
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
319 // Side front is [a, b] for the TikZ configuration.
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
320 let a = -π*5.0/6.0;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
321 let b = π/6.0;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
322
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
323 #[derive(Serialize)]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
324 struct CSVFace { angle : f64, /*cos_angle : f64, sin_angle : f64,*/ v : f64, value : f64 }
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
325
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
326 let mkf = |angle, v, value| CSVFace {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
327 angle,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
328 //cos_angle : angle.cos(),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
329 //sin_angle : angle.sin(),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
330 v,
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
331 value
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
332 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
333
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
334 let side_half_grid = LinSpace {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
335 start : Loc([0.0, cyl.bottom_z()]),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
336 end : Loc([π, cyl.top_z()]),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
337 count : [n_angle / 2, n_height]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
338 };
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
339
37
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
340 let side_grid = LinSpace {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
341 start : Loc([0.0, cyl.bottom_z()]),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
342 end : Loc([2.0*π, cyl.top_z()]),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
343 count : [n_angle, n_height]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
344 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
345 let cap_grid = LinSpace {
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
346 start : Loc([0.0, 0.0]),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
347 end : Loc([2.0*π, cyl.radius]),
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
348 count : [n_angle, n_radius]
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
349 };
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
350
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
351 let side_front = side_grid.into_iter()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
352 .map(|Loc([angle, v])| mkf(angle, v, f(&cyl.on_side(angle, v))));
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
353 write_csv(side_front, format!("{dir}/side.csv"))?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
354
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
355 let side_front = side_half_grid.into_iter()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
356 .map(|Loc([angle, v])| (normalise_angle(angle + a), v))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
357 .map(|(angle, v)| mkf(angle, v, f(&cyl.on_side(angle, v))));
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
358 write_csv(side_front, format!("{dir}/side_front.csv"))?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
359
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
360 let side_back = side_half_grid.into_iter()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
361 .map(|Loc([angle, v])| (normalise_angle(angle + b), v))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
362 .map(|(angle, v)| mkf(angle + π, v, f(&cyl.on_side(angle + π, v))));
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
363 write_csv(side_back, format!("{dir}/side_back.csv"))?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
364
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
365 let top = cap_grid.into_iter()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
366 .map(|Loc([angle, v])| mkf(angle, v, f(&cyl.on_top(angle, v))));
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
367 write_csv(top, format!("{dir}/top.csv"))?;
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
368
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
369 let bottom = cap_grid.into_iter()
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
370 .map(|Loc([angle, v])| mkf(angle, v, f(&cyl.on_bottom(angle, v))));
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
371 write_csv(bottom, format!("{dir}/bottom.csv"))
d7cd14b8ccc0 Basic cylinder implementation
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
372
20
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
373 }
bd6fd49146ce Test changes and more saving
Tuomo Valkonen <tuomov@iki.fi>
parents: 19
diff changeset
374

mercurial