Skip to content

Derive PartialEq and Eq for multiarray #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maugier wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Derive PartialEq and Eq for multiarray #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
739007d
Derive PartialEq and Eq for multiarray
maugier Feb 9, 2021
a661bb7
Welp, work around autoderive shortcomings
maugier Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ use std::ops::{ Index, IndexMut };

/// Helper type to wrap things. This helps avoiding trait coherency issues
/// w.r.t. `AsRef` and `From`.
#[derive(Copy,Clone)]
#[derive(Copy,Clone,PartialEq,Eq)]
pub struct Wrapped<T>(pub T);

impl<T> From<T> for Wrapped<[T; 1]> {
Expand All @@ -65,10 +65,10 @@ impl<B: ?Sized, O: AsMut<B>> AsMut<B> for Wrapped<O> {
/// memory layout of a multi-dimensional array.
pub unsafe trait LayoutHelper {
/// type for a small fixed-size array of isize
type I: AsRef<[isize]> + AsMut<[isize]> + Copy + Clone;
type I: AsRef<[isize]> + AsMut<[isize]> + Copy + Clone + PartialEq + Eq;

/// type for a small fixed-size array of usize
type U: AsRef<[usize]> + AsMut<[usize]> + Copy + Clone;
type U: AsRef<[usize]> + AsMut<[usize]> + Copy + Clone + PartialEq + Eq;

/// length of the fixed-size arrays this type can create
fn dimensions() -> usize;
Expand Down Expand Up @@ -114,6 +114,7 @@ declare_int_array_maker! { Dim4, 4, [0,0,0,0], Dim3 }
declare_int_array_maker! { Dim5, 5, [0,0,0,0,0], Dim4 }
declare_int_array_maker! { Dim6, 6, [0,0,0,0,0,0], Dim5 }

#[derive(Eq)]
struct MultiArrayLayout<A> where A: LayoutHelper {
extents: A::U,
steps: A::I,
Expand All @@ -127,6 +128,12 @@ impl<A> Clone for MultiArrayLayout<A> where A: LayoutHelper {
}
}

impl<A> PartialEq for MultiArrayLayout<A> where A: LayoutHelper {
fn eq(&self, other: &Self) -> bool {
self.extents.eq(&other.extents) && self.steps.eq(&other.steps)
}
}

fn c_array_layout(extents: &[usize], steps: &mut [isize]) -> usize {
let dim = extents.len();
assert!(dim == steps.len());
Expand Down Expand Up @@ -300,11 +307,18 @@ pub struct MultiArrayRefMut<'a, T: 'a, A> where A: LayoutHelper {
/// matrix[[1,0]] = 3; matrix[[1,1]] = 4;
/// matrix[[2,0]] = 5; matrix[[2,1]] = 6;
/// ```
#[derive(Eq)]
pub struct MultiArray<T, A> where A: LayoutHelper {
layout: MultiArrayLayout<A>,
data: Box<[T]>,
}

impl <T, A> PartialEq for MultiArray<T, A> where T: PartialEq, A: LayoutHelper {
fn eq(&self, other: &Self) -> bool {
self.layout.eq(&other.layout) && self.data.eq(&other.data)
}
}

/// Shared view of a 1D array
pub type Array1DRef<'a, T> = MultiArrayRef<'a, T, Dim1>;
/// Shared view of a 2D array
Expand Down