Better elements

linalg-rs · Jan 15, 2025 · 1ce15c0 · 1ce15c0
1 parent add4d0c
commit 1ce15c0
Show file tree

Hide file tree

Showing 13 changed files with 242 additions and 83 deletions.
diff --git a/examples/cg_distributed.rs b/examples/cg_distributed.rs
@@ -6,7 +6,9 @@ use mpi::topology::Communicator;
 use rand::Rng;
 use rlst::operator::interface::DistributedArrayVectorSpace;
 use rlst::operator::Operator;
-use rlst::{CgIteration, DistributedCsrMatrix, Element, IndexLayout, LinearSpace, OperatorBase};
+use rlst::{
+    CgIteration, DistributedCsrMatrix, ElementImpl, IndexLayout, LinearSpace, OperatorBase,
+};
 
 pub fn main() {
     let universe = mpi::initialize().unwrap();

diff --git a/src/operator/abstract_operator.rs b/src/operator/abstract_operator.rs
@@ -1,6 +1,6 @@
 //! Definition of a general linear operator.
 
-use crate::operator::element::Element;
+use crate::operator::element::ElementImpl;
 use crate::operator::LinearSpace;
 use crate::RlstScalar;
 use num::One;

diff --git a/src/operator/interface/array_vector_space.rs b/src/operator/interface/array_vector_space.rs
@@ -10,7 +10,8 @@ use crate::dense::{
     base_array::BaseArray,
     data_container::VectorContainer,
 };
-use crate::operator::space::{Element, IndexableSpace, InnerProductSpace, LinearSpace};
+use crate::operator::space::{ElementImpl, IndexableSpace, InnerProductSpace, LinearSpace};
+use crate::operator::{ConcreteElementContainer, Element};
 use crate::rlst_dynamic_array1;
 
 /// Array vector space
@@ -67,8 +68,8 @@ impl<Item: RlstScalar> LinearSpace for ArrayVectorSpace<Item> {
 
     type F = Item;
 
-    fn zero(space: Rc<Self>) -> Self::E {
-        ArrayVectorSpaceElement::new(space)
+    fn zero(space: Rc<Self>) -> Element<ConcreteElementContainer<Self::E>> {
+        Element::<ConcreteElementContainer<Self::E>>::new(ArrayVectorSpaceElement::new(space))
     }
 }
 
@@ -78,7 +79,7 @@ impl<Item: RlstScalar> InnerProductSpace for ArrayVectorSpace<Item> {
     }
 }
 
-impl<Item: RlstScalar> Element for ArrayVectorSpaceElement<Item> {
+impl<Item: RlstScalar> ElementImpl for ArrayVectorSpaceElement<Item> {
     type F = Item;
     type Space = ArrayVectorSpace<Item>;
 

diff --git a/src/operator/interface/distributed_array_vector_space.rs b/src/operator/interface/distributed_array_vector_space.rs
@@ -6,7 +6,8 @@ use std::rc::Rc;
 use mpi::traits::{Communicator, Equivalence};
 
 use crate::dense::types::RlstScalar;
-use crate::operator::space::{Element, IndexableSpace, InnerProductSpace, LinearSpace};
+use crate::operator::space::{ElementImpl, IndexableSpace, InnerProductSpace, LinearSpace};
+use crate::operator::{ConcreteElementContainer, Element};
 use crate::DistributedVector;
 use bempp_distributed_tools::IndexLayout;
 
@@ -69,8 +70,10 @@ impl<'a, C: Communicator, Item: RlstScalar + Equivalence> LinearSpace
 
     type F = Item;
 
-    fn zero(space: Rc<Self>) -> Self::E {
-        DistributedArrayVectorSpaceElement::new(space.clone())
+    fn zero(space: Rc<Self>) -> Element<ConcreteElementContainer<Self::E>> {
+        Element::<ConcreteElementContainer<_>>::new(DistributedArrayVectorSpaceElement::new(
+            space.clone(),
+        ))
     }
 }
 
@@ -82,7 +85,7 @@ impl<C: Communicator, Item: RlstScalar + Equivalence> InnerProductSpace
     }
 }
 
-impl<'a, C: Communicator, Item: RlstScalar + Equivalence> Element
+impl<'a, C: Communicator, Item: RlstScalar + Equivalence> ElementImpl
     for DistributedArrayVectorSpaceElement<'a, C, Item>
 {
     type F = Item;

diff --git a/src/operator/interface/distributed_sparse_operator.rs b/src/operator/interface/distributed_sparse_operator.rs
@@ -8,7 +8,7 @@ use crate::dense::types::RlstScalar;
 use crate::operator::Operator;
 use crate::DistributedCsrMatrix;
 use crate::{
-    operator::space::{Element, IndexableSpace, LinearSpace},
+    operator::space::{ElementImpl, IndexableSpace, LinearSpace},
     operator::AsApply,
     operator::OperatorBase,
 };

diff --git a/src/operator/interface/matrix_operator.rs b/src/operator/interface/matrix_operator.rs
@@ -8,7 +8,7 @@ use crate::dense::{
 };
 use crate::operator::Operator;
 use crate::{
-    operator::space::{Element, LinearSpace},
+    operator::space::{ElementImpl, LinearSpace},
     operator::AsApply,
     operator::OperatorBase,
 };

diff --git a/src/operator/operations/conjugate_gradients.rs b/src/operator/operations/conjugate_gradients.rs
@@ -1,12 +1,12 @@
 //! Arnoldi Iteration
 use crate::dense::types::RlstScalar;
-use crate::operator::{AsApply, Element, InnerProductSpace, LinearSpace};
+use crate::operator::{AsApply, ElementImpl, InnerProductSpace, LinearSpace};
 use num::One;
 
 /// Iteration for CG
 pub struct CgIteration<'a, Space: InnerProductSpace, Op: AsApply<Domain = Space, Range = Space>>
 where
-    <Space::E as Element>::Space: InnerProductSpace,
+    <Space::E as ElementImpl>::Space: InnerProductSpace,
 {
     operator: &'a Op,
     rhs: &'a Space::E,
@@ -21,7 +21,7 @@ where
 impl<'a, Space: InnerProductSpace, Op: AsApply<Domain = Space, Range = Space>>
     CgIteration<'a, Space, Op>
 where
-    <Space::E as Element>::Space: InnerProductSpace,
+    <Space::E as ElementImpl>::Space: InnerProductSpace,
 {
     /// Create a new CG iteration
     pub fn new(op: &'a Op, rhs: &'a Space::E) -> Self {

diff --git a/src/operator/operations/modified_gram_schmidt.rs b/src/operator/operations/modified_gram_schmidt.rs
@@ -4,7 +4,7 @@ use crate::dense::{
     array::DynamicArray,
     traits::{RandomAccessMut, Shape},
 };
-use crate::operator::{frame::Frame, Element, InnerProductSpace, NormedSpace};
+use crate::operator::{frame::Frame, ElementImpl, InnerProductSpace, NormedSpace};
 use num::One;
 /// Gram Schmidt orthogonalization
 pub struct ModifiedGramSchmidt;
@@ -14,7 +14,7 @@ impl ModifiedGramSchmidt {
     pub fn orthogonalize<
         'a,
         Item: RlstScalar,
-        Elem: Element<F = Item>,
+        Elem: ElementImpl<F = Item>,
         Space: InnerProductSpace<E = Elem, F = Item> + 'a,
         FrameType: Frame<E = Elem>,
     >(