Skip to content
Snippets Groups Projects
Commit 4be628ec authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Fix CRSMatrix::operator-()

parent dad3173e
No related branches found
No related tags found
1 merge request!107Change CRSMatrixDescriptor constructors
...@@ -123,12 +123,12 @@ class CRSMatrix ...@@ -123,12 +123,12 @@ class CRSMatrix
++i_row_B; ++i_row_B;
} else if (A_column_idx < B_column_idx) { } else if (A_column_idx < B_column_idx) {
column_indices[i_value] = A_column_idx; column_indices[i_value] = A_column_idx;
values[i_value] = A.m_values[i_row_A]; values[i_value] = BinOp()(A.m_values[i_row_A], 0);
++i_row_A; ++i_row_A;
} else { } else {
Assert(B_column_idx < A_column_idx); Assert(B_column_idx < A_column_idx);
column_indices[i_value] = B_column_idx; column_indices[i_value] = B_column_idx;
values[i_value] = B.m_values[i_row_B]; values[i_value] = BinOp()(0, B.m_values[i_row_B]);
++i_row_B; ++i_row_B;
} }
++i_value; ++i_value;
......
...@@ -240,8 +240,8 @@ TEST_CASE("CRSMatrix", "[algebra]") ...@@ -240,8 +240,8 @@ TEST_CASE("CRSMatrix", "[algebra]")
std::ostringstream ost; std::ostringstream ost;
ost << A - B; ost << A - B;
std::string ref = R"(0| 0:2 1:2 2:3 std::string ref = R"(0| 0:2 1:2 2:-3
1| 0:-2 1:6 2:3 1| 0:-2 1:6 2:-3
2| 0:2 2:-11 3:12 2| 0:2 2:-11 3:12
3| 0:10 3:8 3| 0:10 3:8
)"; )";
...@@ -327,10 +327,10 @@ TEST_CASE("CRSMatrix", "[algebra]") ...@@ -327,10 +327,10 @@ TEST_CASE("CRSMatrix", "[algebra]")
std::ostringstream ost; std::ostringstream ost;
ost << A - B; ost << A - B;
std::string ref = R"(0| 0:2 1:2 2:3 std::string ref = R"(0| 0:2 1:2 2:-3
1| 0:-2 1:6 2:3 1| 0:-2 1:6 2:-3
2| 0:2 2:1 2| 0:2 2:1
3| 0:10 1:8 2:16 3| 0:10 1:-8 2:16
)"; )";
REQUIRE(ost.str() == ref); REQUIRE(ost.str() == ref);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment