src/nalgebra_support.rs

Tue, 02 Sep 2025 08:01:57 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Tue, 02 Sep 2025 08:01:57 -0500
branch
dev
changeset 157
2ac69af65636
parent 156
adf3c425c7a9
child 158
9c720f822c79
permissions
-rw-r--r--

matrix fubar

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

mercurial