src/direct_product.rs

Mon, 01 Sep 2025 23:03:27 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Mon, 01 Sep 2025 23:03:27 -0500
branch
dev
changeset 152
dab30b331f49
parent 151
402d717bb5c0
permissions
-rw-r--r--

fubar

57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
1 /*!
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
2 Direct products of the form $A \times B$.
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
3
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
4 TODO: This could be easily much more generic if `derive_more` could derive arithmetic
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
5 operations on references.
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
6 */
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
7
63
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 62
diff changeset
8 use crate::euclidean::Euclidean;
152
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
9 use crate::instance::{
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
10 Decomposition, DecompositionMut, EitherDecomp, Instance, InstanceMut, MyCow, Ownable,
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
11 };
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
12 use crate::linops::{VectorSpace, AXPY};
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
13 use crate::loc::Loc;
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
14 use crate::mapping::Space;
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
15 use crate::norms::{HasDual, Norm, NormExponent, Normed, PairNorm, L2};
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
16 use crate::types::{Float, Num};
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
17 use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign};
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
18 use serde::{Deserialize, Serialize};
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
19 use std::clone::Clone;
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
20
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
21 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
22 pub struct Pair<A, B>(pub A, pub B);
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
23
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
24 impl<A, B> Pair<A, B> {
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
25 pub fn new(a: A, b: B) -> Pair<A, B> {
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
26 Pair(a, b)
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
27 }
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
28 }
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
29
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
30 impl<A, B> From<(A, B)> for Pair<A, B> {
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
31 #[inline]
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
32 fn from((a, b): (A, B)) -> Pair<A, B> {
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
33 Pair(a, b)
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
34 }
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
35 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
36
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
37 impl<A, B> From<Pair<A, B>> for (A, B) {
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
38 #[inline]
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
39 fn from(Pair(a, b): Pair<A, B>) -> (A, B) {
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
40 (a, b)
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
41 }
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
42 }
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
43
115
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
44 macro_rules! impl_unary {
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
45 ($trait:ident, $fn:ident) => {
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
46 impl<A, B> $trait for Pair<A, B>
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
47 where
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
48 A: $trait,
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
49 B: $trait,
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
50 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
51 type Output = Pair<A::Output, B::Output>;
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
52 fn $fn(self) -> Self::Output {
115
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
53 let Pair(a, b) = self;
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
54 Pair(a.$fn(), b.$fn())
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
55 }
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
56 }
115
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
57
121
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
58 // Compiler overflow
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
59 // impl<'a, A, B> $trait for &'a Pair<A, B>
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
60 // where
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
61 // &'a A: $trait,
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
62 // &'a B: $trait,
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
63 // {
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
64 // type Output = Pair<<&'a A as $trait>::Output, <&'a B as $trait>::Output>;
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
65 // fn $fn(self) -> Self::Output {
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
66 // let Pair(ref a, ref b) = self;
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
67 // Pair(a.$fn(), b.$fn())
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
68 // }
fc7d923ff6e7 another overflow
Tuomo Valkonen <tuomov@iki.fi>
parents: 120
diff changeset
69 // }
115
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
70 };
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
71 }
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
72
115
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
73 impl_unary!(Neg, neg);
Tuomo Valkonen <tuomov@iki.fi>
parents: 114
diff changeset
74
116
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
75 macro_rules! impl_binary {
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
76 ($trait:ident, $fn:ident) => {
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
77 impl<A, B, C, D> $trait<Pair<C, D>> for Pair<A, B>
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
78 where
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
79 A: $trait<C>,
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
80 B: $trait<D>,
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
81 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
82 type Output = Pair<A::Output, B::Output>;
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
83 fn $fn(self, Pair(c, d): Pair<C, D>) -> Self::Output {
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
84 let Pair(a, b) = self;
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
85 Pair(a.$fn(c), b.$fn(d))
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
86 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
87 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
88
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
89 impl<'a, A, B, C, D> $trait<Pair<C, D>> for &'a Pair<A, B>
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
90 where
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
91 &'a A: $trait<C>,
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
92 &'a B: $trait<D>,
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
93 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
94 type Output = Pair<<&'a A as $trait<C>>::Output, <&'a B as $trait<D>>::Output>;
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
95 fn $fn(self, Pair(c, d): Pair<C, D>) -> Self::Output {
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
96 let Pair(ref a, ref b) = self;
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
97 Pair(a.$fn(c), b.$fn(d))
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
98 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
99 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
100
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
101 impl<'a, 'b, A, B, C, D> $trait<&'b Pair<C, D>> for &'a Pair<A, B>
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
102 where
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
103 &'a A: $trait<&'b C>,
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
104 &'a B: $trait<&'b D>,
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
105 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
106 type Output = Pair<<&'a A as $trait<&'b C>>::Output, <&'a B as $trait<&'b D>>::Output>;
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
107 fn $fn(self, Pair(ref c, ref d): &'b Pair<C, D>) -> Self::Output {
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
108 let Pair(ref a, ref b) = self;
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
109 Pair(a.$fn(c), b.$fn(d))
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
110 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
111 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
112
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
113 impl<'b, A, B, C, D> $trait<&'b Pair<C, D>> for Pair<A, B>
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
114 where
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
115 A: $trait<&'b C>,
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
116 B: $trait<&'b D>,
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
117 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
118 type Output = Pair<<A as $trait<&'b C>>::Output, <B as $trait<&'b D>>::Output>;
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
119 fn $fn(self, Pair(ref c, ref d): &'b Pair<C, D>) -> Self::Output {
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
120 let Pair(a, b) = self;
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
121 Pair(a.$fn(c), b.$fn(d))
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
122 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
123 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
124 };
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
125 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
126
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
127 impl_binary!(Add, add);
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
128 impl_binary!(Sub, sub);
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
129
119
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
130 macro_rules! impl_scalar {
120
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
131 ($trait:ident, $fn:ident) => {
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
132 impl<A, B, F: Num> $trait<F> for Pair<A, B>
119
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
133 where
120
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
134 A: $trait<F>,
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
135 B: $trait<F>,
119
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
136 {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
137 type Output = Pair<A::Output, B::Output>;
120
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
138 fn $fn(self, t: F) -> Self::Output {
119
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
139 let Pair(a, b) = self;
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
140 Pair(a.$fn(t), b.$fn(t))
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
141 }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
142 }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
143
120
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
144 impl<'a, A, B, F: Num> $trait<F> for &'a Pair<A, B>
119
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
145 where
120
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
146 &'a A: $trait<F>,
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
147 &'a B: $trait<F>,
119
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
148 {
120
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
149 type Output = Pair<<&'a A as $trait<F>>::Output, <&'a B as $trait<F>>::Output>;
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
150 fn $fn(self, t: F) -> Self::Output {
119
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
151 let Pair(ref a, ref b) = self;
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
152 Pair(a.$fn(t), b.$fn(t))
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
153 }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
154 }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
155
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
156 // impl<'a, 'b, A, B> $trait<&'b $F> for &'a Pair<A, B>
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
157 // where
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
158 // &'a A: $trait<&'b $F>,
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
159 // &'a B: $trait<&'b $F>,
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
160 // {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
161 // type Output =
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
162 // Pair<<&'a A as $trait<&'b $F>>::Output, <&'a B as $trait<&'b $F>>::Output>;
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
163 // fn $fn(self, t: &'b $F) -> Self::Output {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
164 // let Pair(ref a, ref b) = self;
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
165 // Pair(a.$fn(t), b.$fn(t))
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
166 // }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
167 // }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
168
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
169 // impl<'b, A, B> $trait<&'b $F> for Pair<A, B>
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
170 // where
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
171 // A: $trait<&'b $F>,
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
172 // B: $trait<&'b $F>,
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
173 // {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
174 // type Output = Pair<<A as $trait<&'b $F>>::Output, <B as $trait<&'b $F>>::Output>;
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
175 // fn $fn(self, t: &'b $F) -> Self::Output {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
176 // let Pair(a, b) = self;
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
177 // Pair(a.$fn(t), b.$fn(t))
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
178 // }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
179 // }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
180 };
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
181 }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
182
120
07e487685b29 reduce restriction
Tuomo Valkonen <tuomov@iki.fi>
parents: 119
diff changeset
183 impl_scalar!(Mul, mul);
130
0a689881b0f1 Add more AXPY super traits
Tuomo Valkonen <tuomov@iki.fi>
parents: 129
diff changeset
184 impl_scalar!(Div, div);
119
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
185
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
186 macro_rules! impl_scalar_lhs {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
187 ($trait:ident, $fn:ident, $F:ty) => {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
188 impl<A, B> $trait<Pair<A, B>> for $F
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
189 where
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
190 $F: $trait<A> + $trait<B>,
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
191 {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
192 type Output = Pair<<$F as $trait<A>>::Output, <$F as $trait<B>>::Output>;
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
193 fn $fn(self, Pair(a, b): Pair<A, B>) -> Self::Output {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
194 Pair(self.$fn(a), self.$fn(b))
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
195 }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
196 }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
197
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
198 // Compiler overflow:
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
199 //
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
200 // impl<'a, A, B> $trait<&'a Pair<A, B>> for $F
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
201 // where
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
202 // $F: $trait<&'a A> + $trait<&'a B>,
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
203 // {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
204 // type Output = Pair<<$F as $trait<&'a A>>::Output, <$F as $trait<&'a B>>::Output>;
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
205 // fn $fn(self, Pair(a, b): &'a Pair<A, B>) -> Self::Output {
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
206 // Pair(self.$fn(a), self.$fn(b))
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
207 // }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
208 // }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
209 };
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
210 }
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
211
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
212 impl_scalar_lhs!(Mul, mul, f32);
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
213 impl_scalar_lhs!(Mul, mul, f64);
130
0a689881b0f1 Add more AXPY super traits
Tuomo Valkonen <tuomov@iki.fi>
parents: 129
diff changeset
214 impl_scalar_lhs!(Div, div, f32);
0a689881b0f1 Add more AXPY super traits
Tuomo Valkonen <tuomov@iki.fi>
parents: 129
diff changeset
215 impl_scalar_lhs!(Div, div, f64);
119
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
216
117
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
217 macro_rules! impl_binary_mut {
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
218 ($trait:ident, $fn:ident) => {
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
219 impl<'a, A, B, C, D> $trait<Pair<C, D>> for Pair<A, B>
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
220 where
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
221 A: $trait<C>,
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
222 B: $trait<D>,
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
223 {
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
224 fn $fn(&mut self, Pair(c, d): Pair<C, D>) {
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
225 let Pair(ref mut a, ref mut b) = self;
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
226 a.$fn(c);
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
227 b.$fn(d);
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
228 }
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
229 }
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
230
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
231 impl<'a, 'b, A, B, C, D> $trait<&'b Pair<C, D>> for Pair<A, B>
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
232 where
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
233 A: $trait<&'b C>,
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
234 B: $trait<&'b D>,
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
235 {
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
236 fn $fn(&mut self, Pair(ref c, ref d): &'b Pair<C, D>) {
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
237 let Pair(ref mut a, ref mut b) = self;
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
238 a.$fn(c);
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
239 b.$fn(d);
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
240 }
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
241 }
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
242 };
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
243 }
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
244
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
245 impl_binary_mut!(AddAssign, add_assign);
9b782aa6b452 binops_mut
Tuomo Valkonen <tuomov@iki.fi>
parents: 116
diff changeset
246 impl_binary_mut!(SubAssign, sub_assign);
116
Tuomo Valkonen <tuomov@iki.fi>
parents: 115
diff changeset
247
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
248 macro_rules! impl_scalar_mut {
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
249 ($trait:ident, $fn:ident) => {
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
250 impl<'a, A, B, F: Num> $trait<F> for Pair<A, B>
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
251 where
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
252 A: $trait<F>,
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
253 B: $trait<F>,
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
254 {
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
255 fn $fn(&mut self, t: F) {
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
256 let Pair(ref mut a, ref mut b) = self;
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
257 a.$fn(t);
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
258 b.$fn(t);
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
259 }
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
260 }
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
261 };
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
262 }
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
263
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
264 impl_scalar_mut!(MulAssign, mul_assign);
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
265 impl_scalar_mut!(DivAssign, div_assign);
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
266
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
267 /// Trait for ownable-by-consumption objects
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
268 impl<A, B> Ownable for Pair<A, B>
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
269 where
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
270 A: Ownable,
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
271 B: Ownable,
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
272 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
273 type OwnedVariant = Pair<A::OwnedVariant, B::OwnedVariant>;
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
274
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
275 #[inline]
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
276 fn into_owned(self) -> Self::OwnedVariant {
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
277 Pair(self.0.into_owned(), self.1.into_owned())
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
278 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
279
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
280 /// Returns an owned instance of a reference.
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
281 fn clone_owned(&self) -> Self::OwnedVariant {
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
282 Pair(self.0.clone_owned(), self.1.clone_owned())
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
283 }
152
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
284
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
285 fn owned_cow<'b>(self) -> MyCow<'b, Self::OwnedVariant> {
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
286 EitherDecomp::Owned(self.into_owned())
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
287 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
288
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
289 fn ref_owned_cow<'b>(&self) -> MyCow<'b, Self::OwnedVariant> {
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
290 EitherDecomp::Owned(self.into_owned())
Tuomo Valkonen <tuomov@iki.fi>
parents: 151
diff changeset
291 }
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
292 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
293
119
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
294 /// We only support 'closed' `Euclidean` `Pair`s, as more general ones cause
cc0c6a8d0933 simplify
Tuomo Valkonen <tuomov@iki.fi>
parents: 118
diff changeset
295 /// compiler overflows.
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
296 impl<A, B, F: Float> Euclidean<F> for Pair<A, B>
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
297 where
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
298 A: Euclidean<F>,
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
299 B: Euclidean<F>,
151
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
300 // //Pair<A, B>: Euclidean<F>,
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
301 // Self: Sized
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
302 // + Mul<F, Output = Self::OwnedEuclidean>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
303 // + MulAssign<F>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
304 // + Div<F, Output = Self::OwnedEuclidean>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
305 // + DivAssign<F>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
306 // + Add<Self, Output = Self::OwnedEuclidean>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
307 // + Sub<Self, Output = Self::OwnedEuclidean>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
308 // + for<'b> Add<&'b Self, Output = Self::OwnedEuclidean>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
309 // + for<'b> Sub<&'b Self, Output = Self::OwnedEuclidean>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
310 // + AddAssign<Self>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
311 // + for<'b> AddAssign<&'b Self>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
312 // + SubAssign<Self>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
313 // + for<'b> SubAssign<&'b Self>
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
314 // + Neg<Output = Self::OwnedEuclidean>,
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
315 {
151
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
316 type OwnedEuclidean = Pair<A::OwnedEuclidean, B::OwnedEuclidean>;
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
317
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
318 fn dot<I: Instance<Self>>(&self, other: I) -> F {
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
319 other.eval_decompose(|Pair(u, v)| self.0.dot(u) + self.1.dot(v))
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
320 }
63
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 62
diff changeset
321
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
322 fn norm2_squared(&self) -> F {
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
323 self.0.norm2_squared() + self.1.norm2_squared()
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
324 }
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
325
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
326 fn dist2_squared<I: Instance<Self>>(&self, other: I) -> F {
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
327 other.eval_decompose(|Pair(u, v)| self.0.dist2_squared(u) + self.1.dist2_squared(v))
118
0fabd0b5914c restrict
Tuomo Valkonen <tuomov@iki.fi>
parents: 117
diff changeset
328 }
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
329 }
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
330
151
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
331 impl<F, A, B> VectorSpace for Pair<A, B>
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
332 where
151
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
333 A: VectorSpace<Field = F>,
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
334 B: VectorSpace<Field = F>,
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
335 F: Num,
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
336 {
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
337 type Field = F;
151
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
338 type Owned = Pair<A::Owned, B::Owned>;
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
339
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
340 /// Return a similar zero as `self`.
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
341 fn similar_origin(&self) -> Self::Owned {
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
342 Pair(self.0.similar_origin(), self.1.similar_origin())
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
343 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
344
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
345 // #[inline]
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
346 // fn into_owned(self) -> Self::Owned {
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
347 // Pair(self.0.into_owned(), self.1.into_owned())
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
348 // }
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
349 }
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
350
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
351 impl<F, A, B, U, V> AXPY<Pair<U, V>> for Pair<A, B>
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
352 where
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
353 U: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
354 V: Space,
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
355 A: AXPY<U, Field = F>,
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
356 B: AXPY<V, Field = F>,
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
357 F: Num,
151
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
358 // Self: MulAssign<F> + DivAssign<F>,
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
359 // Pair<A, B>: MulAssign<F> + DivAssign<F>,
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
360 {
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
361 fn axpy<I: Instance<Pair<U, V>>>(&mut self, α: F, x: I, β: F) {
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
362 x.eval_decompose(|Pair(u, v)| {
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
363 self.0.axpy(α, u, β);
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
364 self.1.axpy(α, v, β);
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
365 })
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
366 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
367
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
368 fn copy_from<I: Instance<Pair<U, V>>>(&mut self, x: I) {
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
369 x.eval_decompose(|Pair(u, v)| {
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
370 self.0.copy_from(u);
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
371 self.1.copy_from(v);
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
372 })
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
373 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
374
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
375 fn scale_from<I: Instance<Pair<U, V>>>(&mut self, α: F, x: I) {
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
376 x.eval_decompose(|Pair(u, v)| {
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
377 self.0.scale_from(α, u);
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
378 self.1.scale_from(α, v);
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
379 })
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
380 }
62
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
381
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
382 /// Set self to zero.
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
383 fn set_zero(&mut self) {
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
384 self.0.set_zero();
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
385 self.1.set_zero();
d8305c9b6fdf Move origin stuff to AXPY form Euclidean
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
386 }
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
387 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
388
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
389 /// [`Decomposition`] for working with [`Pair`]s.
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
390 #[derive(Copy, Clone, Debug)]
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
391 pub struct PairDecomposition<D, Q>(D, Q);
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
392
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
393 impl<A: Space, B: Space> Space for Pair<A, B> {
151
402d717bb5c0 lots of space changes
Tuomo Valkonen <tuomov@iki.fi>
parents: 150
diff changeset
394 type OwnedSpace = Pair<A::OwnedSpace, B::OwnedSpace>;
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
395 type Decomp = PairDecomposition<A::Decomp, B::Decomp>;
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
396 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
397
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
398 impl<A, B, D, Q> Decomposition<Pair<A, B>> for PairDecomposition<D, Q>
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
399 where
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
400 A: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
401 B: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
402 D: Decomposition<A>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
403 Q: Decomposition<B>,
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
404 {
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
405 type Decomposition<'b>
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
406 = Pair<D::Decomposition<'b>, Q::Decomposition<'b>>
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
407 where
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
408 Pair<A, B>: 'b;
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
409 type Reference<'b>
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
410 = Pair<D::Reference<'b>, Q::Reference<'b>>
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
411 where
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
412 Pair<A, B>: 'b;
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
413
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
414 #[inline]
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
415 fn lift<'b>(Pair(u, v): Self::Reference<'b>) -> Self::Decomposition<'b> {
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
416 Pair(D::lift(u), Q::lift(v))
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
417 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
418 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
419
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
420 impl<A, B, U, V, D, Q> Instance<Pair<A, B>, PairDecomposition<D, Q>> for Pair<U, V>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
421 where
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
422 A: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
423 B: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
424 D: Decomposition<A>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
425 Q: Decomposition<B>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
426 U: Instance<A, D>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
427 V: Instance<B, Q>,
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
428 {
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
429 fn eval_decompose<'b, R>(
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
430 self,
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
431 f: impl FnOnce(Pair<D::Decomposition<'b>, Q::Decomposition<'b>>) -> R,
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
432 ) -> R
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
433 where
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
434 Pair<A, B>: 'b,
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
435 Self: 'b,
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
436 {
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
437 self.0
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
438 .eval_decompose(|a| self.1.eval_decompose(|b| f(Pair(a, b))))
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
439 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
440
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
441 fn eval_ref_decompose<'b, R>(
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
442 &'b self,
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
443 f: impl FnOnce(Pair<D::Reference<'b>, Q::Reference<'b>>) -> R,
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
444 ) -> R
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
445 where
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
446 Pair<A, B>: 'b,
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
447 Self: 'b,
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
448 {
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
449 self.0
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
450 .eval_ref_decompose(|a| self.1.eval_ref_decompose(|b| f(Pair(a, b))))
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
451 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
452 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
453
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
454 impl<'a, A, B, U, V, D, Q> Instance<Pair<A, B>, PairDecomposition<D, Q>> for &'a Pair<U, V>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
455 where
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
456 A: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
457 B: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
458 D: Decomposition<A>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
459 Q: Decomposition<B>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
460 U: Instance<A, D>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
461 V: Instance<B, Q>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
462 &'a U: Instance<A, D>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
463 &'a V: Instance<B, Q>,
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
464 {
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
465 fn eval_decompose<'b, R>(
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
466 self,
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
467 f: impl FnOnce(Pair<D::Decomposition<'b>, Q::Decomposition<'b>>) -> R,
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
468 ) -> R
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
469 where
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
470 Pair<A, B>: 'b,
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
471 Self: 'b,
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
472 {
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
473 self.0.eval_ref_decompose(|a| {
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
474 self.1
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
475 .eval_ref_decompose(|b| f(Pair(D::lift(a), Q::lift(b))))
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
476 })
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
477 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
478
133
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
479 fn eval_ref_decompose<'b, R>(
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
480 &'b self,
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
481 f: impl FnOnce(Pair<D::Reference<'b>, Q::Reference<'b>>) -> R,
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
482 ) -> R
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
483 where
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
484 Pair<A, B>: 'b,
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
485 Self: 'b,
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
486 {
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
487 self.0
2b13f8a0c8ba Replace Instance ref_instance and decompose by eval_* for flexibility
Tuomo Valkonen <tuomov@iki.fi>
parents: 132
diff changeset
488 .eval_ref_decompose(|a| self.1.eval_ref_decompose(|b| f(Pair(a, b))))
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
489 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
490 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
491
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
492 impl<A, B, D, Q> DecompositionMut<Pair<A, B>> for PairDecomposition<D, Q>
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
493 where
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
494 A: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
495 B: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
496 D: DecompositionMut<A>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
497 Q: DecompositionMut<B>,
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
498 {
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
499 type ReferenceMut<'b>
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
500 = Pair<D::ReferenceMut<'b>, Q::ReferenceMut<'b>>
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
501 where
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
502 Pair<A, B>: 'b;
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
503 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
504
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
505 impl<A, B, U, V, D, Q> InstanceMut<Pair<A, B>, PairDecomposition<D, Q>> for Pair<U, V>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
506 where
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
507 A: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
508 B: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
509 D: DecompositionMut<A>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
510 Q: DecompositionMut<B>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
511 U: InstanceMut<A, D>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
512 V: InstanceMut<B, Q>,
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
513 {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
514 #[inline]
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
515 fn ref_instance_mut(
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
516 &mut self,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
517 ) -> <PairDecomposition<D, Q> as DecompositionMut<Pair<A, B>>>::ReferenceMut<'_> {
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
518 Pair(self.0.ref_instance_mut(), self.1.ref_instance_mut())
57
1b3b1687b9ed Add direct products (Pair, RowOp, ColOp, DiagOp)
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
519 }
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
520 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
521
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
522 impl<'a, A, B, U, V, D, Q> InstanceMut<Pair<A, B>, PairDecomposition<D, Q>> for &'a mut Pair<U, V>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
523 where
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
524 A: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
525 B: Space,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
526 D: DecompositionMut<A>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
527 Q: DecompositionMut<B>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
528 U: InstanceMut<A, D>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
529 V: InstanceMut<B, Q>,
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
530 {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
531 #[inline]
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
532 fn ref_instance_mut(
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
533 &mut self,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
534 ) -> <PairDecomposition<D, Q> as DecompositionMut<Pair<A, B>>>::ReferenceMut<'_> {
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
535 Pair(self.0.ref_instance_mut(), self.1.ref_instance_mut())
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
536 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
537 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
538
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 121
diff changeset
539 impl<F, A, B, ExpA, ExpB, ExpJ> Norm<PairNorm<ExpA, ExpB, ExpJ>, F> for Pair<A, B>
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
540 where
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
541 F: Num,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
542 ExpA: NormExponent,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
543 ExpB: NormExponent,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
544 ExpJ: NormExponent,
124
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 121
diff changeset
545 A: Norm<ExpA, F>,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 121
diff changeset
546 B: Norm<ExpB, F>,
6aa955ad8122 Transpose loc parameters to allow f64 defaults
Tuomo Valkonen <tuomov@iki.fi>
parents: 121
diff changeset
547 Loc<2, F>: Norm<ExpJ, F>,
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
548 {
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
549 fn norm(&self, PairNorm(expa, expb, expj): PairNorm<ExpA, ExpB, ExpJ>) -> F {
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
550 Loc([self.0.norm(expa), self.1.norm(expb)]).norm(expj)
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
551 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
552 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 57
diff changeset
553
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
554 impl<F: Float, A, B> Normed<F> for Pair<A, B>
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
555 where
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
556 A: Normed<F>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
557 B: Normed<F>,
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
558 {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
559 type NormExp = PairNorm<A::NormExp, B::NormExp, L2>;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
560
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
561 #[inline]
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
562 fn norm_exponent(&self) -> Self::NormExp {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
563 PairNorm(self.0.norm_exponent(), self.1.norm_exponent(), L2)
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
564 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
565
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
566 #[inline]
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
567 fn is_zero(&self) -> bool {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
568 self.0.is_zero() && self.1.is_zero()
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
569 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
570 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
571
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
572 impl<F: Float, A, B> HasDual<F> for Pair<A, B>
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
573 where
94
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
574 A: HasDual<F>,
1f19c6bbf07b Fix build with stable rust.
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
575 B: HasDual<F>,
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
576 {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
577 type DualSpace = Pair<A::DualSpace, B::DualSpace>;
138
593912dc3293 dual_origin
Tuomo Valkonen <tuomov@iki.fi>
parents: 133
diff changeset
578
150
Tuomo Valkonen <tuomov@iki.fi>
parents: 144
diff changeset
579 fn dual_origin(&self) -> <Self::DualSpace as VectorSpace>::Owned {
138
593912dc3293 dual_origin
Tuomo Valkonen <tuomov@iki.fi>
parents: 133
diff changeset
580 Pair(self.0.dual_origin(), self.1.dual_origin())
593912dc3293 dual_origin
Tuomo Valkonen <tuomov@iki.fi>
parents: 133
diff changeset
581 }
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
582 }
144
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
583
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
584 #[cfg(feature = "pyo3")]
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
585 mod python {
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
586 use super::Pair;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
587 use pyo3::conversion::FromPyObject;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
588 use pyo3::types::{PyAny, PyTuple};
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
589 use pyo3::{Bound, IntoPyObject, PyErr, PyResult, Python};
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
590
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
591 impl<'py, A, B> IntoPyObject<'py> for Pair<A, B>
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
592 where
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
593 A: IntoPyObject<'py>,
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
594 B: IntoPyObject<'py>,
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
595 {
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
596 type Target = PyTuple;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
597 type Error = PyErr;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
598 type Output = Bound<'py, Self::Target>;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
599
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
600 fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
601 (self.0, self.1).into_pyobject(py)
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
602 }
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
603 }
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
604
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
605 impl<'a, 'py, A, B> IntoPyObject<'py> for &'a mut Pair<A, B>
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
606 where
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
607 &'a mut A: IntoPyObject<'py>,
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
608 &'a mut B: IntoPyObject<'py>,
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
609 {
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
610 type Target = PyTuple;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
611 type Error = PyErr;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
612 type Output = Bound<'py, Self::Target>;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
613
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
614 fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
615 (&mut self.0, &mut self.1).into_pyobject(py)
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
616 }
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
617 }
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
618
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
619 impl<'a, 'py, A, B> IntoPyObject<'py> for &'a Pair<A, B>
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
620 where
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
621 &'a A: IntoPyObject<'py>,
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
622 &'a B: IntoPyObject<'py>,
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
623 {
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
624 type Target = PyTuple;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
625 type Error = PyErr;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
626 type Output = Bound<'py, Self::Target>;
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
627
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
628 fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
629 (&self.0, &self.1).into_pyobject(py)
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
630 }
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
631 }
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
632
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
633 impl<'py, A, B> FromPyObject<'py> for Pair<A, B>
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
634 where
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
635 A: Clone + FromPyObject<'py>,
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
636 B: Clone + FromPyObject<'py>,
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
637 {
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
638 fn extract_bound(ob: &Bound<'py, PyAny>) -> PyResult<Self> {
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
639 FromPyObject::extract_bound(ob).map(|(a, b)| Pair(a, b))
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
640 }
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
641 }
44d859269132 Basic Pair pyo3 conversions
Tuomo Valkonen <tuomov@iki.fi>
parents: 138
diff changeset
642 }

mercurial