Drop old opnorm

Author: termoshtt

src/impls/mod.rs

@@ -3,6 +3,5 @@ pub mod outer;
 pub mod qr;
 pub mod svd;
 pub mod eigh;
-pub mod opnorm;
 pub mod solve;
 pub mod cholesky;

src/impls/opnorm.rs

@@ -8,11 +8,10 @@ use lapack::c::Layout;
 use super::error::{LinalgError, StrideError};
 use super::impls::qr::ImplQR;
 use super::impls::svd::ImplSVD;
-use super::impls::opnorm::ImplOpNorm;
 use super::impls::solve::ImplSolve;
 
-pub trait MFloat: ImplQR + ImplSVD + ImplOpNorm + ImplSolve + NdFloat {}
-impl<A: ImplQR + ImplSVD + ImplOpNorm + ImplSolve + NdFloat> MFloat for A {}
+pub trait MFloat: ImplQR + ImplSVD + ImplSolve + NdFloat {}
+impl<A: ImplQR + ImplSVD + ImplSolve + NdFloat> MFloat for A {}
 
 /// Methods for general matrices
 pub trait Matrix: Sized {
@@ -23,12 +22,6 @@ pub trait Matrix: Sized {
     fn size(&self) -> (usize, usize);
     /// Layout (C/Fortran) of matrix
     fn layout(&self) -> Result<Layout, StrideError>;
-    /// Operator norm for L-1 norm
-    fn opnorm_1(&self) -> Self::Scalar;
-    /// Operator norm for L-inf norm
-    fn opnorm_i(&self) -> Self::Scalar;
-    /// Frobenius norm
-    fn opnorm_f(&self) -> Self::Scalar;
     /// singular-value decomposition (SVD)
     fn svd(self) -> Result<(Self, Self::Vector, Self), LinalgError>;
     /// QR decomposition
@@ -84,28 +77,6 @@ impl<A: MFloat> Matrix for Array<A, Ix2> {
     fn layout(&self) -> Result<Layout, StrideError> {
         check_layout(self.strides())
     }
-    fn opnorm_1(&self) -> Self::Scalar {
-        let (m, n) = self.size();
-        let strides = self.strides();
-        if strides[0] > strides[1] {
-            ImplOpNorm::opnorm_i(n, m, self.clone().into_raw_vec())
-        } else {
-            ImplOpNorm::opnorm_1(m, n, self.clone().into_raw_vec())
-        }
-    }
-    fn opnorm_i(&self) -> Self::Scalar {
-        let (m, n) = self.size();
-        let strides = self.strides();
-        if strides[0] > strides[1] {
-            ImplOpNorm::opnorm_1(n, m, self.clone().into_raw_vec())
-        } else {
-            ImplOpNorm::opnorm_i(m, n, self.clone().into_raw_vec())
-        }
-    }
-    fn opnorm_f(&self) -> Self::Scalar {
-        let (m, n) = self.size();
-        ImplOpNorm::opnorm_f(m, n, self.clone().into_raw_vec())
-    }
     fn svd(self) -> Result<(Self, Self::Vector, Self), LinalgError> {
         let (n, m) = self.size();
         let layout = self.layout()?;
@@ -192,18 +163,6 @@ impl<A: MFloat> Matrix for RcArray<A, Ix2> {
     fn layout(&self) -> Result<Layout, StrideError> {
         check_layout(self.strides())
     }
-    fn opnorm_1(&self) -> Self::Scalar {
-        // XXX unnecessary clone
-        self.to_owned().opnorm_1()
-    }
-    fn opnorm_i(&self) -> Self::Scalar {
-        // XXX unnecessary clone
-        self.to_owned().opnorm_i()
-    }
-    fn opnorm_f(&self) -> Self::Scalar {
-        // XXX unnecessary clone
-        self.to_owned().opnorm_f()
-    }
     fn svd(self) -> Result<(Self, Self::Vector, Self), LinalgError> {
         let (u, s, v) = self.into_owned().svd()?;
         Ok((u.into_shared(), s.into_shared(), v.into_shared()))

src/matrix.rs

@@ -5,3 +5,4 @@ pub use hermite::HermiteMatrix;
 pub use triangular::*;
 pub use util::*;
 pub use assert::*;
+pub use traits::*;

src/prelude.rs

@@ -5,9 +5,9 @@ macro_rules! impl_test {
 #[test]
 fn $funcname() {
     let a = $a;
-    assert_rclose!(a.opnorm_1(), $op1, 1e-7);
-    assert_rclose!(a.opnorm_i(), $opi, 1e-7);
-    assert_rclose!(a.opnorm_f(), $opf, 1e-7);
+    assert_rclose!(a.opnorm_one().unwrap(), $op1, 1e-7);
+    assert_rclose!(a.opnorm_inf().unwrap(), $opi, 1e-7);
+    assert_rclose!(a.opnorm_fro().unwrap(), $opf, 1e-7);
 }
 }} // impl_test