Skip to content

Commit e10c29d

Browse files
wo80wo80
committed
Minor code formatting of tests.
1 parent 4646d62 commit e10c29d

8 files changed

Lines changed: 136 additions & 162 deletions

‎CSparse.Tests/Complex/ComplexNumberComparer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace CSparse.Tests.Complex
1111

1212
public class ComplexNumberComparer : IComparer, IComparer<Complex>
1313
{
14-
public static ComplexNumberComparer Default = new ComplexNumberComparer();
14+
public static ComplexNumberComparer Default = new();
1515

1616
// Floating point tolerance
1717
const double TOL = 1e-8;

‎CSparse.Tests/Complex/MatrixHelper.cs‎

Lines changed: 33 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,18 @@ namespace CSparse.Tests.Complex
44
using CSparse.Storage;
55
using System.Collections.Generic;
66
using System.IO;
7-
using System.Linq;
87
using System.Numerics;
98

109
class MatrixHelper
1110
{
12-
private static Dictionary<string, DenseTestData<Complex>> dense = new Dictionary<string, DenseTestData<Complex>>();
13-
14-
private static Dictionary<string, SparseTestData<Complex>> sparse = new Dictionary<string, SparseTestData<Complex>>();
11+
private static readonly Dictionary<string, DenseTestData<Complex>> dense = [];
12+
private static readonly Dictionary<string, SparseTestData<Complex>> sparse = [];
1513

1614
public static SparseTestData<Complex> LoadSparse(int rows, int columns)
1715
{
1816
string resource = string.Format("test-data-dense-{0}x{1}.txt", rows, columns);
1917

20-
SparseTestData<Complex> data;
21-
22-
if (!sparse.TryGetValue(resource, out data))
18+
if (!sparse.TryGetValue(resource, out SparseTestData<Complex> data))
2319
{
2420
var dense = LoadDense(rows, columns);
2521

@@ -35,9 +31,7 @@ public static DenseTestData<Complex> LoadDense(int rows, int columns)
3531
{
3632
string resource = string.Format("test-data-dense-{0}x{1}.txt", rows, columns);
3733

38-
DenseTestData<Complex> data;
39-
40-
if (!dense.TryGetValue(resource, out data))
34+
if (!dense.TryGetValue(resource, out DenseTestData<Complex> data))
4135
{
4236
var stream = ResourceLoader.GetStream(resource, "Double");
4337

@@ -53,22 +47,21 @@ private static DenseTestData<Complex> ReadDenseTestData(Stream stream)
5347
{
5448
var data = Tests.Double.DenseTestDataReader.Read(stream);
5549

56-
var result = new DenseTestData<Complex>();
57-
58-
result.A = ToComplex(data.A);
59-
result.B = ToComplex(data.B);
60-
result.x = ToComplex(data.x);
61-
result.y = ToComplex(data.y);
62-
result.AT = ToComplex(data.AT);
63-
result.BT = ToComplex(data.BT);
64-
result.ApB = ToComplex(data.ApB);
65-
result.AmBT = ToComplex(data.AmBT);
66-
result.ATmB = ToComplex(data.ATmB);
67-
result.Ax = ToComplex(data.Ax);
68-
result.ATy = ToComplex(data.ATy);
69-
result.xTBT = ToComplex(data.xTBT);
70-
71-
return result;
50+
return new DenseTestData<Complex>
51+
{
52+
A = ToComplex(data.A),
53+
B = ToComplex(data.B),
54+
x = ToComplex(data.x),
55+
y = ToComplex(data.y),
56+
AT = ToComplex(data.AT),
57+
BT = ToComplex(data.BT),
58+
ApB = ToComplex(data.ApB),
59+
AmBT = ToComplex(data.AmBT),
60+
ATmB = ToComplex(data.ATmB),
61+
Ax = ToComplex(data.Ax),
62+
ATy = ToComplex(data.ATy),
63+
xTBT = ToComplex(data.xTBT)
64+
};
7265
}
7366

7467
private static Complex[] ToComplex(double[] vec)
@@ -101,26 +94,23 @@ private static DenseColumnMajorStorage<Complex> ToComplex(DenseColumnMajorStorag
10194

10295
private static SparseTestData<Complex> DenseToSparse(DenseTestData<Complex> dense)
10396
{
104-
var data = new SparseTestData<Complex>()
97+
return new SparseTestData<Complex>
10598
{
10699
RowCount = dense.RowCount,
107-
ColumnCount = dense.ColumnCount
100+
ColumnCount = dense.ColumnCount,
101+
A = DenseToSparse(dense.A),
102+
B = DenseToSparse(dense.B),
103+
x = dense.x,
104+
y = dense.y,
105+
AT = DenseToSparse(dense.AT),
106+
BT = DenseToSparse(dense.BT),
107+
ApB = DenseToSparse(dense.ApB),
108+
AmBT = DenseToSparse(dense.AmBT),
109+
ATmB = DenseToSparse(dense.ATmB),
110+
Ax = dense.Ax,
111+
ATy = dense.ATy,
112+
xTBT = dense.xTBT
108113
};
109-
110-
data.A = DenseToSparse(dense.A);
111-
data.B = DenseToSparse(dense.B);
112-
data.x = dense.x;
113-
data.y = dense.y;
114-
data.AT = DenseToSparse(dense.AT);
115-
data.BT = DenseToSparse(dense.BT);
116-
data.ApB = DenseToSparse(dense.ApB);
117-
data.AmBT = DenseToSparse(dense.AmBT);
118-
data.ATmB = DenseToSparse(dense.ATmB);
119-
data.Ax = dense.Ax;
120-
data.ATy = dense.ATy;
121-
data.xTBT = dense.xTBT;
122-
123-
return data;
124114
}
125115

126116
private static CompressedColumnStorage<Complex> DenseToSparse(DenseColumnMajorStorage<Complex> dense)

‎CSparse.Tests/Double/DenseTestDataReader.cs‎

Lines changed: 61 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -9,80 +9,77 @@ class DenseTestDataReader
99
{
1010
public static DenseTestData<double> Read(Stream stream)
1111
{
12-
using (var reader = new StreamReader(stream))
12+
using var reader = new StreamReader(stream);
13+
14+
string line = reader.ReadLine();
15+
16+
GetItem(line, out string name, out string value);
17+
18+
if (name != "size")
1319
{
14-
string line, name, value;
20+
throw new FormatException("Expected first line = size.");
21+
}
1522

16-
line = reader.ReadLine();
23+
var data = ReadSize(value);
1724

25+
int m = data.RowCount;
26+
int n = data.ColumnCount;
27+
28+
while ((line = reader.ReadLine()) != null)
29+
{
1830
GetItem(line, out name, out value);
1931

20-
if (name != "size")
32+
if (name == "A")
2133
{
22-
throw new FormatException("Expected first line = size.");
34+
data.A = ReadMatrix(value, m, n);
2335
}
24-
25-
var data = ReadSize(value);
26-
27-
int m = data.RowCount;
28-
int n = data.ColumnCount;
29-
30-
while ((line = reader.ReadLine()) != null)
36+
else if (name == "B")
3137
{
32-
GetItem(line, out name, out value);
33-
34-
if (name == "A")
35-
{
36-
data.A = ReadMatrix(value, m, n);
37-
}
38-
else if (name == "B")
39-
{
40-
data.B = ReadMatrix(value, m, n);
41-
}
42-
else if (name == "x")
43-
{
44-
data.x = ReadVector(value, n);
45-
}
46-
else if (name == "y")
47-
{
48-
data.y = ReadVector(value, m);
49-
}
50-
else if (name == "A'")
51-
{
52-
data.AT = ReadMatrix(value, n, m);
53-
}
54-
else if (name == "B'")
55-
{
56-
data.BT = ReadMatrix(value, n, m);
57-
}
58-
else if (name == "A+B")
59-
{
60-
data.ApB = ReadMatrix(value, m, n);
61-
}
62-
else if (name == "A*B'")
63-
{
64-
data.AmBT = ReadMatrix(value, m, m);
65-
}
66-
else if (name == "A'*B")
67-
{
68-
data.ATmB = ReadMatrix(value, n, n);
69-
}
70-
else if (name == "A*x")
71-
{
72-
data.Ax = ReadVector(value, m);
73-
}
74-
else if (name == "A'*y")
75-
{
76-
data.ATy = ReadVector(value, n);
77-
}
78-
else if (name == "x'*B'")
79-
{
80-
data.xTBT = ReadVector(value, m);
81-
}
38+
data.B = ReadMatrix(value, m, n);
39+
}
40+
else if (name == "x")
41+
{
42+
data.x = ReadVector(value, n);
43+
}
44+
else if (name == "y")
45+
{
46+
data.y = ReadVector(value, m);
47+
}
48+
else if (name == "A'")
49+
{
50+
data.AT = ReadMatrix(value, n, m);
51+
}
52+
else if (name == "B'")
53+
{
54+
data.BT = ReadMatrix(value, n, m);
55+
}
56+
else if (name == "A+B")
57+
{
58+
data.ApB = ReadMatrix(value, m, n);
59+
}
60+
else if (name == "A*B'")
61+
{
62+
data.AmBT = ReadMatrix(value, m, m);
63+
}
64+
else if (name == "A'*B")
65+
{
66+
data.ATmB = ReadMatrix(value, n, n);
67+
}
68+
else if (name == "A*x")
69+
{
70+
data.Ax = ReadVector(value, m);
71+
}
72+
else if (name == "A'*y")
73+
{
74+
data.ATy = ReadVector(value, n);
75+
}
76+
else if (name == "x'*B'")
77+
{
78+
data.xTBT = ReadVector(value, m);
8279
}
83-
84-
return data;
8580
}
81+
82+
return data;
8683
}
8784

8885
private static void GetItem(string line, out string name, out string value)

‎CSparse.Tests/Double/MatrixHelper.cs‎

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@ namespace CSparse.Tests.Double
55

66
class MatrixHelper
77
{
8-
private static Dictionary<string, DenseTestData<double>> dense = new Dictionary<string, DenseTestData<double>>();
9-
10-
private static Dictionary<string, SparseTestData<double>> sparse = new Dictionary<string, SparseTestData<double>>();
8+
private static readonly Dictionary<string, DenseTestData<double>> dense = [];
9+
private static readonly Dictionary<string, SparseTestData<double>> sparse = [];
1110

1211
public static SparseTestData<double> LoadSparse(int rows, int columns)
1312
{
1413
string resource = string.Format("test-data-dense-{0}x{1}.txt", rows, columns);
1514

16-
SparseTestData<double> data;
17-
18-
if (!sparse.TryGetValue(resource, out data))
15+
if (!sparse.TryGetValue(resource, out SparseTestData<double> data))
1916
{
2017
var dense = LoadDense(rows, columns);
2118

@@ -31,9 +28,7 @@ public static DenseTestData<double> LoadDense(int rows, int columns)
3128
{
3229
string resource = string.Format("test-data-dense-{0}x{1}.txt", rows, columns);
3330

34-
DenseTestData<double> data;
35-
36-
if (!dense.TryGetValue(resource, out data))
31+
if (!dense.TryGetValue(resource, out DenseTestData<double> data))
3732
{
3833
var stream = ResourceLoader.GetStream(resource, "Double");
3934

@@ -47,26 +42,23 @@ public static DenseTestData<double> LoadDense(int rows, int columns)
4742

4843
private static SparseTestData<double> DenseToSparse(DenseTestData<double> dense)
4944
{
50-
var data = new SparseTestData<double>()
45+
return new SparseTestData<double>
5146
{
5247
RowCount = dense.RowCount,
53-
ColumnCount = dense.ColumnCount
48+
ColumnCount = dense.ColumnCount,
49+
A = DenseToSparse(dense.A),
50+
B = DenseToSparse(dense.B),
51+
x = dense.x,
52+
y = dense.y,
53+
AT = DenseToSparse(dense.AT),
54+
BT = DenseToSparse(dense.BT),
55+
ApB = DenseToSparse(dense.ApB),
56+
AmBT = DenseToSparse(dense.AmBT),
57+
ATmB = DenseToSparse(dense.ATmB),
58+
Ax = dense.Ax,
59+
ATy = dense.ATy,
60+
xTBT = dense.xTBT
5461
};
55-
56-
data.A = DenseToSparse(dense.A);
57-
data.B = DenseToSparse(dense.B);
58-
data.x = dense.x;
59-
data.y = dense.y;
60-
data.AT = DenseToSparse(dense.AT);
61-
data.BT = DenseToSparse(dense.BT);
62-
data.ApB = DenseToSparse(dense.ApB);
63-
data.AmBT = DenseToSparse(dense.AmBT);
64-
data.ATmB = DenseToSparse(dense.ATmB);
65-
data.Ax = dense.Ax;
66-
data.ATy = dense.ATy;
67-
data.xTBT = dense.xTBT;
68-
69-
return data;
7062
}
7163

7264
private static CompressedColumnStorage<double> DenseToSparse(DenseColumnMajorStorage<double> dense)

‎CSparse.Tests/IO/TestMatrixMarketReader.cs‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,31 @@ public class TestMatrixMarketReader
1010
[Test]
1111
public void TestSymmetric()
1212
{
13-
var stream = ResourceLoader.GetStream("LFAT5.mtx", "Double");
13+
using var stream = ResourceLoader.GetStream("LFAT5.mtx", "Double");
14+
using var reader = new StreamReader(stream);
1415

15-
using (var reader = new StreamReader(stream))
16-
{
17-
var A = MatrixMarketReader.ReadStorage<double>(reader);
16+
var A = MatrixMarketReader.ReadStorage<double>(reader);
1817

19-
Assert.That(14, Is.EqualTo(A.RowCount));
20-
Assert.That(14, Is.EqualTo(A.ColumnCount));
18+
Assert.That(14, Is.EqualTo(A.RowCount));
19+
Assert.That(14, Is.EqualTo(A.ColumnCount));
2120

22-
// Symmetric mtx file has 30 entries -> auto expand = 2 * 30 - 14 = 46.
23-
Assert.That(46, Is.EqualTo(A.NonZerosCount));
24-
}
21+
// Symmetric mtx file has 30 entries -> auto expand = 2 * 30 - 14 = 46.
22+
Assert.That(46, Is.EqualTo(A.NonZerosCount));
2523
}
2624

2725
[Test]
2826
public void TestPatternSymmetric()
2927
{
30-
var stream = ResourceLoader.GetStream("bcspwr01.mtx", "Double");
28+
using var stream = ResourceLoader.GetStream("bcspwr01.mtx", "Double");
29+
using var reader = new StreamReader(stream);
3130

32-
using (var reader = new StreamReader(stream))
33-
{
34-
var A = MatrixMarketReader.ReadStorage<double>(reader, false);
31+
var A = MatrixMarketReader.ReadStorage<double>(reader, false);
3532

36-
Assert.That(39, Is.EqualTo(A.RowCount));
37-
Assert.That(39, Is.EqualTo(A.ColumnCount));
33+
Assert.That(39, Is.EqualTo(A.RowCount));
34+
Assert.That(39, Is.EqualTo(A.ColumnCount));
3835

39-
// Symmetric mtx file has 85 entries, no auto expand.
40-
Assert.That(85, Is.EqualTo(A.NonZerosCount));
41-
}
36+
// Symmetric mtx file has 85 entries, no auto expand.
37+
Assert.That(85, Is.EqualTo(A.NonZerosCount));
4238
}
4339
}
4440
}

0 commit comments

Comments
 (0)