- Use a sparse matrix with floating-point numbers to replace the orig…

…inal

matrix which consists of integers
- Create a mtx file for storing a vector
- Remove commented lines of code and reorganize the unit test

unitTests/MatrixWrapper/CMakeLists.txt

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # Copy the data files to the execution directory
-configure_file(data/A.mtx data/A.mtx COPYONLY)
+configure_file(data/A_sparse.mtx data/A_sparse.mtx COPYONLY)
 configure_file(data/b.mtx data/b.mtx COPYONLY)
 
 ogl_unit_test(matrixConversion "HostMatrix.C")

unitTests/MatrixWrapper/Combination.C

@@ -57,46 +57,46 @@ TEST(Combination, CanCreateCombinationWithLinOpVector)
     ASSERT_EQ(x->at(4, 0), 0.0);
 }
 
-TEST(Combination, CombinationMatrixWithSparseMatrix)
+TEST(Combination, CanCreateCombinationMatrixWithSparseRealMatrix)
 {
-    auto dim = gko::dim<2>{5, 5};
-    // gko::matrix_data<double, int> m1
-    // (dim, {{0, 0, 2}, {1, 1, 0}, {2, 3, 5}});
-
-    auto exec = gko::share(gko::ReferenceExecutor::create());
-    // auto m1linop =
-    //     gko::share(gko::matrix::Csr<scalar, label>::create(exec, dim));
-    // m1linop->read(m1);
-    using ValueType = double;
-    using IndexType = int;
+    // Arrange
+    using ValueType = scalar;
+    using IndexType = label;
     using mtx = gko::matrix::Csr<ValueType, IndexType>;
     using vec = gko::matrix::Dense<ValueType>;
+
+    int dim_size = 5;
+    auto dim = gko::dim<2>{dim_size, dim_size};
+
+    auto exec = gko::share(gko::ReferenceExecutor::create());
 
     auto m1linop = gko::share(
-        gko::read<mtx>(std::ifstream("data/A.mtx"), exec));
+        gko::read<mtx>(std::ifstream("data/A_sparse.mtx"), exec));
 
     auto b = gko::read<vec>(std::ifstream("data/b.mtx"), exec);
 
     std::vector<std::shared_ptr<const gko::LinOp>> linops{m1linop, m1linop};
 
+    // Act
     auto cmb = CombinationMatrix<gko::matrix::Csr<scalar, label>>::create(
         exec, dim, linops);
 
-    ASSERT_EQ(cmb->get_size(), gko::dim<2>(5, 5));
+    // Assert
+    ASSERT_EQ(cmb->get_size(), gko::dim<2>(dim_size, dim_size));
     ASSERT_EQ(cmb->get_coefficients().size(), 2);
     ASSERT_EQ(cmb->get_operators().size(), 2);
 
-    // auto b = gko::matrix::Dense<scalar>::create(exec, gko::dim<2>{5, 1});
-    // b->fill(1.0);
-    auto x = gko::matrix::Dense<scalar>::create(exec, gko::dim<2>{5, 1});
+    // Act
+    auto x = gko::matrix::Dense<scalar>::create(exec, gko::dim<2>{dim_size, 1});
     x->fill(0.0);
     cmb->apply(b, x);
 
-    ASSERT_EQ(x->at(0, 0), 4.0);
+    // Assert
+    ASSERT_EQ(x->at(0, 0), 38.0);
     ASSERT_EQ(x->at(1, 0), 0.0);
-    ASSERT_EQ(x->at(2, 0), 10.0);
-    ASSERT_EQ(x->at(3, 0), 0.0);
-    ASSERT_EQ(x->at(4, 0), 0.0);
+    ASSERT_EQ(x->at(2, 0), 2.0);
+    ASSERT_EQ(x->at(3, 0), -1414.4);
+    ASSERT_EQ(x->at(4, 0), 96.0);
 }
 
 TEST(Combination, CanConvertToCsr)

unitTests/MatrixWrapper/data/A_sparse.mtx

@@ -0,0 +1,10 @@
+%%MatrixMarket matrix coordinate real general
+5 5 8
+1 1 1
+1 4 6
+2 2 10.5
+3 3 0.5
+4 2 250.5
+4 4 -280
+4 5 33.2
+5 5 12

unitTests/MatrixWrapper/data/b.mtx

@@ -1,7 +1,7 @@
 %%MatrixMarket matrix array real general
 5 1
 1
-1
-1
-1
-1
+0
+2
+3
+4