src/nalgebra_support.rs

Tue, 02 Sep 2025 15:11:35 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Tue, 02 Sep 2025 15:11:35 -0500
branch
dev
changeset 159
279b1f5b8608
parent 158
9c720f822c79
child 160
e7920e205785
permissions
-rw-r--r--

nalgebra horror

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

mercurial