Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #631 from Andlon/matrixcompare
Basic matrixcompare functionality
- Loading branch information
Showing
6 changed files
with
203 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
extern crate nalgebra as na; | ||
|
||
use matrixcompare::comparators::{AbsoluteElementwiseComparator, ExactElementwiseComparator}; | ||
use matrixcompare::compare_matrices; | ||
use na::{MatrixMN, U3, U4}; | ||
|
||
fn compare_integers_fail() { | ||
println!("Comparing two integer matrices."); | ||
|
||
#[rustfmt::skip] | ||
let a = MatrixMN::<_, U3, U4>::from_row_slice(&[ | ||
0, 1, 2, 3, | ||
4, 5, 6, 7, | ||
8, 9, -2, 11 | ||
]); | ||
|
||
#[rustfmt::skip] | ||
let b = MatrixMN::<_, U3, U4>::from_row_slice(&[ | ||
0, 1, 2, 3, | ||
4, 5, 6, 7, | ||
8, 9, 10, 11 | ||
]); | ||
|
||
if let Err(err) = compare_matrices(a, b, &ExactElementwiseComparator) { | ||
println!("{}", err); | ||
} | ||
} | ||
|
||
fn compare_different_size() { | ||
println!("Comparing matrices of different size."); | ||
#[rustfmt::skip] | ||
let a = MatrixMN::<_, U3, U3>::from_row_slice(&[ | ||
0, 1, 2, | ||
4, 5, 6, | ||
8, 9, 10, | ||
]); | ||
|
||
#[rustfmt::skip] | ||
let b = MatrixMN::<_, U3, U4>::from_row_slice(&[ | ||
0, 1, 2, 3, | ||
4, 5, 6, 7, | ||
8, 9, 10, 11 | ||
]); | ||
|
||
if let Err(err) = compare_matrices(a, b, &ExactElementwiseComparator) { | ||
println!("{}", err); | ||
} | ||
} | ||
|
||
fn compare_f64_abs_tol_fail() { | ||
println!("Comparing two f64 matrices."); | ||
|
||
#[rustfmt::skip] | ||
let a = MatrixMN::<f64, U3, U3>::from_row_slice(&[ | ||
0.0, 1.0, 2.0 + 1e-10, | ||
4.0, 5.0, 6.0, | ||
8.0, 9.0, 10.0, | ||
]); | ||
|
||
#[rustfmt::skip] | ||
let b = MatrixMN::<_, U3, U3>::from_row_slice(&[ | ||
0.0, 1.0, 2.0, | ||
4.0, 5.0, 6.0, | ||
8.0, 9.0, 10.0 | ||
]); | ||
|
||
let cmp = AbsoluteElementwiseComparator { tol: 1e-12 }; | ||
if let Err(err) = compare_matrices(a, b, &cmp) { | ||
println!("{}", err); | ||
} | ||
} | ||
|
||
fn main() { | ||
// This example mostly serves the purpose of demonstrating the kind of error messages | ||
// that are given upon comparison failure. | ||
// The more typical use case is using `assert_matrix_eq!` in tests. | ||
compare_integers_fail(); | ||
println!("======================================================"); | ||
compare_f64_abs_tol_fail(); | ||
println!("======================================================"); | ||
compare_different_size(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
//! Tests for `matrixcompare` integration. | ||
//! | ||
//! The `matrixcompare` crate itself is responsible for testing the actual comparison. | ||
//! The tests here only check that the necessary trait implementations are correctly implemented, | ||
//! in addition to some sanity checks with example input. | ||
|
||
use nalgebra::{DMatrix, MatrixMN, U4, U5}; | ||
|
||
use matrixcompare::{assert_matrix_eq, DenseAccess}; | ||
|
||
#[cfg(feature = "arbitrary")] | ||
quickcheck! { | ||
fn fetch_single_is_equivalent_to_index_f64(matrix: DMatrix<f64>) -> bool { | ||
for i in 0 .. matrix.nrows() { | ||
for j in 0 .. matrix.ncols() { | ||
if matrix.fetch_single(i, j) != *matrix.index((i, j)) { | ||
return false; | ||
} | ||
} | ||
} | ||
|
||
true | ||
} | ||
|
||
fn matrixcompare_shape_agrees_with_matrix(matrix: DMatrix<f64>) -> bool { | ||
matrix.nrows() == <DMatrix<f64> as matrixcompare::Matrix<f64>>::rows(&matrix) | ||
&& | ||
matrix.ncols() == <DMatrix<f64> as matrixcompare::Matrix<f64>>::cols(&matrix) | ||
} | ||
} | ||
|
||
#[test] | ||
fn assert_matrix_eq_dense_positive_comparison() { | ||
#[rustfmt::skip] | ||
let a = MatrixMN::<_, U4, U5>::from_row_slice(&[ | ||
1210, 1320, 1430, 1540, 1650, | ||
2310, 2420, 2530, 2640, 2750, | ||
3410, 3520, 3630, 3740, 3850, | ||
4510, 4620, 4730, 4840, 4950, | ||
]); | ||
|
||
#[rustfmt::skip] | ||
let b = MatrixMN::<_, U4, U5>::from_row_slice(&[ | ||
1210, 1320, 1430, 1540, 1650, | ||
2310, 2420, 2530, 2640, 2750, | ||
3410, 3520, 3630, 3740, 3850, | ||
4510, 4620, 4730, 4840, 4950, | ||
]); | ||
|
||
// Test matrices of static size | ||
assert_matrix_eq!(a, b); | ||
assert_matrix_eq!(&a, b); | ||
assert_matrix_eq!(a, &b); | ||
assert_matrix_eq!(&a, &b); | ||
|
||
// Test matrices of dynamic size | ||
let a_dyn = a.index((0..4, 0..5)); | ||
let b_dyn = b.index((0..4, 0..5)); | ||
assert_matrix_eq!(a_dyn, b_dyn); | ||
assert_matrix_eq!(a_dyn, &b_dyn); | ||
assert_matrix_eq!(&a_dyn, b_dyn); | ||
assert_matrix_eq!(&a_dyn, &b_dyn); | ||
} | ||
|
||
#[test] | ||
#[should_panic] | ||
fn assert_matrix_eq_dense_negative_comparison() { | ||
#[rustfmt::skip] | ||
let a = MatrixMN::<_, U4, U5>::from_row_slice(&[ | ||
1210, 1320, 1430, 1540, 1650, | ||
2310, 2420, 2530, 2640, 2750, | ||
3410, 3520, 3630, 3740, 3850, | ||
4510, 4620, -4730, 4840, 4950, | ||
]); | ||
|
||
#[rustfmt::skip] | ||
let b = MatrixMN::<_, U4, U5>::from_row_slice(&[ | ||
1210, 1320, 1430, 1540, 1650, | ||
2310, 2420, 2530, 2640, 2750, | ||
3410, 3520, 3630, 3740, 3850, | ||
4510, 4620, 4730, 4840, 4950, | ||
]); | ||
|
||
assert_matrix_eq!(a, b); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters