alg_tools: comparison src/instance.rs

-:03f34ba55685
+:45d03cf92c23
 i8 i16 i32 i64 i128 isize
 f32 f64);
 /// Marker type for decompositions to be used with [`Instance`].
 pub trait Decomposition<X: Space>: Sized {
+/// Owned instance
+type OwnedInstance: Instance<X, Self>;
 /// Possibly owned form of the decomposition
 type Decomposition<'b>: Instance<X, Self>
 where
 X: 'b;
 /// Unlikely owned form of the decomposition.
 /// contains references; see the implementation for [`crate::direct_product::Pair`].
 type Reference<'b>: Instance<X, Self> + Copy
 where
 X: 'b;
-/// Left the lightweight reference type into a full decomposition type.
+/// Lift the lightweight reference type into a full decomposition type.
 fn lift<'b>(r: Self::Reference<'b>) -> Self::Decomposition<'b>;
+// /// Lift the lightweight reference type into a fully owned type
+// fn full_lift<'b>(r: Self::Reference<'b>) -> Self::OwnedInstance;
 }
 /// Most common [`Decomposition`] (into `Either<X, &'b X>`) that allows working with owned
 /// values and all sorts of references.
 #[derive(Copy, Clone, Debug)]
 pub struct BasicDecomposition;
-impl<X: Space> Decomposition<X> for BasicDecomposition {
+impl<X: Space + Clone> Decomposition<X> for BasicDecomposition {
+type OwnedInstance = X;
 type Decomposition<'b>
 = MyCow<'b, X>
 where
 X: 'b;
 type Reference<'b>
 where
 X: 'b,
 Self: 'b;
 /// Returns an owned instance of `X`, cloning or converting non-true instances when necessary.
-fn own(self) -> X;
+fn own(self) -> D::OwnedInstance;
 // ************** automatically implemented methods below from here **************
 /// Returns an owned instance or reference to `X`, converting non-true instances when necessary.
 ///
 /// Default implementation uses [`Self::own`]. Consumes the input.
-fn cow<'b>(self) -> MyCow<'b, X>
+fn cow<'b>(self) -> MyCow<'b, D::OwnedInstance>
 where
 Self: 'b,
 {
 MyCow::Owned(self.own())
 }
 #[inline]
 /// Evaluates `f` on a reference to self.
 ///
 /// Default implementation uses [`Self::cow`]. Consumes the input.
-fn eval<'b, R>(self, f: impl FnOnce(&X) -> R) -> R
+fn eval<'b, R>(self, f: impl FnOnce(&D::OwnedInstance) -> R) -> R
 where
 X: 'b,
 Self: 'b,
 {
 f(&*self.cow())
 #[inline]
 /// Evaluates `f` or `g` depending on whether a reference or owned value is available.
 ///
 /// Default implementation uses [`Self::cow`]. Consumes the input.
-fn either<'b, R>(self, f: impl FnOnce(X) -> R, g: impl FnOnce(&X) -> R) -> R
+fn either<'b, R>(
+self,
+f: impl FnOnce(D::OwnedInstance) -> R,
+g: impl FnOnce(&D::OwnedInstance) -> R,
+) -> R
 where
 Self: 'b,
 {
 match self.cow() {
 EitherDecomp::Owned(x) => f(x),
 EitherDecomp::Borrowed(x) => g(x),
 }
 }
 }
-impl<X: Space> Instance<X, BasicDecomposition> for X {
+impl<X: Space + Clone> Instance<X, BasicDecomposition> for X {
 #[inline]
 fn eval_decompose<'b, R>(self, f: impl FnOnce(MyCow<'b, X>) -> R) -> R
 where
 X: 'b,
 Self: 'b,
 {
 MyCow::Owned(self)
 }
 }
-impl<'a, X: Space> Instance<X, BasicDecomposition> for &'a X {
+impl<'a, X: Space + Clone> Instance<X, BasicDecomposition> for &'a X {
 #[inline]
 fn eval_decompose<'b, R>(self, f: impl FnOnce(MyCow<'b, X>) -> R) -> R
 where
 X: 'b,
 Self: 'b,
 f(*self)
 }
 #[inline]
 fn own(self) -> X {
-self.into_owned()
+self.clone()
 }
 #[inline]
 fn cow<'b>(self) -> MyCow<'b, X>
 where
 {
 MyCow::Borrowed(self)
 }
 }
-impl<'a, X: Space> Instance<X, BasicDecomposition> for &'a mut X {
+impl<'a, X: Space + Clone> Instance<X, BasicDecomposition> for &'a mut X {
 #[inline]
 fn eval_decompose<'b, R>(self, f: impl FnOnce(MyCow<'b, X>) -> R) -> R
 where
 X: 'b,
 Self: 'b,
 f(*self)
 }
 #[inline]
 fn own(self) -> X {
-self.into_owned()
+self.clone()
 }
 #[inline]
 fn cow<'b>(self) -> MyCow<'b, X>
 where
 {
 EitherDecomp::Borrowed(self)
 }
 }
-impl<'a, X: Space> Instance<X, BasicDecomposition> for MyCow<'a, X> {
+impl<'a, X: Space + Clone> Instance<X, BasicDecomposition> for MyCow<'a, X> {
 #[inline]
 fn eval_decompose<'b, R>(self, f: impl FnOnce(MyCow<'b, X>) -> R) -> R
 where
 X: 'b,
 Self: 'b,

Mercurial > repos > alg_tools / file comparison

comparison: src/instance.rs

src/instance.rs