src/nalgebra_support.rs

Wed, 03 Sep 2025 21:03:47 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Wed, 03 Sep 2025 21:03:47 -0500
branch
dev
changeset 173
102421d462d1
parent 172
73608862ef54
child 174
53ab61a41d70
permissions
-rw-r--r--

No either

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 Integration with nalgebra.
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
3
63
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 62
diff changeset
4 This module mainly implements [`Euclidean`], [`Norm`], [`Linear`], etc. for [`nalgebra`]
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
5 matrices and vectors.
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
6 It also provides [`ToNalgebraRealField`] as a vomit-inducingly ugly workaround to nalgebra
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
7 force-feeding its own versions of the same basic mathematical methods on `f32` and `f64` as
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
8 [`num_traits`] does.
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
9 */
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
10
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
11 use crate::euclidean::*;
162
bea0c3841ced cow_owned etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 160
diff changeset
12 use crate::instance::{Decomposition, Instance, MyCow, Ownable, Space};
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
13 use crate::linops::*;
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
14 use crate::norms::*;
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
15 use crate::types::Float;
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
16 use nalgebra::base::allocator::Allocator;
158
Tuomo Valkonen <tuomov@iki.fi>
parents: 157
diff changeset
17 use nalgebra::base::constraint::{DimEq, SameNumberOfColumns, SameNumberOfRows, ShapeConstraint};
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
18 use nalgebra::base::dimension::*;
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
19 use nalgebra::{
156
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
20 ClosedAddAssign, ClosedMulAssign, DefaultAllocator, Dim, LpNorm, Matrix, MatrixView, OMatrix,
158
Tuomo Valkonen <tuomov@iki.fi>
parents: 157
diff changeset
21 OVector, RawStorage, RealField, Scalar, SimdComplexField, Storage, StorageMut, UniformNorm,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
22 Vector, U1,
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
23 };
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
24 use num_traits::identities::{One, Zero};
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
25 use std::ops::Mul;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
26
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
27 impl<S, M, N, E> Ownable for Matrix<E, M, N, S>
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
28 where
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
29 S: Storage<E, M, N>,
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
30 M: Dim,
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
31 N: Dim,
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
32 E: Scalar + Zero + One,
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
33 DefaultAllocator: Allocator<M, N>,
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
34 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
35 type OwnedVariant = OMatrix<E, M, N>;
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
36
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
37 #[inline]
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
38 fn into_owned(self) -> Self::OwnedVariant {
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
39 Matrix::into_owned(self)
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
40 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
41
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
42 /// Returns an owned instance of a reference.
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
43 fn clone_owned(&self) -> Self::OwnedVariant {
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
44 Matrix::clone_owned(self)
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
45 }
162
bea0c3841ced cow_owned etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 160
diff changeset
46
bea0c3841ced cow_owned etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 160
diff changeset
47 fn cow_owned<'b>(self) -> MyCow<'b, Self::OwnedVariant>
bea0c3841ced cow_owned etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 160
diff changeset
48 where
bea0c3841ced cow_owned etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 160
diff changeset
49 Self: 'b,
bea0c3841ced cow_owned etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 160
diff changeset
50 {
166
Tuomo Valkonen <tuomov@iki.fi>
parents: 165
diff changeset
51 MyCow::Owned(self.into_owned())
Tuomo Valkonen <tuomov@iki.fi>
parents: 165
diff changeset
52 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 165
diff changeset
53
Tuomo Valkonen <tuomov@iki.fi>
parents: 165
diff changeset
54 fn ref_cow_owned<'b>(&'b self) -> MyCow<'b, Self::OwnedVariant>
Tuomo Valkonen <tuomov@iki.fi>
parents: 165
diff changeset
55 where
Tuomo Valkonen <tuomov@iki.fi>
parents: 165
diff changeset
56 Self: 'b,
Tuomo Valkonen <tuomov@iki.fi>
parents: 165
diff changeset
57 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 165
diff changeset
58 MyCow::Owned(self.clone_owned())
162
bea0c3841ced cow_owned etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 160
diff changeset
59 }
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
60 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
61
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
62 trait StridesOk<E, N, M = U1, S = <DefaultAllocator as Allocator<N, M>>::Buffer<E>>:
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
63 DimEq<Dyn, S::RStride>
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
64 + DimEq<Dyn, S::CStride>
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
65 + DimEq<Dyn, <<DefaultAllocator as Allocator<N, M>>::Buffer<E> as RawStorage<E, N, M>>::RStride>
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
66 + DimEq<Dyn, <<DefaultAllocator as Allocator<N, M>>::Buffer<E> as RawStorage<E, N, M>>::CStride>
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
67 where
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
68 S: RawStorage<E, N, M>,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
69 E: Scalar,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
70 N: Dim,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
71 M: Dim,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
72 DefaultAllocator: Allocator<N, M>,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
73 {
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
74 }
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
75
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
76 impl<S, E, N, M> StridesOk<E, N, M, S> for ShapeConstraint
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
77 where
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
78 ShapeConstraint: DimEq<Dyn, S::RStride>
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
79 + DimEq<Dyn, S::CStride>
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
80 + DimEq<
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
81 Dyn,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
82 <<DefaultAllocator as Allocator<N, M>>::Buffer<E> as RawStorage<E, N, M>>::RStride,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
83 > + DimEq<
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
84 Dyn,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
85 <<DefaultAllocator as Allocator<N, M>>::Buffer<E> as RawStorage<E, N, M>>::CStride,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
86 >,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
87 S: Storage<E, N, M>,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
88 E: Scalar,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
89 N: Dim,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
90 M: Dim,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
91 DefaultAllocator: Allocator<N, M>,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
92 {
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
93 }
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
94
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
95 impl<SM, N, M, E> Space for Matrix<E, N, M, SM>
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 56
diff changeset
96 where
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
97 SM: Storage<E, N, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
98 N: Dim,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
99 M: Dim,
165
478c23ce7cef Copiable MatrixViews
Tuomo Valkonen <tuomov@iki.fi>
parents: 164
diff changeset
100 E: Scalar + Zero + One + Copy,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
101 DefaultAllocator: Allocator<N, M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
102 ShapeConstraint: StridesOk<E, N, M, SM> + StridesOk<E, N, M>,
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 56
diff changeset
103 {
164
fd9dba51afd3 OwnedSpace -> Principal
Tuomo Valkonen <tuomov@iki.fi>
parents: 162
diff changeset
104 type Principal = OMatrix<E, N, M>;
156
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
105 type Decomp = MatrixDecomposition;
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
106 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
107
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
108 #[derive(Copy, Clone, Debug)]
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
109 pub struct MatrixDecomposition;
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
110
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
111 impl<E, M, K, S> Decomposition<Matrix<E, M, K, S>> for MatrixDecomposition
156
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
112 where
158
Tuomo Valkonen <tuomov@iki.fi>
parents: 157
diff changeset
113 S: Storage<E, M, K>,
156
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
114 M: Dim,
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
115 K: Dim,
165
478c23ce7cef Copiable MatrixViews
Tuomo Valkonen <tuomov@iki.fi>
parents: 164
diff changeset
116 E: Scalar + Zero + One + Copy,
156
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
117 DefaultAllocator: Allocator<M, K>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
118 ShapeConstraint: StridesOk<E, M, K, S> + StridesOk<E, M, K>,
156
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
119 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
120 type Decomposition<'b>
172
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
121 = MyCow<'b, OMatrix<E, M, K>>
156
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
122 where
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
123 Matrix<E, M, K, S>: 'b;
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
124 type Reference<'b>
158
Tuomo Valkonen <tuomov@iki.fi>
parents: 157
diff changeset
125 = MatrixView<'b, E, M, K, Dyn, Dyn>
156
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
126 where
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
127 Matrix<E, M, K, S>: 'b;
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
128
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
129 #[inline]
157
2ac69af65636 matrix fubar
Tuomo Valkonen <tuomov@iki.fi>
parents: 156
diff changeset
130 fn lift<'b>(r: Self::Reference<'b>) -> Self::Decomposition<'b>
2ac69af65636 matrix fubar
Tuomo Valkonen <tuomov@iki.fi>
parents: 156
diff changeset
131 where
2ac69af65636 matrix fubar
Tuomo Valkonen <tuomov@iki.fi>
parents: 156
diff changeset
132 S: 'b,
2ac69af65636 matrix fubar
Tuomo Valkonen <tuomov@iki.fi>
parents: 156
diff changeset
133 {
172
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
134 MyCow::Owned(r.into_owned())
156
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
135 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
136 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
137
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
138 impl<S1, S2, M, K, E> Instance<Matrix<E, M, K, S1>, MatrixDecomposition> for Matrix<E, M, K, S2>
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
139 where
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
140 S1: Storage<E, M, K>,
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
141 S2: Storage<E, M, K>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
142 M: Dim,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
143 K: Dim,
165
478c23ce7cef Copiable MatrixViews
Tuomo Valkonen <tuomov@iki.fi>
parents: 164
diff changeset
144 E: Scalar + Zero + One + Copy,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
145 DefaultAllocator: Allocator<M, K>,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
146 ShapeConstraint: StridesOk<E, M, K, S1> + StridesOk<E, M, K, S2>,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
147 {
168
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
148 #[inline]
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
149 fn eval_ref<'b, R>(
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
150 &'b self,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
151 f: impl FnOnce(<MatrixDecomposition as Decomposition<Matrix<E, M, K, S1>>>::Reference<'b>) -> R,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
152 ) -> R
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
153 where
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
154 Self: 'b,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
155 Matrix<E, M, K, S1>: 'b,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
156 {
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
157 f(self.as_view::<M, K, Dyn, Dyn>())
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
158 }
156
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
159
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
160 #[inline]
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
161 fn own(self) -> OMatrix<E, M, K> {
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
162 self.into_owned()
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
163 }
168
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
164
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
165 #[inline]
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
166 fn cow<'b>(self) -> MyCow<'b, OMatrix<E, M, K>>
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
167 where
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
168 Self: 'b,
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
169 {
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
170 self.cow_owned()
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
171 }
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
172
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
173 #[inline]
172
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
174 fn decompose<'b>(self) -> MyCow<'b, OMatrix<E, M, K>>
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
175 where
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
176 Self: 'b,
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
177 {
172
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
178 self.cow_owned()
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
179 }
13
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
180 }
465fa2121ccb Better Linear and Mapping structure that can provide consuming and reference `apply`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
181
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
182 impl<'a, S1, S2, M, K, E> Instance<Matrix<E, M, K, S1>, MatrixDecomposition>
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
183 for &'a Matrix<E, M, K, S2>
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
184 where
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
185 S1: Storage<E, M, K>,
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
186 S2: Storage<E, M, K>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
187 M: Dim,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
188 K: Dim,
165
478c23ce7cef Copiable MatrixViews
Tuomo Valkonen <tuomov@iki.fi>
parents: 164
diff changeset
189 E: Scalar + Zero + One + Copy,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
190 DefaultAllocator: Allocator<M, K>,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
191 ShapeConstraint: StridesOk<E, M, K, S1> + StridesOk<E, M, K, S2>,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
192 {
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
193 fn eval_ref<'b, R>(
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
194 &'b self,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
195 f: impl FnOnce(<MatrixDecomposition as Decomposition<Matrix<E, M, K, S1>>>::Reference<'b>) -> R,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
196 ) -> R
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
197 where
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
198 Self: 'b,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
199 Matrix<E, M, K, S1>: 'b,
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
200 {
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
201 f((*self).as_view::<M, K, Dyn, Dyn>())
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
202 }
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
203
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
204 #[inline]
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
205 fn own(self) -> OMatrix<E, M, K> {
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
206 self.into_owned()
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
207 }
168
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
208
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
209 #[inline]
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
210 fn cow<'b>(self) -> MyCow<'b, OMatrix<E, M, K>>
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
211 where
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
212 Self: 'b,
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
213 {
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
214 self.cow_owned()
93daa824c04a No supertraits for Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 167
diff changeset
215 }
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
216
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
217 #[inline]
172
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
218 fn decompose<'b>(self) -> MyCow<'b, OMatrix<E, M, K>>
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
219 where
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
220 Self: 'b,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
221 {
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
222 self.cow_owned()
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
223 }
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
224 }
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
225
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
226 impl<'a, S1, M, K, E> Instance<Matrix<E, M, K, S1>, MatrixDecomposition>
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
227 for MyCow<'a, OMatrix<E, M, K>>
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
228 where
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
229 S1: Storage<E, M, K>,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
230 M: Dim,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
231 K: Dim,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
232 E: Scalar + Zero + One + Copy,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
233 DefaultAllocator: Allocator<M, K>,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
234 ShapeConstraint: StridesOk<E, M, K, S1> + StridesOk<E, M, K>,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
235 {
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
236 #[inline]
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
237 fn eval_ref<'b, R>(
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
238 &'b self,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
239 f: impl FnOnce(<MatrixDecomposition as Decomposition<Matrix<E, M, K, S1>>>::Reference<'b>) -> R,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
240 ) -> R
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
241 where
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
242 Self: 'b,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
243 Matrix<E, M, K, S1>: 'b,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
244 {
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
245 f(self.as_view::<M, K, Dyn, Dyn>())
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
246 }
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
247
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
248 #[inline]
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
249 fn own(self) -> OMatrix<E, M, K> {
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
250 self.into_owned()
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
251 }
172
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
252
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
253 #[inline]
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
254 fn cow<'b>(self) -> MyCow<'b, OMatrix<E, M, K>>
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
255 where
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
256 Self: 'b,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
257 {
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
258 self
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
259 }
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
260
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
261 #[inline]
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
262 fn decompose<'b>(self) -> MyCow<'b, OMatrix<E, M, K>>
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
263 where
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
264 Self: 'b,
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
265 {
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
266 self
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
267 }
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
268 }
158
Tuomo Valkonen <tuomov@iki.fi>
parents: 157
diff changeset
269
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
270 impl<SM, N, M, K, E> Mapping<OMatrix<E, M, K>> for Matrix<E, N, M, SM>
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
271 where
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
272 SM: Storage<E, N, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
273 N: Dim,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
274 M: Dim,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
275 K: Dim,
165
478c23ce7cef Copiable MatrixViews
Tuomo Valkonen <tuomov@iki.fi>
parents: 164
diff changeset
276 E: Scalar + Zero + One + Copy + ClosedMulAssign + ClosedAddAssign,
167
effb80efba09 nalgebra stuff
Tuomo Valkonen <tuomov@iki.fi>
parents: 166
diff changeset
277 DefaultAllocator: Allocator<N, K> + Allocator<M, K> + Allocator<N, M>,
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
278 ShapeConstraint: StridesOk<E, N, M, SM> + StridesOk<E, M, K> + StridesOk<E, N, K>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
279 {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
280 type Codomain = OMatrix<E, N, K>;
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 56
diff changeset
281
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 56
diff changeset
282 #[inline]
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
283 fn apply<I: Instance<OMatrix<E, M, K>>>(&self, x: I) -> Self::Codomain {
172
73608862ef54 nalgebra instance hacks
Tuomo Valkonen <tuomov@iki.fi>
parents: 171
diff changeset
284 x.eval_ref(|refr| self.mul(refr))
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 56
diff changeset
285 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 56
diff changeset
286 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 56
diff changeset
287
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
288 impl<'a, SM, N, M, K, E> Linear<OMatrix<E, M, K>> for Matrix<E, N, M, SM>
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
289 where
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
290 SM: Storage<E, N, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
291 N: Dim,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
292 M: Dim,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
293 K: Dim,
165
478c23ce7cef Copiable MatrixViews
Tuomo Valkonen <tuomov@iki.fi>
parents: 164
diff changeset
294 E: Scalar + Zero + One + Copy + ClosedMulAssign + ClosedAddAssign,
167
effb80efba09 nalgebra stuff
Tuomo Valkonen <tuomov@iki.fi>
parents: 166
diff changeset
295 DefaultAllocator: Allocator<N, K> + Allocator<M, K> + Allocator<N, M>,
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
296 ShapeConstraint: StridesOk<E, N, M, SM> + StridesOk<E, M, K> + StridesOk<E, N, K>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
297 {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
298 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
299
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
300 impl<SM, SV2, N, M, K, E> GEMV<E, OMatrix<E, M, K>, Matrix<E, N, K, SV2>> for Matrix<E, N, M, SM>
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
301 where
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
302 SM: Storage<E, N, M>,
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
303 SV2: StorageMut<E, N, K>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
304 N: Dim,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
305 M: Dim,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
306 K: Dim,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
307 E: Scalar + Zero + One + Float,
167
effb80efba09 nalgebra stuff
Tuomo Valkonen <tuomov@iki.fi>
parents: 166
diff changeset
308 DefaultAllocator: Allocator<N, K> + Allocator<M, K> + Allocator<N, M>,
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
309 ShapeConstraint: StridesOk<E, N, M, SM> + StridesOk<E, N, K, SV2> + StridesOk<E, M, K>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
310 {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
311 #[inline]
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
312 fn gemv<I: Instance<OMatrix<E, M, K>>>(
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
313 &self, y: &mut Matrix<E, N, K, SV2>, α: E, x: I, β: E
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 56
diff changeset
314 ) {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 56
diff changeset
315 x.eval(|x̃| Matrix::gemm(y, α, self, x̃, β))
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
316 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
317
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
318 #[inline]
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
319 fn apply_mut<'a, I: Instance<OMatrix<E, M, K>>>(&self, y: &mut Matrix<E, N, K, SV2>, x: I) {
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 56
diff changeset
320 x.eval(|x̃| self.mul_to(x̃, y))
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
321 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
322 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
323
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
324 impl<S, M, N, E> VectorSpace for Matrix<E, M, N, S>
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
325 where
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
326 S: Storage<E, M, N>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
327 M: Dim,
148
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
328 N: Dim,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
329 E: Scalar + Zero + One + Float,
148
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
330 DefaultAllocator: Allocator<M, N>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
331 ShapeConstraint: StridesOk<E, M, N, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
332 {
129
d2994e34a5f5 Simplify ZeroOp to SimpleZeroOp, only from X to X. Add Prox for ZeroIndicator. Move F parameter to AXPY::Field.
Tuomo Valkonen <tuomov@iki.fi>
parents: 124
diff changeset
333 type Field = E;
164
fd9dba51afd3 OwnedSpace -> Principal
Tuomo Valkonen <tuomov@iki.fi>
parents: 162
diff changeset
334 type PrincipalV = OMatrix<E, M, N>;
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
335
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
336 #[inline]
164
fd9dba51afd3 OwnedSpace -> Principal
Tuomo Valkonen <tuomov@iki.fi>
parents: 162
diff changeset
337 fn similar_origin(&self) -> Self::PrincipalV {
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
338 let (n, m) = self.shape_generic();
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
339 OMatrix::zeros_generic(n, m)
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
340 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
341 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
342
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
343 impl<SM, SV1, M, N, E> AXPY<Matrix<E, M, N, SV1>> for Matrix<E, M, N, SM>
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
344 where
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
345 SM: StorageMut<E, M, N>,
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
346 SV1: Storage<E, M, N>,
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
347 M: Dim,
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
348 N: Dim,
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
349 E: Scalar + Zero + One + Float,
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
350 DefaultAllocator: Allocator<M, N>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
351 ShapeConstraint: StridesOk<E, M, N, SM> + StridesOk<E, M, N, SV1>,
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
352 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
353 #[inline]
148
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
354 fn axpy<I: Instance<Matrix<E, M, N, SV1>>>(&mut self, α: E, x: I, β: E) {
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
355 x.eval(|x̃| {
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
356 assert_eq!(self.ncols(), x̃.ncols());
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
357 // nalgebra does not implement axpy for matrices, and flattenining
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
358 // also seems difficult, so loop over columns.
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
359 for (mut y, ỹ) in self.column_iter_mut().zip(x̃.column_iter()) {
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
360 Vector::axpy(&mut y, α, &ỹ, β)
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
361 }
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
362 })
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
363 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
364
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
365 #[inline]
148
26ef556870fd AXPY for nalgebra matrices, not just vectors
Tuomo Valkonen <tuomov@iki.fi>
parents: 145
diff changeset
366 fn copy_from<I: Instance<Matrix<E, M, N, SV1>>>(&mut self, y: I) {
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
367 y.eval_ref(|ỹ| Matrix::copy_from(self, &ỹ))
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
368 }
62
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
369
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
370 #[inline]
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
371 fn set_zero(&mut self) {
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
372 self.iter_mut().for_each(|e| *e = E::ZERO);
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
373 }
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
374 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
375
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
376 /* Implemented automatically as Euclidean.
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
377 impl<SM,M,E> Projection<E, L2> for Vector<E,M,SM>
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
378 where SM: StorageMut<E,M> + Clone,
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
379 M : Dim, E : Scalar + Zero + One + Float + RealField,
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
380 DefaultAllocator : Allocator<M> {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
381 #[inline]
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
382 fn proj_ball_mut(&mut self, ρ : E, _ : L2) {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
383 let n = self.norm(L2);
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
384 if n > ρ {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
385 self.iter_mut().for_each(|v| *v *= ρ/n)
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
386 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
387 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
388 }*/
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
389
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
390 impl<SM, M, E> Projection<E, Linfinity> for Vector<E, M, SM>
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
391 where
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
392 SM: StorageMut<E, M> + Clone,
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
393 M: Dim,
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
394 E: Scalar + Zero + One + Float + RealField,
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
395 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
396 ShapeConstraint: StridesOk<E, M, U1, SM>,
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
397 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
398 #[inline]
164
fd9dba51afd3 OwnedSpace -> Principal
Tuomo Valkonen <tuomov@iki.fi>
parents: 162
diff changeset
399 fn proj_ball(self, ρ: E, exp: Linfinity) -> <Self as Space>::Principal {
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
400 let mut owned = self.into_owned();
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
401 owned.proj_ball_mut(ρ, exp);
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
402 owned
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
403 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
404 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
405
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
406 impl<SM, M, E> ProjectionMut<E, Linfinity> for Vector<E, M, SM>
Tuomo Valkonen <tuomov@iki.fi>
parents: 148
diff changeset
407 where
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
408 SM: StorageMut<E, M> + Clone,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
409 M: Dim,
165
478c23ce7cef Copiable MatrixViews
Tuomo Valkonen <tuomov@iki.fi>
parents: 164
diff changeset
410 E: Scalar + Zero + One + Copy + Float + RealField,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
411 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
412 ShapeConstraint: StridesOk<E, M, U1, SM>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
413 {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
414 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
415 fn proj_ball_mut(&mut self, ρ: E, _: Linfinity) {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
416 self.iter_mut()
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
417 .for_each(|v| *v = num_traits::clamp(*v, -ρ, ρ))
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
418 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
419 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
420
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
421 impl<'own, SM, N, M, K, E> Adjointable<OMatrix<E, M, K>, OMatrix<E, N, K>> for Matrix<E, N, M, SM>
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
422 where
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
423 SM: Storage<E, N, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
424 N: Dim,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
425 M: Dim,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
426 K: Dim,
165
478c23ce7cef Copiable MatrixViews
Tuomo Valkonen <tuomov@iki.fi>
parents: 164
diff changeset
427 E: Scalar + Zero + One + Copy + SimdComplexField,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
428 DefaultAllocator: Allocator<N, K> + Allocator<M, K> + Allocator<N, M> + Allocator<M, N>,
169
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
429 ShapeConstraint:
114ecdf63ce5 Can only do nalgebra matrix ops for OMatrix (but ok through Instance) to avoid having to specify types
Tuomo Valkonen <tuomov@iki.fi>
parents: 168
diff changeset
430 StridesOk<E, N, M, SM> + StridesOk<E, N, K> + StridesOk<E, M, N> + StridesOk<E, M, K>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
431 {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
432 type AdjointCodomain = OMatrix<E, M, K>;
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
433 type Adjoint<'a>
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
434 = OMatrix<E, M, N>
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
435 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
436 SM: 'a;
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
437
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
438 #[inline]
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
439 fn adjoint(&self) -> Self::Adjoint<'_> {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
440 Matrix::adjoint(self)
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
441 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
442 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
443
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
444 /// This function is [`nalgebra::EuclideanNorm::metric_distance`] without the `sqrt`.
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
445 #[inline]
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
446 fn metric_distance_squared<T, R1, C1, S1, R2, C2, S2>(
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
447 /*ed: &EuclideanNorm,*/
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
448 m1: &Matrix<T, R1, C1, S1>,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
449 m2: &Matrix<T, R2, C2, S2>,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
450 ) -> T::SimdRealField
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
451 where
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
452 T: SimdComplexField,
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
453 R1: Dim,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
454 C1: Dim,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
455 S1: Storage<T, R1, C1>,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
456 R2: Dim,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
457 C2: Dim,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
458 S2: Storage<T, R2, C2>,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
459 ShapeConstraint: SameNumberOfRows<R1, R2> + SameNumberOfColumns<C1, C2>,
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
460 {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
461 m1.zip_fold(m2, T::SimdRealField::zero(), |acc, a, b| {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
462 let diff = a - b;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
463 acc + diff.simd_modulus_squared()
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
464 })
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
465 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
466
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
467 // TODO: should allow different input storages in `Euclidean`.
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
468
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
469 impl<E, M, S> Euclidean<E> for Vector<E, M, S>
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
470 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
471 M: Dim,
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
472 S: Storage<E, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
473 E: Float + Scalar + Zero + One + RealField,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
474 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
475 ShapeConstraint: StridesOk<E, M, U1, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
476 {
164
fd9dba51afd3 OwnedSpace -> Principal
Tuomo Valkonen <tuomov@iki.fi>
parents: 162
diff changeset
477 type PrincipalE = OVector<E, M>;
151
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
478
63
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 62
diff changeset
479 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
480 fn dot<I: Instance<Self>>(&self, other: I) -> E {
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
481 other.eval_ref(|ref r| Vector::<E, M, S>::dot(self, r))
63
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 62
diff changeset
482 }
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 62
diff changeset
483
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
484 #[inline]
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
485 fn norm2_squared(&self) -> E {
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
486 Vector::<E, M, S>::norm_squared(self)
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
487 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
488
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
489 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
490 fn dist2_squared<I: Instance<Self>>(&self, other: I) -> E {
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
491 other.eval_ref(|ref r| metric_distance_squared(self, r))
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
492 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
493 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
494
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
495 impl<E, M, S> StaticEuclidean<E> for Vector<E, M, S>
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
496 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
497 M: DimName,
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
498 S: Storage<E, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
499 E: Float + Scalar + Zero + One + RealField,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
500 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
501 ShapeConstraint: StridesOk<E, M, U1, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
502 {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
503 #[inline]
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
504 fn origin() -> OVector<E, M> {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
505 OVector::zeros()
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
506 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
507 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
508
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
509 /// The default norm for `Vector` is [`L2`].
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
510 impl<E, M, S> Normed<E> for Vector<E, M, S>
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
511 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
512 M: Dim,
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
513 S: Storage<E, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
514 E: Float + Scalar + Zero + One + RealField,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
515 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
516 ShapeConstraint: StridesOk<E, M, U1, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
517 {
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
518 type NormExp = L2;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
519
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
520 #[inline]
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
521 fn norm_exponent(&self) -> Self::NormExp {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
522 L2
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
523 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
524
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
525 #[inline]
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
526 fn is_zero(&self) -> bool {
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
527 Vector::<E, M, S>::norm_squared(self) == E::ZERO
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
528 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
529 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
530
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
531 impl<E, M, S> HasDual<E> for Vector<E, M, S>
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
532 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
533 M: Dim,
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
534 S: Storage<E, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
535 E: Float + Scalar + Zero + One + RealField,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
536 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
537 ShapeConstraint: StridesOk<E, M, U1, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
538 {
151
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
539 type DualSpace = OVector<E, M>;
138
593912dc3293 dual_origin
Tuomo Valkonen <tuomov@iki.fi>
parents: 133
diff changeset
540
593912dc3293 dual_origin
Tuomo Valkonen <tuomov@iki.fi>
parents: 133
diff changeset
541 fn dual_origin(&self) -> OVector<E, M> {
593912dc3293 dual_origin
Tuomo Valkonen <tuomov@iki.fi>
parents: 133
diff changeset
542 OVector::zeros_generic(M::from_usize(self.len()), Const)
593912dc3293 dual_origin
Tuomo Valkonen <tuomov@iki.fi>
parents: 133
diff changeset
543 }
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
544 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
545
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
546 impl<E, M, S> Norm<L1, E> for Vector<E, M, S>
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
547 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
548 M: Dim,
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
549 S: Storage<E, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
550 E: Float + Scalar + Zero + One + RealField,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
551 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
552 ShapeConstraint: StridesOk<E, M, U1, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
553 {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
554 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
555 fn norm(&self, _: L1) -> E {
70
672aec2e1acd Weighted norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
556 nalgebra::Norm::norm(&LpNorm(1), self)
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
557 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
558 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
559
145
0b9aecd7bb76 Dist argument order changed to reflect other changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
560 impl<E, M, S> Dist<L1, E> for Vector<E, M, S>
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
561 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
562 M: Dim,
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
563 S: Storage<E, M> + Clone,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
564 E: Float + Scalar + Zero + One + RealField,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
565 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
566 ShapeConstraint: StridesOk<E, M, U1, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
567 {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
568 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
569 fn dist<I: Instance<Self>>(&self, other: I, _: L1) -> E {
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
570 other.eval_ref(|ref r| nalgebra::Norm::metric_distance(&LpNorm(1), self, r))
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
571 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
572 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
573
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
574 impl<E, M, S> Norm<L2, E> for Vector<E, M, S>
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
575 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
576 M: Dim,
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
577 S: Storage<E, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
578 E: Float + Scalar + Zero + One + RealField,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
579 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
580 ShapeConstraint: StridesOk<E, M, U1, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
581 {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
582 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
583 fn norm(&self, _: L2) -> E {
70
672aec2e1acd Weighted norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
584 nalgebra::Norm::norm(&LpNorm(2), self)
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
585 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
586 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
587
145
0b9aecd7bb76 Dist argument order changed to reflect other changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
588 impl<E, M, S> Dist<L2, E> for Vector<E, M, S>
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
589 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
590 M: Dim,
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
591 S: Storage<E, M> + Clone,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
592 E: Float + Scalar + Zero + One + RealField,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
593 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
594 ShapeConstraint: StridesOk<E, M, U1, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
595 {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
596 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
597 fn dist<I: Instance<Self>>(&self, other: I, _: L2) -> E {
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
598 other.eval_ref(|ref r| nalgebra::Norm::metric_distance(&LpNorm(2), self, r))
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
599 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
600 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
601
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
602 impl<E, M, S> Norm<Linfinity, E> for Vector<E, M, S>
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
603 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
604 M: Dim,
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
605 S: Storage<E, M>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
606 E: Float + Scalar + Zero + One + RealField,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
607 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
608 ShapeConstraint: StridesOk<E, M, U1, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
609 {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
610 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
611 fn norm(&self, _: Linfinity) -> E {
70
672aec2e1acd Weighted norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
612 nalgebra::Norm::norm(&UniformNorm, self)
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
613 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
614 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
615
145
0b9aecd7bb76 Dist argument order changed to reflect other changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
616 impl<E, M, S> Dist<Linfinity, E> for Vector<E, M, S>
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
617 where
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
618 M: Dim,
160
e7920e205785 Viewable hack not needed now
Tuomo Valkonen <tuomov@iki.fi>
parents: 159
diff changeset
619 S: Storage<E, M> + Clone,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
620 E: Float + Scalar + Zero + One + RealField,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
621 DefaultAllocator: Allocator<M>,
159
279b1f5b8608 nalgebra horror
Tuomo Valkonen <tuomov@iki.fi>
parents: 158
diff changeset
622 ShapeConstraint: StridesOk<E, M, U1, S>,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
623 {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
624 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
625 fn dist<I: Instance<Self>>(&self, other: I, _: Linfinity) -> E {
171
fa8df5a14486 decompose
Tuomo Valkonen <tuomov@iki.fi>
parents: 170
diff changeset
626 other.eval_ref(|ref r| nalgebra::Norm::metric_distance(&UniformNorm, self, r))
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
627 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
628 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
629
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
630 /// Helper trait to hide the symbols of [`nalgebra::RealField`].
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
631 ///
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
632 /// By assuming `ToNalgebraRealField` intead of `nalgebra::RealField` as a trait bound,
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
633 /// functions can piggyback `nalgebra::RealField` without exponsing themselves to it.
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
634 /// Thus methods from [`num_traits`] can be used directly without similarly named methods
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
635 /// from [`nalgebra`] conflicting with them. Only when absolutely necessary to work with
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
636 /// nalgebra, one can convert to the nalgebra view of the same type using the methods of
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
637 /// this trait.
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
638 pub trait ToNalgebraRealField: Float {
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
639 /// The nalgebra type corresponding to this type. Usually same as `Self`.
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
640 ///
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
641 /// This type only carries `nalgebra` traits.
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
642 type NalgebraType: RealField;
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
643 /// The “mixed” type corresponding to this type. Usually same as `Self`.
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
644 ///
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
645 /// This type carries both `num_traits` and `nalgebra` traits.
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
646 type MixedType: RealField + Float;
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
647
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
648 /// Convert to the nalgebra view of `self`.
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
649 fn to_nalgebra(self) -> Self::NalgebraType;
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
650
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
651 /// Convert to the mixed (nalgebra and num_traits) view of `self`.
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
652 fn to_nalgebra_mixed(self) -> Self::MixedType;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
653
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
654 /// Convert from the nalgebra view of `self`.
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
655 fn from_nalgebra(t: Self::NalgebraType) -> Self;
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
656
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
657 /// Convert from the mixed (nalgebra and num_traits) view to `self`.
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
658 fn from_nalgebra_mixed(t: Self::MixedType) -> Self;
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
659 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
660
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
661 impl ToNalgebraRealField for f32 {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
662 type NalgebraType = f32;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
663 type MixedType = f32;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
664
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
665 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
666 fn to_nalgebra(self) -> Self::NalgebraType {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
667 self
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
668 }
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
669
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
670 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
671 fn to_nalgebra_mixed(self) -> Self::MixedType {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
672 self
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
673 }
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
674
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
675 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
676 fn from_nalgebra(t: Self::NalgebraType) -> Self {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
677 t
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
678 }
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
679
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
680 #[inline]
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
681 fn from_nalgebra_mixed(t: Self::MixedType) -> Self {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
682 t
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
683 }
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
684 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
685
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
686 impl ToNalgebraRealField for f64 {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
687 type NalgebraType = f64;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
688 type MixedType = f64;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
689
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
690 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
691 fn to_nalgebra(self) -> Self::NalgebraType {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
692 self
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
693 }
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
694
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
695 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
696 fn to_nalgebra_mixed(self) -> Self::MixedType {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
697 self
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
698 }
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
699
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
700 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
701 fn from_nalgebra(t: Self::NalgebraType) -> Self {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
702 t
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
703 }
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
704
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
705 #[inline]
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
706 fn from_nalgebra_mixed(t: Self::MixedType) -> Self {
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
707 t
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
708 }
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
709 }

mercurial