src/norms.rs

Mon, 06 Jan 2025 20:29:25 -0500

author
Tuomo Valkonen <tuomov@iki.fi>
date
Mon, 06 Jan 2025 20:29:25 -0500
branch
dev
changeset 86
d5b0e496b72f
parent 72
44a4f258a1ff
permissions
-rw-r--r--

More Serialize / Deserialize / Debug derives

0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
1 /*!
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
2 Norms, projections, etc.
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
3 */
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
4
86
d5b0e496b72f More Serialize / Deserialize / Debug derives
Tuomo Valkonen <tuomov@iki.fi>
parents: 72
diff changeset
5 use serde::{Serialize, Deserialize};
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
6 use std::marker::PhantomData;
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
7 use crate::types::*;
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
8 use crate::euclidean::*;
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
9 use crate::mapping::{Mapping, Space, Instance};
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
10
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
11 //
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
12 // Abstract norms
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
13 //
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
14
86
d5b0e496b72f More Serialize / Deserialize / Debug derives
Tuomo Valkonen <tuomov@iki.fi>
parents: 72
diff changeset
15 #[derive(Copy,Clone,Debug, Serialize, Deserialize)]
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
16 /// Helper structure to convert a [`NormExponent`] into a [`Mapping`]
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
17 pub struct NormMapping<F : Float, E : NormExponent>{
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
18 pub(crate) exponent : E,
86
d5b0e496b72f More Serialize / Deserialize / Debug derives
Tuomo Valkonen <tuomov@iki.fi>
parents: 72
diff changeset
19 #[serde(skip)]
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
20 _phantoms : PhantomData<F>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
21 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
22
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
23 /// An exponent for norms.
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
24 ///
33
75d65fa74eba typofix
Tuomo Valkonen <tuomov@iki.fi>
parents: 6
diff changeset
25 // Just a collection of desirable attributes for a marker type
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
26 pub trait NormExponent : Copy + Send + Sync + 'static {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
27 /// Return the norm as a mappin
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
28 fn as_mapping<F : Float>(self) -> NormMapping<F, Self> {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
29 NormMapping{ exponent : self, _phantoms : PhantomData }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
30 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
31 }
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
32
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
33 /// Exponent type for the 1-[`Norm`].
86
d5b0e496b72f More Serialize / Deserialize / Debug derives
Tuomo Valkonen <tuomov@iki.fi>
parents: 72
diff changeset
34 #[derive(Copy,Debug,Clone,Serialize,Deserialize,Eq,PartialEq)]
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
35 pub struct L1;
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
36 impl NormExponent for L1 {}
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
37
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
38 /// Exponent type for the 2-[`Norm`].
86
d5b0e496b72f More Serialize / Deserialize / Debug derives
Tuomo Valkonen <tuomov@iki.fi>
parents: 72
diff changeset
39 #[derive(Copy,Debug,Clone,Serialize,Deserialize,Eq,PartialEq)]
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
40 pub struct L2;
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
41 impl NormExponent for L2 {}
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
42
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
43 /// Exponent type for the ∞-[`Norm`].
86
d5b0e496b72f More Serialize / Deserialize / Debug derives
Tuomo Valkonen <tuomov@iki.fi>
parents: 72
diff changeset
44 #[derive(Copy,Debug,Clone,Serialize,Deserialize,Eq,PartialEq)]
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
45 pub struct Linfinity;
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
46 impl NormExponent for Linfinity {}
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
47
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
48 /// Exponent type for 2,1-[`Norm`].
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
49 /// (1-norm over a domain Ω, 2-norm of a vector at each point of the domain.)
86
d5b0e496b72f More Serialize / Deserialize / Debug derives
Tuomo Valkonen <tuomov@iki.fi>
parents: 72
diff changeset
50 #[derive(Copy,Debug,Clone,Serialize,Deserialize,Eq,PartialEq)]
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
51 pub struct L21;
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
52 impl NormExponent for L21 {}
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
53
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
54 /// Norms for pairs (a, b). ‖(a,b)‖ = ‖(‖a‖_A, ‖b‖_B)‖_J
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
55 /// For use with [`crate::direct_product::Pair`]
86
d5b0e496b72f More Serialize / Deserialize / Debug derives
Tuomo Valkonen <tuomov@iki.fi>
parents: 72
diff changeset
56 #[derive(Copy,Debug,Clone,Serialize,Deserialize,Eq,PartialEq)]
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
57 pub struct PairNorm<A, B, J>(pub A, pub B, pub J);
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
58
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
59 impl<A, B, J> NormExponent for PairNorm<A, B, J>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
60 where A : NormExponent, B : NormExponent, J : NormExponent {}
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
61
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
62
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
63 /// A Huber/Moreau–Yosida smoothed [`L1`] norm. (Not a norm itself.)
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
64 ///
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
65 /// The parameter γ of this type is the smoothing factor. Zero means no smoothing, and higher
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
66 /// values more smoothing. Behaviour with γ < 0 is undefined.
86
d5b0e496b72f More Serialize / Deserialize / Debug derives
Tuomo Valkonen <tuomov@iki.fi>
parents: 72
diff changeset
67 #[derive(Copy,Debug,Clone,Serialize,Deserialize,Eq,PartialEq)]
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
68 pub struct HuberL1<F : Float>(pub F);
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
69 impl<F : Float> NormExponent for HuberL1<F> {}
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
70
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
71 /// A Huber/Moreau–Yosida smoothed [`L21`] norm. (Not a norm itself.)
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
72 ///
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
73 /// The parameter γ of this type is the smoothing factor. Zero means no smoothing, and higher
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
74 /// values more smoothing. Behaviour with γ < 0 is undefined.
86
d5b0e496b72f More Serialize / Deserialize / Debug derives
Tuomo Valkonen <tuomov@iki.fi>
parents: 72
diff changeset
75 #[derive(Copy,Debug,Clone,Serialize,Deserialize,Eq,PartialEq)]
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
76 pub struct HuberL21<F : Float>(pub F);
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
77 impl<F : Float> NormExponent for HuberL21<F> {}
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
78
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
79
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
80 /// A normed space (type) with exponent or other type `Exponent` for the norm.
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
81 ///
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
82 /// Use as
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
83 /// ```
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
84 /// # use alg_tools::norms::{Norm, L1, L2, Linfinity};
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
85 /// # use alg_tools::loc::Loc;
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
86 /// let x = Loc([1.0, 2.0, 3.0]);
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
87 ///
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
88 /// println!("{}, {} {}", x.norm(L1), x.norm(L2), x.norm(Linfinity))
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
89 /// ```
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
90 pub trait Norm<F : Num, Exponent : NormExponent> {
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
91 /// Calculate the norm.
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
92 fn norm(&self, _p : Exponent) -> F;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
93 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
94
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
95 /// Indicates that the `Self`-[`Norm`] is dominated by the `Exponent`-`Norm` on the space
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
96 /// `Elem` with the corresponding field `F`.
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
97 pub trait Dominated<F : Num, Exponent : NormExponent, Elem> {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
98 /// Indicates the factor $c$ for the inequality $‖x‖ ≤ C ‖x‖_p$.
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
99 fn norm_factor(&self, p : Exponent) -> F;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
100 /// Given a norm-value $‖x‖_p$, calculates $C‖x‖_p$ such that $‖x‖ ≤ C‖x‖_p$
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
101 #[inline]
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
102 fn from_norm(&self, p_norm : F, p : Exponent) -> F {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
103 p_norm * self.norm_factor(p)
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
104 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
105 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
106
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
107 /// Trait for distances with respect to a norm.
64
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
108 pub trait Dist<F : Num, Exponent : NormExponent> : Norm<F, Exponent> + Space {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
109 /// Calculate the distance
64
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
110 fn dist<I : Instance<Self>>(&self, other : I, _p : Exponent) -> F;
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
111 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
112
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
113 /// Trait for Euclidean projections to the `Exponent`-[`Norm`]-ball.
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
114 ///
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
115 /// Use as
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
116 /// ```
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
117 /// # use alg_tools::norms::{Projection, L2, Linfinity};
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
118 /// # use alg_tools::loc::Loc;
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
119 /// let x = Loc([1.0, 2.0, 3.0]);
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
120 ///
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
121 /// println!("{:?}, {:?}", x.proj_ball(1.0, L2), x.proj_ball(0.5, Linfinity));
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
122 /// ```
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
123 pub trait Projection<F : Num, Exponent : NormExponent> : Norm<F, Exponent> + Sized
6
d80b87b8acd0 Added NormExponent trait for exponents of norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 5
diff changeset
124 where F : Float {
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
125 /// Projection of `self` to the `q`-norm-ball of radius ρ.
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
126 fn proj_ball(mut self, ρ : F, q : Exponent) -> Self {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
127 self.proj_ball_mut(ρ, q);
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
128 self
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
129 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
130
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
131 /// In-place projection of `self` to the `q`-norm-ball of radius ρ.
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
132 fn proj_ball_mut(&mut self, ρ : F, q : Exponent);
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
133 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
134
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
135 /*impl<F : Float, E : Euclidean<F>> Norm<F, L2> for E {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
136 #[inline]
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
137 fn norm(&self, _p : L2) -> F { self.norm2() }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
138
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
139 fn dist(&self, other : &Self, _p : L2) -> F { self.dist2(other) }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
140 }*/
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
141
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
142 impl<F : Float, E : Euclidean<F> + Norm<F, L2>> Projection<F, L2> for E {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
143 #[inline]
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
144 fn proj_ball(self, ρ : F, _p : L2) -> Self { self.proj_ball2(ρ) }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
145
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
146 #[inline]
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
147 fn proj_ball_mut(&mut self, ρ : F, _p : L2) { self.proj_ball2_mut(ρ) }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
148 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
149
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
150 impl<F : Float> HuberL1<F> {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
151 fn apply(self, xnsq : F) -> F {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
152 let HuberL1(γ) = self;
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
153 let xn = xnsq.sqrt();
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
154 if γ == F::ZERO {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
155 xn
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
156 } else {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
157 if xn > γ {
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
158 xn-γ / F::TWO
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
159 } else if xn<(-γ) {
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
160 -xn-γ / F::TWO
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
161 } else {
5
59dc4c5883f4 Improve documentation
Tuomo Valkonen <tuomov@iki.fi>
parents: 0
diff changeset
162 xnsq / (F::TWO * γ)
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
163 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
164 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
165 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
166 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
167
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
168 impl<F : Float, E : Euclidean<F>> Norm<F, HuberL1<F>> for E {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
169 fn norm(&self, huber : HuberL1<F>) -> F {
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
170 huber.apply(self.norm2_squared())
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
171 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
172 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
173
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
174 impl<F : Float, E : Euclidean<F>> Dist<F, HuberL1<F>> for E {
64
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
175 fn dist<I : Instance<Self>>(&self, other : I, huber : HuberL1<F>) -> F {
0
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
176 huber.apply(self.dist2_squared(other))
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
177 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
178 }
9f27689eb130 Initialise new clean repository
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff changeset
179
64
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
180 // impl<F : Float, E : Norm<F, L2>> Norm<F, L21> for Vec<E> {
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
181 // fn norm(&self, _l21 : L21) -> F {
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
182 // self.iter().map(|e| e.norm(L2)).sum()
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
183 // }
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
184 // }
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
185
64
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
186 // impl<F : Float, E : Dist<F, L2>> Dist<F, L21> for Vec<E> {
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
187 // fn dist<I : Instance<Self>>(&self, other : I, _l21 : L21) -> F {
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
188 // self.iter().zip(other.iter()).map(|(e, g)| e.dist(g, L2)).sum()
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
189 // }
4f6ca107ccb1 More Instance parametrisation
Tuomo Valkonen <tuomov@iki.fi>
parents: 63
diff changeset
190 // }
59
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
191
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
192 impl<E, F, Domain> Mapping<Domain> for NormMapping<F, E>
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
193 where
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
194 F : Float,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
195 E : NormExponent,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
196 Domain : Space + Norm<F, E>,
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
197 {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
198 type Codomain = F;
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
199
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
200 #[inline]
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
201 fn apply<I : Instance<Domain>>(&self, x : I) -> F {
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
202 x.eval(|r| r.norm(self.exponent))
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
203 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
204 }
9226980e45a7 Significantly simplify Mapping / Apply through Instance
Tuomo Valkonen <tuomov@iki.fi>
parents: 33
diff changeset
205
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
206 pub trait Normed<F : Num = f64> : Space + Norm<F, Self::NormExp> {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
207 type NormExp : NormExponent;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
208
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
209 fn norm_exponent(&self) -> Self::NormExp;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
210
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
211 #[inline]
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
212 fn norm_(&self) -> F {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
213 self.norm(self.norm_exponent())
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
214 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
215
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
216 // fn similar_origin(&self) -> Self;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
217
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
218 fn is_zero(&self) -> bool;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
219 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
220
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
221 pub trait HasDual<F : Num = f64> : Normed<F> {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
222 type DualSpace : Normed<F>;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
223 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
224
63
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
225 /// Automatically implemented trait for reflexive spaces
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
226 pub trait Reflexive<F : Num = f64> : HasDual<F>
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
227 where
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
228 Self::DualSpace : HasDual<F, DualSpace = Self>
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
229 { }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
230
63
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
231 impl<F : Num, X : HasDual<F>> Reflexive<F> for X
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
232 where
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
233 X::DualSpace : HasDual<F, DualSpace = X>
f7b87d84864d Extra reflexivity and hilbert-like requirements for Euclidean. Fuse Dot into Euclidean.
Tuomo Valkonen <tuomov@iki.fi>
parents: 60
diff changeset
234 { }
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
235
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
236 pub trait HasDualExponent : NormExponent {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
237 type DualExp : NormExponent;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
238
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
239 fn dual_exponent(&self) -> Self::DualExp;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
240 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
241
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
242 impl HasDualExponent for L2 {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
243 type DualExp = L2;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
244
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
245 #[inline]
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
246 fn dual_exponent(&self) -> Self::DualExp {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
247 L2
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
248 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
249 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
250
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
251 impl HasDualExponent for L1 {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
252 type DualExp = Linfinity;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
253
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
254 #[inline]
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
255 fn dual_exponent(&self) -> Self::DualExp {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
256 Linfinity
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
257 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
258 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
259
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
260
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
261 impl HasDualExponent for Linfinity {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
262 type DualExp = L1;
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
263
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
264 #[inline]
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
265 fn dual_exponent(&self) -> Self::DualExp {
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
266 L1
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
267 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
268 }
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
269
71
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
270 #[macro_export]
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
271 macro_rules! impl_weighted_norm {
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
272 ($exponent : ty) => {
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
273 impl<C, F, D> Norm<F, Weighted<$exponent, C>> for D
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
274 where
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
275 F : Float,
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
276 D : Norm<F, $exponent>,
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
277 C : Constant<Type = F>,
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
278 {
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
279 fn norm(&self, e : Weighted<$exponent, C>) -> F {
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
280 let v = e.weight.value();
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
281 assert!(v > F::ZERO);
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
282 v * self.norm(e.base_fn)
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
283 }
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
284 }
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
285
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
286 impl<C : Constant> NormExponent for Weighted<$exponent, C> {}
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
287
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
288 impl<C : Constant> HasDualExponent for Weighted<$exponent, C>
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
289 where $exponent : HasDualExponent {
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
290 type DualExp = Weighted<<$exponent as HasDualExponent>::DualExp, C::Type>;
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
291
71
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
292 fn dual_exponent(&self) -> Self::DualExp {
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
293 Weighted {
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
294 weight : C::Type::ONE / self.weight.value(),
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
295 base_fn : self.base_fn.dual_exponent()
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
296 }
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
297 }
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
298 }
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
299
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
300 impl<C, F, T> Projection<F, Weighted<$exponent , C>> for T
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
301 where
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
302 T : Projection<F, $exponent >,
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
303 F : Float,
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
304 C : Constant<Type = F>,
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
305 {
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
306 fn proj_ball(self, ρ : F, q : Weighted<$exponent , C>) -> Self {
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
307 self.proj_ball(ρ / q.weight.value(), q.base_fn)
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
308 }
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
309
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
310 fn proj_ball_mut(&mut self, ρ : F, q : Weighted<$exponent , C>) {
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
311 self.proj_ball_mut(ρ / q.weight.value(), q.base_fn)
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
312 }
70
672aec2e1acd Weighted norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
313 }
672aec2e1acd Weighted norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
314 }
672aec2e1acd Weighted norms
Tuomo Valkonen <tuomov@iki.fi>
parents: 64
diff changeset
315 }
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
316
71
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
317 //impl_weighted_norm!(L1);
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
318 //impl_weighted_norm!(L2);
511bf440e24b Need to construct weighted norms using macros due to compiler (overflow) bugs
Tuomo Valkonen <tuomov@iki.fi>
parents: 70
diff changeset
319 //impl_weighted_norm!(Linfinity);
60
848ecc05becf More convexity, normed spaces, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents: 59
diff changeset
320

mercurial