Skip to content

Commit a27e98b

Browse files
committed
Fix matrix tests
1 parent ce90856 commit a27e98b

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

ext/crates/fp/src/matrix/basis.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,17 @@ mod tests {
119119
let mut result = FpVector::new(p, 4);
120120
let mut input = FpVector::new(p, 4);
121121
input.pack(&[1,1,1,1]);
122-
basis.apply(&mut result, &input);
122+
basis.apply(&mut result, 1, &input);
123123
println!("result : {}", result);
124124
result.set_to_zero();
125-
basis.apply_inverse(&mut result, &input);
125+
basis.apply_inverse(&mut result, 1, &input);
126126
println!("inverse_result : {}", result);
127127
result.set_to_zero();
128128
println!("basis : {}", basis.matrix);
129129
println!("inverse : {}", *basis.inverse);
130130
input.pack(&[1,1,0,1]);
131131
println!(" inverse columns 111 : {}", basis.inverse.columns());
132-
basis.apply_inverse(&mut result, &input);
132+
basis.apply_inverse(&mut result, 1, &input);
133133
println!("inverse_result : {}", result);
134134
result.set_to_zero();
135135
// basis.replace_entry(2, &input);

ext/crates/fp/src/matrix/matrix_inner.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,8 +1160,6 @@ impl Matrix {
11601160
#[cfg(test)]
11611161
mod tests {
11621162
use super::*;
1163-
use rand::Rng;
1164-
use rstest::rstest;
11651163

11661164
#[test]
11671165
fn test_augmented_matrix() {
@@ -1221,12 +1219,4 @@ mod tests {
12211219
assert_eq!(m.pivots(), &goal_pivots)
12221220
}
12231221
}
1224-
1225-
fn random_vector(p : u32, v : &mut Vec<u32>){
1226-
let mut rng = rand::thread_rng();
1227-
for i in 0 .. v.len() {
1228-
v[i] = rng.gen::<u32>() % p;
1229-
}
1230-
}
1231-
12321222
}

ext/crates/fp/src/vector.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2990,7 +2990,7 @@ mod tests {
29902990
));
29912991
}
29922992
}
2993-
assert!(diffs == [], diffs_str);
2993+
assert!(diffs == [], "{}", diffs_str);
29942994
}
29952995
}
29962996

@@ -3012,7 +3012,7 @@ mod tests {
30123012
v.set_entry(1, 1);
30133013
v.set_entry(2, 1);
30143014
v.set_slice(0, 1);
3015-
for (i, v) in v.iter_nonzero() {
3015+
for (i, _) in v.iter_nonzero() {
30163016
assert!(i == 0);
30173017
}
30183018
}
@@ -3069,7 +3069,7 @@ mod tests {
30693069
// for i in 0 .. std::cmp::min(result.len(), comparison_result.len()) {
30703070
// println!("res : {:?}, comp : {:?}", result[i], comparison_result[i]);
30713071
// }
3072-
assert!(diffs_str == "", diffs_str);
3072+
assert!(diffs_str == "", "{}", diffs_str);
30733073
}
30743074
}
30753075

@@ -3164,7 +3164,7 @@ mod tests {
31643164
" Inputs: {:x?}\n expected {:?}, got {:?}. popcnts: {:?}", tuple, res, test_res, popcnts
31653165
))
31663166
);
3167-
assert!(false, format!("\nFailed test cases:\n {}", formatter));
3167+
assert!(false, "\nFailed test cases:\n {}", formatter);
31683168
}
31693169
}
31703170
}

0 commit comments

Comments
 (0)