diff -r bd924d62d952 -r a0db98c16ab5 src/bisection_tree/support.rs --- a/src/bisection_tree/support.rs Wed Nov 06 15:34:17 2024 -0500 +++ b/src/bisection_tree/support.rs Sat Nov 09 20:36:23 2024 -0500 @@ -146,19 +146,19 @@ } impl<'a, T, V, F : Float, const N : usize> Differentiable<&'a Loc> for Shift -where T : Differentiable, Output=V> { - type Output = V; +where T : Differentiable, Derivative=V> { + type Derivative = V; #[inline] - fn differential(&self, x : &'a Loc) -> Self::Output { + fn differential(&self, x : &'a Loc) -> Self::Derivative { self.base_fn.differential(x - &self.shift) } } impl<'a, T, V, F : Float, const N : usize> Differentiable> for Shift -where T : Differentiable, Output=V> { - type Output = V; +where T : Differentiable, Derivative=V> { + type Derivative = V; #[inline] - fn differential(&self, x : Loc) -> Self::Output { + fn differential(&self, x : Loc) -> Self::Derivative { self.base_fn.differential(x - &self.shift) } } @@ -251,23 +251,23 @@ } impl<'a, T, V, F : Float, C, const N : usize> Differentiable<&'a Loc> for Weighted -where T : for<'b> Differentiable<&'b Loc, Output=V>, +where T : for<'b> Differentiable<&'b Loc, Derivative=V>, V : std::ops::Mul, C : Constant { - type Output = V; + type Derivative = V; #[inline] - fn differential(&self, x : &'a Loc) -> Self::Output { + fn differential(&self, x : &'a Loc) -> Self::Derivative { self.base_fn.differential(x) * self.weight.value() } } impl<'a, T, V, F : Float, C, const N : usize> Differentiable> for Weighted -where T : Differentiable, Output=V>, +where T : Differentiable, Derivative=V>, V : std::ops::Mul, C : Constant { - type Output = V; + type Derivative = V; #[inline] - fn differential(&self, x : Loc) -> Self::Output { + fn differential(&self, x : Loc) -> Self::Derivative { self.base_fn.differential(x) * self.weight.value() } }