Mercurial > repos > alg_tools / file diff

--- a/src/mapping/dataterm.rs	Wed Apr 30 00:48:56 2025 -0500
+++ b/src/mapping/dataterm.rs	Wed Apr 30 01:06:25 2025 -0500
@@ -5,11 +5,11 @@
 
 #![allow(non_snake_case)]
 
-use super::{DifferentiableImpl, DifferentiableMapping, /*LipschitzDifferentiableImpl,*/ Mapping,};
+use super::{DifferentiableImpl, DifferentiableMapping, LipschitzDifferentiableImpl, Mapping};
 use crate::convex::ConvexMapping;
 use crate::instance::{Instance, Space};
-use crate::linops::{/*BoundedLinear,*/ Linear, Preadjointable};
-//use crate::norms::{Norm, NormExponent, L2};
+use crate::linops::{BoundedLinear, Linear, Preadjointable};
+use crate::norms::{Normed, L2};
 use crate::types::Float;
 use std::ops::Sub;
 //use serde::{Deserialize, Serialize};
@@ -72,10 +72,10 @@
 impl<F, X, A, G> ConvexMapping<X, F> for DataTerm<F, X, A, G>
 where
     F: Float,
-    X: Space,
+    X: Normed<F>,
     A: Linear<X>,
     G: ConvexMapping<A::Codomain, F>,
-    A::Codomain: for<'a> Sub<&'a A::Codomain, Output = A::Codomain>,
+    A::Codomain: Normed<F> + for<'a> Sub<&'a A::Codomain, Output = A::Codomain>,
 {
 }
 
@@ -103,22 +103,18 @@
     }
 }
 
-/*
-impl<'a, F, X, ExpX, Y, ExpY, A, G> LipschitzDifferentiableImpl<X, ExpX> for DataTerm<F, X, A, G>
+impl<'a, F, X, Y, A, G> LipschitzDifferentiableImpl<X, X::NormExp> for DataTerm<F, X, A, G>
 where
     F: Float,
-    X: Space + Clone + Norm<F, ExpX>,
-    Y: Space + Norm<F, ExpY>,
-    ExpX: NormExponent,
-    ExpY: NormExponent,
-    A: Clone + BoundedLinear<X, ExpX, L2, F, Codomain = Y>,
-    G: Mapping<Y, Codomain = F> + LipschitzDifferentiableImpl<Y, ExpY>,
+    X: Normed<F> + Clone,
+    Y: Normed<F>,
+    A: Clone + BoundedLinear<X, X::NormExp, L2, F, Codomain = Y>,
+    G: Mapping<Y, Codomain = F> + LipschitzDifferentiableImpl<Y, Y::NormExp>,
     Self: DifferentiableImpl<X>,
 {
     type FloatType = F;
 
-    fn diff_lipschitz_factor(&self, seminorm: ExpX) -> Option<F> {
+    fn diff_lipschitz_factor(&self, seminorm: X::NormExp) -> Option<F> {
         Some(self.opA.opnorm_bound(seminorm, L2).powi(2))
     }
 }
-*/