src/mapping.rs

Sat, 21 Dec 2024 14:27:14 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Sat, 21 Dec 2024 14:27:14 -0500
branch
dev
changeset 78
cebedc4a8331
parent 61
05089fbc0310
child 68
c5f70e767511
permissions
-rw-r--r--

Try to use HasDual with adjoints. Problem with nalgebra Instances.

5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
1 /*!
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
2 Traits for mathematical functions.
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
3 */
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
4
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
5 use std::marker::PhantomData;
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
6 use std::borrow::Cow;
61
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
7 use crate::types::{Num, Float};
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
8 use serde::Serialize;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
9 use crate::loc::Loc;
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
10 pub use crate::instance::{Instance, Decomposition, BasicDecomposition, Space};
61
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
11 use crate::norms::{Norm, NormExponent};
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
12
13
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
13 /// A mapping from `Domain` to `Codomain`.
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
14 ///
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
15 /// This is automatically implemented when the relevant [`Apply`] are implemented.
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
16 pub trait Mapping<Domain : Space> {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
17 type Codomain : Space;
13
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
18
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
19 /// Compute the value of `self` at `x`.
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
20 fn apply<I : Instance<Domain>>(&self, x : I) -> Self::Codomain;
61
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
21
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
22 #[inline]
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
23 /// Form the composition `self ∘ other`
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
24 fn compose<X : Space, T : Mapping<X, Codomain=Domain>>(self, other : T)
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
25 -> Composition<Self, T>
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
26 where
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
27 Self : Sized
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
28 {
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
29 Composition{ outer : self, inner : other, intermediate_norm_exponent : () }
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
30 }
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
31
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
32
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
33 #[inline]
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
34 /// Form the composition `self ∘ other`, assigning a norm to the inermediate space
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
35 fn compose_with_norm<F, X, T, E>(
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
36 self, other : T, norm : E
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
37 ) -> Composition<Self, T, E>
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
38 where
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
39 Self : Sized,
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
40 X : Space,
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
41 T : Mapping<X, Codomain=Domain>,
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
42 E : NormExponent,
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
43 Domain : Norm<F, E>,
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
44 F : Num
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
45 {
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
46 Composition{ outer : self, inner : other, intermediate_norm_exponent : norm }
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
47 }
13
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
48 }
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
49
36
6a4b44b2cdf2 Add DifferentiableRealMapping shorthand
Tuomo Valkonen <tuomov@iki.fi>
parents: 35
diff changeset
50 /// Automatically implemented shorthand for referring to [`Mapping`]s from [`Loc<F, N>`] to `F`.
34
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
51 pub trait RealMapping<F : Float, const N : usize>
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
52 : Mapping<Loc<F, N>, Codomain = F> {}
13
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
53
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
54 impl<F : Float, T, const N : usize> RealMapping<F, N> for T
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
55 where T : Mapping<Loc<F, N>, Codomain = F> {}
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
56
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
57 /// A helper trait alias for referring to [`Mapping`]s from [`Loc<F, N>`] to [`Loc<F, M>`].
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
58 pub trait RealVectorField<F : Float, const N : usize, const M : usize>
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
59 : Mapping<Loc<F, N>, Codomain = Loc<F, M>> {}
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
60
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
61 impl<F : Float, T, const N : usize, const M : usize> RealVectorField<F, N, M> for T
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
62 where T : Mapping<Loc<F, N>, Codomain = Loc<F, M>> {}
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
63
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
64 /// A differentiable mapping from `Domain` to [`Mapping::Codomain`], with differentials
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
65 /// `Differential`.
13
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
66 ///
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
67 /// This is automatically implemented when [`DifferentiableImpl`] is.
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
68 pub trait DifferentiableMapping<Domain : Space> : Mapping<Domain> {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
69 type DerivativeDomain : Space;
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
70 type Differential<'b> : Mapping<Domain, Codomain=Self::DerivativeDomain> where Self : 'b;
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
71
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
72 /// Calculate differential at `x`
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
73 fn differential<I : Instance<Domain>>(&self, x : I) -> Self::DerivativeDomain;
34
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
74
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
75 /// Form the differential mapping of `self`.
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
76 fn diff(self) -> Self::Differential<'static>;
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
77
48
3f3e00e81755 Some Differential GATs
Tuomo Valkonen <tuomov@iki.fi>
parents: 47
diff changeset
78 /// Form the differential mapping of `self`.
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
79 fn diff_ref(&self) -> Self::Differential<'_>;
48
3f3e00e81755 Some Differential GATs
Tuomo Valkonen <tuomov@iki.fi>
parents: 47
diff changeset
80 }
3f3e00e81755 Some Differential GATs
Tuomo Valkonen <tuomov@iki.fi>
parents: 47
diff changeset
81
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
82 /// Automatically implemented shorthand for referring to differentiable [`Mapping`]s from
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
83 /// [`Loc<F, N>`] to `F`.
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
84 pub trait DifferentiableRealMapping<F : Float, const N : usize>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
85 : DifferentiableMapping<Loc<F, N>, Codomain = F, DerivativeDomain = Loc<F, N>> {}
48
3f3e00e81755 Some Differential GATs
Tuomo Valkonen <tuomov@iki.fi>
parents: 47
diff changeset
86
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
87 impl<F : Float, T, const N : usize> DifferentiableRealMapping<F, N> for T
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
88 where T : DifferentiableMapping<Loc<F, N>, Codomain = F, DerivativeDomain = Loc<F, N>> {}
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
89
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
90 /// Helper trait for implementing [`DifferentiableMapping`]
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
91 pub trait DifferentiableImpl<X : Space> : Sized {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
92 type Derivative : Space;
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
93
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
94 /// Compute the differential of `self` at `x`, consuming the input.
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
95 fn differential_impl<I : Instance<X>>(&self, x : I) -> Self::Derivative;
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
96 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
97
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
98 impl<T, Domain> DifferentiableMapping<Domain> for T
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
99 where
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
100 Domain : Space,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
101 T : Clone + Mapping<Domain> + DifferentiableImpl<Domain>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
102 {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
103 type DerivativeDomain = T::Derivative;
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
104 type Differential<'b> = Differential<'b, Domain, Self> where Self : 'b;
48
3f3e00e81755 Some Differential GATs
Tuomo Valkonen <tuomov@iki.fi>
parents: 47
diff changeset
105
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
106 #[inline]
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
107 fn differential<I : Instance<Domain>>(&self, x : I) -> Self::DerivativeDomain {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
108 self.differential_impl(x)
34
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
109 }
44
8de8a80852c2 diff_ref
Tuomo Valkonen <tuomov@iki.fi>
parents: 42
diff changeset
110
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
111 fn diff(self) -> Differential<'static, Domain, Self> {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
112 Differential{ g : Cow::Owned(self), _space : PhantomData }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
113 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
114
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
115 fn diff_ref(&self) -> Differential<'_, Domain, Self> {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
116 Differential{ g : Cow::Borrowed(self), _space : PhantomData }
44
8de8a80852c2 diff_ref
Tuomo Valkonen <tuomov@iki.fi>
parents: 42
diff changeset
117 }
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
118 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
119
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
120 /// A sum of [`Mapping`]s.
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
121 #[derive(Serialize, Debug, Clone)]
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
122 pub struct Sum<Domain, M> {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
123 components : Vec<M>,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
124 _domain : PhantomData<Domain>,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
125 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
126
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
127 impl<Domain, M> Sum<Domain, M> {
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
128 /// Construct from an iterator.
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
129 pub fn new<I : Iterator<Item = M>>(iter : I) -> Self {
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
130 Sum { components : iter.collect(), _domain : PhantomData }
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
131 }
39
dd144a972722 Add Sum::iter
Tuomo Valkonen <tuomov@iki.fi>
parents: 36
diff changeset
132
dd144a972722 Add Sum::iter
Tuomo Valkonen <tuomov@iki.fi>
parents: 36
diff changeset
133 /// Iterate over the component functions of the sum
dd144a972722 Add Sum::iter
Tuomo Valkonen <tuomov@iki.fi>
parents: 36
diff changeset
134 pub fn iter(&self) -> std::slice::Iter<'_, M> {
dd144a972722 Add Sum::iter
Tuomo Valkonen <tuomov@iki.fi>
parents: 36
diff changeset
135 self.components.iter()
dd144a972722 Add Sum::iter
Tuomo Valkonen <tuomov@iki.fi>
parents: 36
diff changeset
136 }
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
137 }
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
138
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
139
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
140 impl<Domain, M> Mapping<Domain> for Sum<Domain, M>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
141 where
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
142 Domain : Space + Clone,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
143 M : Mapping<Domain>,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
144 M::Codomain : std::iter::Sum + Clone
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
145 {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
146 type Codomain = M::Codomain;
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
147
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
148 fn apply<I : Instance<Domain>>(&self, x : I) -> Self::Codomain {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
149 let xr = x.ref_instance();
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
150 self.components.iter().map(|c| c.apply(xr)).sum()
42
b4d369698556 Sum Apply implementation improvements
Tuomo Valkonen <tuomov@iki.fi>
parents: 39
diff changeset
151 }
b4d369698556 Sum Apply implementation improvements
Tuomo Valkonen <tuomov@iki.fi>
parents: 39
diff changeset
152 }
b4d369698556 Sum Apply implementation improvements
Tuomo Valkonen <tuomov@iki.fi>
parents: 39
diff changeset
153
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
154 impl<Domain, M> DifferentiableImpl<Domain> for Sum<Domain, M>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
155 where
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
156 Domain : Space + Clone,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
157 M : DifferentiableMapping<Domain>,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
158 M :: DerivativeDomain : std::iter::Sum
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
159 {
48
3f3e00e81755 Some Differential GATs
Tuomo Valkonen <tuomov@iki.fi>
parents: 47
diff changeset
160 type Derivative = M::DerivativeDomain;
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
161
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
162 fn differential_impl<I : Instance<Domain>>(&self, x : I) -> Self::Derivative {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
163 let xr = x.ref_instance();
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
164 self.components.iter().map(|c| c.differential(xr)).sum()
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
165 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
166 }
34
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
167
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
168 /// Container for the differential [`Mapping`] of a [`Differentiable`] mapping.
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
169 pub struct Differential<'a, X, G : Clone> {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
170 g : Cow<'a, G>,
34
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
171 _space : PhantomData<X>
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
172 }
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
173
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
174 impl<'a, X, G : Clone> Differential<'a, X, G> {
49
edb95d2b83cc Ref is not needed.
Tuomo Valkonen <tuomov@iki.fi>
parents: 48
diff changeset
175 pub fn base_fn(&self) -> &G {
edb95d2b83cc Ref is not needed.
Tuomo Valkonen <tuomov@iki.fi>
parents: 48
diff changeset
176 &self.g
edb95d2b83cc Ref is not needed.
Tuomo Valkonen <tuomov@iki.fi>
parents: 48
diff changeset
177 }
edb95d2b83cc Ref is not needed.
Tuomo Valkonen <tuomov@iki.fi>
parents: 48
diff changeset
178 }
edb95d2b83cc Ref is not needed.
Tuomo Valkonen <tuomov@iki.fi>
parents: 48
diff changeset
179
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
180 impl<'a, X, G> Mapping<X> for Differential<'a, X, G>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
181 where
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
182 X : Space,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
183 G : Clone + DifferentiableMapping<X>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
184 {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
185 type Codomain = G::DerivativeDomain;
34
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
186
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
187 #[inline]
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
188 fn apply<I : Instance<X>>(&self, x : I) -> Self::Codomain {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
189 (*self.g).differential(x)
34
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
190 }
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
191 }
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
192
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
193 /// Container for flattening [`Loc`]`<F, 1>` codomain of a [`Mapping`] to `F`.
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
194 pub struct FlattenedCodomain<X, F, G> {
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
195 g : G,
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
196 _phantoms : PhantomData<(X, F)>
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
197 }
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
198
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
199 impl<F : Space, X, G> Mapping<X> for FlattenedCodomain<X, F, G>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
200 where
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
201 X : Space,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
202 G: Mapping<X, Codomain=Loc<F, 1>>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
203 {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
204 type Codomain = F;
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
205
34
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
206 #[inline]
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
207 fn apply<I : Instance<X>>(&self, x : I) -> Self::Codomain {
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
208 self.g.apply(x).flatten1d()
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
209 }
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
210 }
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
211
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
212 /// An auto-trait for constructing a [`FlattenCodomain`] structure for
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
213 /// flattening the codomain of a [`Mapping`] from [`Loc`]`<F, 1>` to `F`.
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
214 pub trait FlattenCodomain<X : Space, F> : Mapping<X, Codomain=Loc<F, 1>> + Sized {
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
215 /// Flatten the codomain from [`Loc`]`<F, 1>` to `F`.
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
216 fn flatten_codomain(self) -> FlattenedCodomain<X, F, Self> {
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
217 FlattenedCodomain{ g : self, _phantoms : PhantomData }
34
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
218 }
3dbc04100b09 Add Differential struct and DifferentiableMapping.diff
Tuomo Valkonen <tuomov@iki.fi>
parents: 29
diff changeset
219 }
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
220
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
221 impl<X : Space, F, G : Sized + Mapping<X, Codomain=Loc<F, 1>>> FlattenCodomain<X, F> for G {}
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
222
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
223 /// Container for dimensional slicing [`Loc`]`<F, N>` codomain of a [`Mapping`] to `F`.
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
224 pub struct SlicedCodomain<'a, X, F, G : Clone, const N : usize> {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
225 g : Cow<'a, G>,
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
226 slice : usize,
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
227 _phantoms : PhantomData<(X, F)>
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
228 }
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
229
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
230 impl<'a, X, F, G, const N : usize> Mapping<X> for SlicedCodomain<'a, X, F, G, N>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
231 where
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
232 X : Space,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
233 F : Copy + Space,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
234 G : Mapping<X, Codomain=Loc<F, N>> + Clone,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
235 {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
236 type Codomain = F;
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
237
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
238 #[inline]
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
239 fn apply<I : Instance<X>>(&self, x : I) -> Self::Codomain {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
240 let tmp : [F; N] = (*self.g).apply(x).into();
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
241 // Safety: `slice_codomain` below checks the range.
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
242 unsafe { *tmp.get_unchecked(self.slice) }
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
243 }
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
244 }
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
245
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
246 /// An auto-trait for constructing a [`FlattenCodomain`] structure for
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
247 /// flattening the codomain of a [`Mapping`] from [`Loc`]`<F, 1>` to `F`.
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
248 pub trait SliceCodomain<X : Space, F : Copy, const N : usize>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
249 : Mapping<X, Codomain=Loc<F, N>> + Clone + Sized
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
250 {
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
251 /// Flatten the codomain from [`Loc`]`<F, 1>` to `F`.
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
252 fn slice_codomain(self, slice : usize) -> SlicedCodomain<'static, X, F, Self, N> {
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
253 assert!(slice < N);
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
254 SlicedCodomain{ g : Cow::Owned(self), slice, _phantoms : PhantomData }
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
255 }
44
8de8a80852c2 diff_ref
Tuomo Valkonen <tuomov@iki.fi>
parents: 42
diff changeset
256
8de8a80852c2 diff_ref
Tuomo Valkonen <tuomov@iki.fi>
parents: 42
diff changeset
257 /// Flatten the codomain from [`Loc`]`<F, 1>` to `F`.
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
258 fn slice_codomain_ref(&self, slice : usize) -> SlicedCodomain<'_, X, F, Self, N> {
44
8de8a80852c2 diff_ref
Tuomo Valkonen <tuomov@iki.fi>
parents: 42
diff changeset
259 assert!(slice < N);
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
260 SlicedCodomain{ g : Cow::Borrowed(self), slice, _phantoms : PhantomData }
44
8de8a80852c2 diff_ref
Tuomo Valkonen <tuomov@iki.fi>
parents: 42
diff changeset
261 }
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
262 }
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
263
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 53
diff changeset
264 impl<X : Space, F : Copy, G : Sized + Mapping<X, Codomain=Loc<F, N>> + Clone, const N : usize>
35
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
265 SliceCodomain<X, F, N>
3b82a9d16307 Add Mapping codomain slicing and RealVectorField
Tuomo Valkonen <tuomov@iki.fi>
parents: 34
diff changeset
266 for G {}
61
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
267
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
268
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
269 /// The composition S ∘ T. `E` is for storing a `NormExponent` for the intermediate space.
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
270 pub struct Composition<S, T, E = ()> {
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
271 pub outer : S,
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
272 pub inner : T,
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
273 pub intermediate_norm_exponent : E
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
274 }
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
275
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
276 impl<S, T, X, E> Mapping<X> for Composition<S, T, E>
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
277 where
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
278 X : Space,
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
279 T : Mapping<X>,
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
280 S : Mapping<T::Codomain>
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
281 {
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
282 type Codomain = S::Codomain;
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
283
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
284 #[inline]
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
285 fn apply<I : Instance<X>>(&self, x : I) -> Self::Codomain {
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
286 self.outer.apply(self.inner.apply(x))
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
287 }
05089fbc0310 Compositions
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
288 }

mercurial