Skip to content

Commit 0d58102

Browse files
committed
Update test for non-square b
1 parent da0d5d1 commit 0d58102

File tree

1 file changed

+16
-27
lines changed

1 file changed

+16
-27
lines changed

tests/triangular.rs

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ fn test2d<A, Sa, Sb, Tol>(uplo: UPLO, a: ArrayBase<Sa, Ix2>, b: ArrayBase<Sb, Ix
3434
println!("x = {:?}", &x);
3535
let b_ = a.dot(&x);
3636
println!("Ax = {:?}", &b_);
37-
println!("A^Tx = {:?}", a.t().dot(&x));
38-
println!("Ax^T = {:?}", a.dot(&x.t()));
39-
println!("(Ax^T)^T = {:?}", a.dot(&x.t()).t());
4037
assert_close_l2!(&b_, &ans, tol);
4138
}
4239

@@ -74,64 +71,56 @@ fn triangular_1d_upper_t() {
7471

7572
#[test]
7673
fn triangular_2d_upper() {
77-
let n = 3;
78-
let b: Array2<f64> = random_square(n);
79-
let a: Array2<f64> = random_square(n).into_triangular(UPLO::Upper);
74+
let b: Array2<f64> = random_matrix(3, 4);
75+
let a: Array2<f64> = random_square(3).into_triangular(UPLO::Upper);
8076
test2d(UPLO::Upper, a, b, 1e-7);
8177
}
8278

8379
#[test]
8480
fn triangular_2d_lower() {
85-
let n = 3;
86-
let b: Array2<f64> = random_square(n);
87-
let a: Array2<f64> = random_square(n).into_triangular(UPLO::Lower);
81+
let b: Array2<f64> = random_matrix(3, 4);
82+
let a: Array2<f64> = random_square(3).into_triangular(UPLO::Lower);
8883
test2d(UPLO::Lower, a, b, 1e-7);
8984
}
9085

9186
#[test]
9287
fn triangular_2d_lower_t() {
93-
let n = 3;
94-
let b: Array2<f64> = random_square(n);
95-
let a: Array2<f64> = random_square(n).into_triangular(UPLO::Lower).reversed_axes();
88+
let b: Array2<f64> = random_matrix(3, 4);
89+
let a: Array2<f64> = random_square(3).into_triangular(UPLO::Lower).reversed_axes();
9690
test2d(UPLO::Upper, a, b, 1e-7);
9791
}
9892

9993
#[test]
10094
fn triangular_2d_upper_t() {
101-
let n = 3;
102-
let b: Array2<f64> = random_square(n);
103-
let a: Array2<f64> = random_square(n).into_triangular(UPLO::Upper).reversed_axes();
95+
let b: Array2<f64> = random_matrix(3, 4);
96+
let a: Array2<f64> = random_square(3).into_triangular(UPLO::Upper).reversed_axes();
10497
test2d(UPLO::Lower, a, b, 1e-7);
10598
}
10699

107100
#[test]
108101
fn triangular_2d_upper_bt() {
109-
let n = 3;
110-
let b: Array2<f64> = random_square(n).reversed_axes();
111-
let a: Array2<f64> = random_square(n).into_triangular(UPLO::Upper);
102+
let b: Array2<f64> = random_matrix(4, 3).reversed_axes();
103+
let a: Array2<f64> = random_square(3).into_triangular(UPLO::Upper);
112104
test2d(UPLO::Upper, a, b, 1e-7);
113105
}
114106

115107
#[test]
116108
fn triangular_2d_lower_bt() {
117-
let n = 3;
118-
let b: Array2<f64> = random_square(n).reversed_axes();
119-
let a: Array2<f64> = random_square(n).into_triangular(UPLO::Lower);
109+
let b: Array2<f64> = random_matrix(4, 3).reversed_axes();
110+
let a: Array2<f64> = random_square(3).into_triangular(UPLO::Lower);
120111
test2d(UPLO::Lower, a, b, 1e-7);
121112
}
122113

123114
#[test]
124115
fn triangular_2d_lower_t_bt() {
125-
let n = 3;
126-
let b: Array2<f64> = random_square(n).reversed_axes();
127-
let a: Array2<f64> = random_square(n).into_triangular(UPLO::Lower).reversed_axes();
116+
let b: Array2<f64> = random_matrix(4, 3).reversed_axes();
117+
let a: Array2<f64> = random_square(3).into_triangular(UPLO::Lower).reversed_axes();
128118
test2d(UPLO::Upper, a, b, 1e-7);
129119
}
130120

131121
#[test]
132122
fn triangular_2d_upper_t_bt() {
133-
let n = 3;
134-
let b: Array2<f64> = random_square(n).reversed_axes();
135-
let a: Array2<f64> = random_square(n).into_triangular(UPLO::Upper).reversed_axes();
123+
let b: Array2<f64> = random_matrix(4, 3).reversed_axes();
124+
let a: Array2<f64> = random_square(3).into_triangular(UPLO::Upper).reversed_axes();
136125
test2d(UPLO::Lower, a, b, 1e-7);
137126
}

0 commit comments

Comments
 (0)