Update rlst version (#4)

* bump rlst version

* rlst updates

* fmt

Cargo.toml

@@ -31,7 +31,7 @@ libc = "0.2"
 log = "0.4"
 rayon = "1.9"
 rand = "0.8.5"
-rlst = "0.1.0"
+rlst = "0.2.0"
 thiserror="1.*"
 
 [dev-dependencies]

src/ciarlet.rs

@@ -5,8 +5,8 @@ use crate::reference_cell;
 use crate::traits::FiniteElement;
 use crate::types::{Continuity, MapType, ReferenceCellType};
 use rlst::{
-    dense::array::views::ArrayViewMut, rlst_dynamic_array2, rlst_dynamic_array3, Array, BaseArray,
-    MatrixInverse, RandomAccessByRef, RandomAccessMut, RlstScalar, Shape, VectorContainer,
+    rlst_dynamic_array2, rlst_dynamic_array3, Array, BaseArray, MatrixInverse, RandomAccessByRef,
+    RandomAccessMut, RlstScalar, Shape, VectorContainer,
 };
 
 pub mod lagrange;
@@ -32,7 +32,7 @@ fn compute_derivative_count(nderivs: usize, cell_type: ReferenceCellType) -> usi
 }
 
 /// A Ciarlet element
-pub struct CiarletElement<T: RlstScalar> {
+pub struct CiarletElement<T: RlstScalar + MatrixInverse> {
     cell_type: ReferenceCellType,
     degree: usize,
     embedded_superdegree: usize,
@@ -47,10 +47,7 @@ pub struct CiarletElement<T: RlstScalar> {
     interpolation_weights: EntityWeights<T>,
 }
 
-impl<T: RlstScalar> CiarletElement<T>
-where
-    for<'a> Array<T, ArrayViewMut<'a, T, BaseArray<T, VectorContainer<T>, 2>, 2>, 2>: MatrixInverse,
-{
+impl<T: RlstScalar + MatrixInverse> CiarletElement<T> {
     /// Create a Ciarlet element
     #[allow(clippy::too_many_arguments)]
     pub fn create(
@@ -246,7 +243,7 @@ where
         &self.interpolation_weights
     }
 }
-impl<T: RlstScalar> FiniteElement for CiarletElement<T> {
+impl<T: RlstScalar + MatrixInverse> FiniteElement for CiarletElement<T> {
     type CellType = ReferenceCellType;
     type MapType = MapType;
     type T = T;

src/ciarlet/lagrange.rs

@@ -5,21 +5,15 @@ use crate::polynomials::polynomial_count;
 use crate::reference_cell;
 use crate::traits::ElementFamily;
 use crate::types::{Continuity, MapType, ReferenceCellType};
-use rlst::{
-    dense::array::views::ArrayViewMut, rlst_dynamic_array2, rlst_dynamic_array3, Array, BaseArray,
-    MatrixInverse, RandomAccessMut, RlstScalar, VectorContainer,
-};
+use rlst::{rlst_dynamic_array2, rlst_dynamic_array3, MatrixInverse, RandomAccessMut, RlstScalar};
 use std::marker::PhantomData;
 
 /// Create a Lagrange element
-pub fn create<T: RlstScalar>(
+pub fn create<T: RlstScalar + MatrixInverse>(
     cell_type: ReferenceCellType,
     degree: usize,
     continuity: Continuity,
-) -> CiarletElement<T>
-where
-    for<'a> Array<T, ArrayViewMut<'a, T, BaseArray<T, VectorContainer<T>, 2>, 2>, 2>: MatrixInverse,
-{
+) -> CiarletElement<T> {
     let dim = polynomial_count(cell_type, degree);
     let tdim = reference_cell::dim(cell_type);
     let mut wcoeffs = rlst_dynamic_array3!(T, [dim, 1, dim]);
@@ -178,19 +172,13 @@ where
 }
 
 /// Lagrange element family
-pub struct LagrangeElementFamily<T: RlstScalar>
-where
-    for<'a> Array<T, ArrayViewMut<'a, T, BaseArray<T, VectorContainer<T>, 2>, 2>, 2>: MatrixInverse,
-{
+pub struct LagrangeElementFamily<T: RlstScalar + MatrixInverse> {
     degree: usize,
     continuity: Continuity,
     _t: PhantomData<T>,
 }
 
-impl<T: RlstScalar> LagrangeElementFamily<T>
-where
-    for<'a> Array<T, ArrayViewMut<'a, T, BaseArray<T, VectorContainer<T>, 2>, 2>, 2>: MatrixInverse,
-{
+impl<T: RlstScalar + MatrixInverse> LagrangeElementFamily<T> {
     /// Create new family
     pub fn new(degree: usize, continuity: Continuity) -> Self {
         Self {
@@ -201,10 +189,7 @@ where
     }
 }
 
-impl<T: RlstScalar> ElementFamily for LagrangeElementFamily<T>
-where
-    for<'a> Array<T, ArrayViewMut<'a, T, BaseArray<T, VectorContainer<T>, 2>, 2>, 2>: MatrixInverse,
-{
+impl<T: RlstScalar + MatrixInverse> ElementFamily for LagrangeElementFamily<T> {
     type T = T;
     type FiniteElement = CiarletElement<T>;
     type CellType = ReferenceCellType;

src/ciarlet/raviart_thomas.rs

@@ -7,21 +7,15 @@ use crate::traits::ElementFamily;
 use crate::types::{Continuity, MapType, ReferenceCellType};
 use rlst::MatrixInverse;
 use rlst::RlstScalar;
-use rlst::{
-    dense::array::views::ArrayViewMut, rlst_dynamic_array2, rlst_dynamic_array3, Array, BaseArray,
-    RandomAccessMut, VectorContainer,
-};
+use rlst::{rlst_dynamic_array2, rlst_dynamic_array3, RandomAccessMut};
 use std::marker::PhantomData;
 
 /// Create a Raviart-Thomas element
-pub fn create<T: RlstScalar>(
+pub fn create<T: RlstScalar + MatrixInverse>(
     cell_type: ReferenceCellType,
     degree: usize,
     continuity: Continuity,
-) -> CiarletElement<T>
-where
-    for<'a> Array<T, ArrayViewMut<'a, T, BaseArray<T, VectorContainer<T>, 2>, 2>, 2>: MatrixInverse,
-{
+) -> CiarletElement<T> {
     if cell_type != ReferenceCellType::Triangle && cell_type != ReferenceCellType::Quadrilateral {
         panic!("Unsupported cell type");
     }
@@ -99,19 +93,13 @@ where
 }
 
 /// Raviart-Thomas element family
-pub struct RaviartThomasElementFamily<T: RlstScalar>
-where
-    for<'a> Array<T, ArrayViewMut<'a, T, BaseArray<T, VectorContainer<T>, 2>, 2>, 2>: MatrixInverse,
-{
+pub struct RaviartThomasElementFamily<T: RlstScalar + MatrixInverse> {
     degree: usize,
     continuity: Continuity,
     _t: PhantomData<T>,
 }
 
-impl<T: RlstScalar> RaviartThomasElementFamily<T>
-where
-    for<'a> Array<T, ArrayViewMut<'a, T, BaseArray<T, VectorContainer<T>, 2>, 2>, 2>: MatrixInverse,
-{
+impl<T: RlstScalar + MatrixInverse> RaviartThomasElementFamily<T> {
     /// Create new family
     pub fn new(degree: usize, continuity: Continuity) -> Self {
         Self {
@@ -122,10 +110,7 @@ where
     }
 }
 
-impl<T: RlstScalar> ElementFamily for RaviartThomasElementFamily<T>
-where
-    for<'a> Array<T, ArrayViewMut<'a, T, BaseArray<T, VectorContainer<T>, 2>, 2>, 2>: MatrixInverse,
-{
+impl<T: RlstScalar + MatrixInverse> ElementFamily for RaviartThomasElementFamily<T> {
     type T = T;
     type CellType = ReferenceCellType;
     type FiniteElement = CiarletElement<T>;