src/nalgebra_support.rs

Fri, 05 Sep 2025 00:16:08 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Fri, 05 Sep 2025 00:16:08 -0500
branch
dev
changeset 176
21e51de02ab6
parent 174
53ab61a41d70
child 177
b071a1b484f8
permissions
-rw-r--r--

strides alt

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

mercurial