alg_tools: comparison src/euclidean/wrap.rs

-:3f9a03f95457
+:d6009939e832
 /*!
 Wrappers for implemention [`Euclidean`] operations.
 */
-use super::Euclidean;
+pub trait Wrapped {
-use crate::instance::{Decomposition, DecompositionMut, Instance, InstanceMut, MyCow};
+type Unwrapped;
-use crate::linops::AXPY;
+type UnwrappedMut;
-use crate::loc::Loc;
+type UnwrappedOutput;
-use crate::mapping::Space;
+fn get_view(&self) -> Self::Unwrapped;
-use crate::norms::{HasDual, Norm, NormExponent, Normed, PairNorm, L2};
+fn get_view_mut(&mut self) -> Self::UnwrappedMut;
-use crate::types::{Float, Num};
+fn wrap(output: Self::UnwrappedOutput) -> Self;
-use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign};
+}
-use serde::{Deserialize, Serialize};
-use std::clone::Clone;
+#[macro_export]
+macro_rules! wrap {
-macro_rules! impl_unary {
+(impl_unary<$($qual:tt)*> $type:ty, $trait:path, $fn:ident) => {
-($type:ty, $trait:ident, $fn:ident) => {
+impl<$($qual)*> $trait for $type {
-impl $trait for $type {
 type Output = Self::WrappedOutput;
 fn $fn(self) -> Self::Output {
-$type::wrap(self.get_view().$fn())
+Self::wrap(self.get_view().$fn())
 }
 }
 };
-}
+(impl_binary<$($qual:tt)*> $type:ty, $trait:path, $fn:ident) => {
+impl<$($qual)*> $trait<$type> for $type {
-macro_rules! impl_binary {
+type Output = Self::WrappedOutput;
-($type:ty, $trait:ident, $fn:ident) => {
+fn $fn(self, other: $type) -> Self::Output {
-impl $trait<$type> for $type {
+Self::wrap(self.get_view().$fn(other.get_view()))
-type Output = Self::WrappedOutput;
+}
-fn $fn(self, other: $type) -> Self::Output {
+}
-$type::wrap(self.get_view().$fn(other.get_view()))
-}
+impl<'a, $($qual)*> $trait<$type> for &'a $type {
-}
+type Output = Self::WrappedOutput;
+fn $fn(self, other: $type) -> Self::Output {
-impl<'a> $trait<$type> for &'a $type {
+Self::wrap(self.get_view().$fn(other.get_view()))
-type Output = Self::WrappedOutput;
+}
-fn $fn(self, other: $type) -> Self::Output {
+}
-$type::wrap(self.get_view().$fn(other.get_view()))
-}
+impl<'a, 'b, $($qual)*> $trait<&'b $type> for &'a $type {
-}
+type Output = Self::WrappedOutput;
+fn $fn(self, other: $type) -> Self::Output {
-impl<'a, 'b> $trait<&'b $type> for &'a $type {
+Self::wrap(self.get_view().$fn(other.get_view()))
-type Output = Self::WrappedOutput;
+}
-fn $fn(self, other: $type) -> Self::Output {
+}
-$type::wrap(self.get_view().$fn(other.get_view()))
-}
+impl<'b, $($qual)*> $trait<&'b $type> for $type {
-}
+type Output = Self::WrappedOutput;
+fn $fn(self, other: $type) -> Self::Output {
-impl<'b> $trait<&'b $type> for $type {
+Self::wrap(self.get_view().$fn(other.get_view()))
-type Output = Self::WrappedOutput;
+}
-fn $fn(self, other: $type) -> Self::Output {
+}
-$type::wrap(self.get_view().$fn(other.get_view()))
+};
-}
+(impl_scalar<$($qual:tt)*> $type:ty, $trait:path, $fn:ident) => {
-}
+impl<$($qual)*, F: Num> $trait<F> for $type,
-};
-}
-macro_rules! impl_scalar {
-($type:ty, $trait:ident, $fn:ident) => {
-impl<F: Num> $trait<F> for $type,
 where
 $type::Unwrapped: $trait<F>,
 {
 type Output = Self::WrappedOutput;
 fn $fn(self, t: F) -> Self::Output {
-$type::wrap(self.get_view().$fn(t))
+Self::wrap(self.get_view().$fn(t))
 }
 }
-impl<'a, F: Num> $trait<F> for &'a $type,
+impl<'a, $($qual)*, F: Num> $trait<F> for &'a $type,
 where
 $type::Unwrapped: $trait<F>,
 {
 type Output = Self::WrappedOutput;
 fn $fn(self, t: F) -> Self::Output {
-$type::wrap(self.get_view().$fn(t))
+Self::wrap(self.get_view().$fn(t))
 }
 }
 };
-}
+(impl_scalar_lhs<$($qual:tt)*> $type:ty, $trait:path, $fn:ident, $F:ty) => {
+impl<$($qual)*> $trait<$type> for $F
-macro_rules! impl_scalar_lhs {
-($type:ty, $trait:ident, $fn:ident, $F:ty) => {
-impl<A, B> $trait<$type> for $F
 where
 $F: $type::Unwrapped,
 {
 type Output = Self::WrappedOutput;
 fn $fn(self, rhs: $type) -> Self::Output {
-$type::wrap(self.$fn(rhs.get_view()))
+Self::wrap(self.$fn(rhs.get_view()))
 }
 }
 };
-}
+(impl_binary_mut<$($qual:tt)*> $type:ty, $trait:path, $fn:ident) => {
+impl<$($qual)*> $trait<$type> for $type {
-macro_rules! impl_binary_mut {
-($type:ty, $trait:ident, $fn:ident) => {
-impl $trait<$type> for $type {
 fn $fn(&mut self, rhs: $type) {
 self.get_view_mut().$fn(rhs.get_view())
 }
 }
-impl<'b> $trait<&'b $type> for $type {
+impl<'b, $($qual)*> $trait<&'b $type> for $type {
 fn $fn(&mut self, rhs: $type) {
 self.get_view_mut().$fn(rhs.get_view())
 }
 }
 };
-}
+(impl_scalar_mut<$($qual:tt)*> $type:ty, $trait:path, $fn:ident) => {
+impl<$($qual)*> $trait<F> for $type
-macro_rules! impl_scalar_mut {
-($type:ty, $trait:ident, $fn:ident) => {
-impl $trait<F> for $type
 where
 $type::UnwrappedMut: $trait<F>,
 {
 fn $fn(&mut self, t: F) {
 self.unwrap_mut().$fn(t)
 }
 }
 };
-}
-macro_rules! wrap {
 ($type:ty) => {
-impl_unary!($type, Neg, neg);
+$crate::wrap!(imp<> do $type);
-impl_binary!($type, Add, add);
+};
-impl_binary!($type, Sub, sub);
+(imp<$($qual:tt)*> $type:ty) => {
-impl_scalar!($type, Mul, mul);
+$crate::wrap!(impl_unary<$($qual)*> $type, std::ops::Neg, neg);
-impl_scalar!($type, Div, div);
+$crate::wrap!(impl_binary<$($qual)*> $type, std::ops::Add, add);
-impl_scalar_lhs!($type, Mul, mul, f32);
+$crate::wrap!(impl_binary<$($qual)*> $type, std::ops::Sub, sub);
-impl_scalar_lhs!($type, Mul, mul, f64);
+$crate::wrap!(impl_scalar<$($qual)*> $type, std::ops::Mul, mul);
-impl_scalar_lhs!($type, Div, div, f32);
+$crate::wrap!(impl_scalar<$($qual)*> $type, std::ops::Div, div);
-impl_scalar_lhs!($type, Div, div, f64);
+$crate::wrap!(impl_scalar_lhs<$($qual)*> $type, std::ops::Mul, mul, f32);
-impl_binary_mut!($type, AddAssign, add_assign);
+$crate::wrap!(impl_scalar_lhs<$($qual)*> $type, std::ops::Mul, mul, f64);
-impl_binary_mut!($type, SubAssign, sub_assign);
+$crate::wrap!(impl_scalar_lhs<$($qual)*> $type, std::ops::Div, div, f32);
-impl_scalar_mut!($type, MulAssign, mul_assign);
+$crate::wrap!(impl_scalar_lhs<$($qual)*> $type, std::ops::Div, div, f64);
-impl_scalar_mut!($type, DivAssign, div_assign);
+$crate::wrap!(impl_binary_mut<$($qual)*> $type, std::ops::AddAssign, add_assign);
+$crate::wrap!(impl_binary_mut<$($qual)*> $type, std::ops::SubAssign, sub_assign);
+$crate::wrap!(impl_scalar_mut<$($qual)*> $type, std::ops::MulAssign, mul_assign);
+$crate::wrap!(impl_scalar_mut<$($qual)*> $type, std::ops::DivAssign, div_assign);
 /// We only support 'closed' `Euclidean` `Pair`s, as more general ones cause
 /// compiler overflows.
-impl<F: Float> Euclidean<F> for $type
+impl<$($qual)* F: $crate::types::Float> $crate::euclidean::Euclidean<F> for $type
 where
 //Pair<A, B>: Euclidean<F>,
-Self: Sized
+Self: $crate::euclidean::wrap::Wrapped
-+ Mul<F, Output = <Self as AXPY>::Owned>
++ Sized
-+ MulAssign<F>
++ std::ops::Mul<F, Output = <Self as $crate::linops::AXPY>::Owned>
-+ Div<F, Output = <Self as AXPY>::Owned>
++ std::ops::MulAssign<F>
-+ DivAssign<F>
++ std::ops::Div<F, Output = <Self as $crate::linops::AXPY>::Owned>
-+ Add<Self, Output = <Self as AXPY>::Owned>
++ std::ops::DivAssign<F>
-+ Sub<Self, Output = <Self as AXPY>::Owned>
++ std::ops::Add<Self, Output = <Self as $crate::linops::AXPY>::Owned>
-+ for<'b> Add<&'b Self, Output = <Self as AXPY>::Owned>
++ std::ops::Sub<Self, Output = <Self as $crate::linops::AXPY>::Owned>
-+ for<'b> Sub<&'b Self, Output = <Self as AXPY>::Owned>
++ for<'b> std::ops::Add<&'b Self, Output = <Self as $crate::linops::AXPY>::Owned>
-+ AddAssign<Self>
++ for<'b> std::ops::Sub<&'b Self, Output = <Self as $crate::linops::AXPY>::Owned>
-+ for<'b> AddAssign<&'b Self>
++ std::ops::AddAssign<Self>
-+ SubAssign<Self>
++ for<'b> std::ops::AddAssign<&'b Self>
-+ for<'b> SubAssign<&'b Self>
++ std::ops::SubAssign<Self>
-+ Neg<Output = <Self as AXPY>::Owned>,
++ for<'b> std::ops::SubAssign<&'b Self>
-{
++ std::ops::Neg<Output = <Self as $crate::linops::AXPY>::Owned>,
-fn dot<I: Instance<Self>>(&self, other: I) -> F {
+{
+fn dot<I: $crate::instance::Instance<Self>>(&self, other: I) -> F {
 other.eval_decompose(|x| self.get_view().dot(x.get_view()))
 }
 fn norm2_squared(&self) -> F {
 self.get_view().norm2_squared()
 }
-fn dist2_squared<I: Instance<Self>>(&self, other: I) -> F {
+fn dist2_squared<I: $crate::instance::Instance<Self>>(&self, other: I) -> F {
 other.eval_decompose(|x| self.get_view().dist2_squared(x.get_view()))
 }
 }
-impl<F> AXPY for $type
+impl<$($qual)* F : $crate::types::Float> $crate::linops::AXPY for $type
 where
-Self::Unwrapped : AXPY<Field = $F>,
+Self : $crate::euclidean::wrap::Wrapped,
-F: Num,
+Self::Unwrapped : $crate::linops::AXPY<Field = F>,
-Self: MulAssign<F> + DivAssign<F>,
+Self: std::ops::MulAssign<F> + std::ops::DivAssign<F>,
-Self::Unwrapped: MulAssign<F> + DivAssign<F>,
+Self::Unwrapped: std::ops::MulAssign<F> + std::ops::DivAssign<F>,
 {
 type Field = F;
-type Owned = Pair<A::Owned, B::Owned>;
+type Owned = Self;
-fn axpy<I: Instance<Self>>(&mut self, α: F, x: I, β: F) {
+fn axpy<I: $crate::instance::Instance<Self>>(&mut self, α: F, x: I, β: F) {
 x.eval_decompose(|v| {
 self.get_mut_view().axpy(α, v.get_view(), β)
 })
 }
-fn copy_from<I: Instance<Self>>(&mut self, x: I) {
+fn copy_from<I: $crate::instance::Instance<Self>>(&mut self, x: I) {
 x.eval_decompose(|Pair(u, v)| {
 self.get_mut_view().copy_from(v.get_view())
 })
 }
-fn scale_from<I: Instance<Self>>(&mut self, α: F, x: I) {
+fn scale_from<I: $crate::instance::Instance<Self>>(&mut self, α: F, x: I) {
 x.eval_decompose(|v| {
 self.get_mut_view().scale_from(α, v.get_view())
 })
 }
 /// Return a similar zero as `self`.
 fn similar_origin(&self) -> Self::Owned {
-$type::wrap(self.get_view().similar_origin())
+Self::wrap(self.get_view().similar_origin())
 }
 /// Set self to zero.
 fn set_zero(&mut self) {
 self.get_mut_view().set_zero()
 }
 }
-impl<A: Space, B: Space> Space for $type {
+impl<$($qual)*> $crate::instance::Space for $type
-type Decomp = $type::Unwrapped::Decomp
+where Self : $crate::euclidean::wrap::Wrapped {
+type Decomp = Self::Unwrapped::Decomp;
 }
 };
 }

Mercurial > repos > alg_tools / file comparison

comparison: src/euclidean/wrap.rs

src/euclidean/wrap.rs