Move definitions to mod.rs

Author: termoshtt

src/krylov/mgs.rs

@@ -1,7 +1,7 @@
 //! Modified Gram-Schmit orthogonalizer
 
-use crate::{generate::*, inner::*, norm::Norm, types::*};
-use ndarray::*;
+use super::*;
+use crate::{generate::*, inner::*, norm::Norm};
 
 /// Iterative orthogonalizer using modified Gram-Schmit procedure
 #[derive(Debug, Clone)]
@@ -12,20 +12,6 @@ pub struct MGS<A> {
     q: Vec<Array1<A>>,
 }
 
-/// Q-matrix
-///
-/// - Maybe **NOT** square
-/// - Unitary for existing columns
-///
-pub type Q<A> = Array2<A>;
-
-/// R-matrix
-///
-/// - Maybe **NOT** square
-/// - Upper triangle
-///
-pub type R<A> = Array2<A>;
-
 impl<A: Scalar> MGS<A> {
     /// Create an empty orthogonalizer
     pub fn new(dimension: usize) -> Self {
@@ -129,27 +115,6 @@ impl<A: Scalar> MGS<A> {
     }
 }
 
-/// Strategy for linearly dependent vectors appearing in iterative QR decomposition
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum Strategy {
-    /// Terminate iteration if dependent vector comes
-    Terminate,
-
-    /// Skip dependent vector
-    Skip,
-
-    /// Orthogonalize dependent vector without adding to Q,
-    /// i.e. R must be non-square like following:
-    ///
-    /// ```text
-    /// x x x x x
-    /// 0 x x x x
-    /// 0 0 0 x x
-    /// 0 0 0 0 x
-    /// ```
-    Full,
-}
-
 /// Online QR decomposition of vectors using modified Gram-Schmit algorithm
 pub fn mgs<A, S>(
     iter: impl Iterator<Item = ArrayBase<S, Ix1>>,

src/krylov/mod.rs

@@ -1 +1,43 @@
+//! Krylov subspace
+
+use crate::types::*;
+use ndarray::*;
+
 pub mod mgs;
+
+pub use mgs::MGS;
+
+/// Q-matrix
+///
+/// - Maybe **NOT** square
+/// - Unitary for existing columns
+///
+pub type Q<A> = Array2<A>;
+
+/// R-matrix
+///
+/// - Maybe **NOT** square
+/// - Upper triangle
+///
+pub type R<A> = Array2<A>;
+
+/// Strategy for linearly dependent vectors appearing in iterative QR decomposition
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum Strategy {
+    /// Terminate iteration if dependent vector comes
+    Terminate,
+
+    /// Skip dependent vector
+    Skip,
+
+    /// Orthogonalize dependent vector without adding to Q,
+    /// i.e. R must be non-square like following:
+    ///
+    /// ```text
+    /// x x x x x
+    /// 0 x x x x
+    /// 0 0 0 x x
+    /// 0 0 0 0 x
+    /// ```
+    Full,
+}