Skip to content

Commit

Permalink
Auto-format code changes (#712)
Browse files Browse the repository at this point in the history
Auto-format code using Clang-Format

Co-authored-by: GitHub Actions <[email protected]>
  • Loading branch information
github-actions[bot] and actions-user authored Jan 24, 2025
1 parent 45e9f7b commit e791ee1
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
10 changes: 5 additions & 5 deletions include/micm/util/matrix.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,11 @@ namespace micm
{
for (std::size_t i = 0; i < matrix.x_dim_; ++i)
{
for (std::size_t j = 0; j < matrix.y_dim_-1; ++j)
{
os << matrix[i][j] << ',';
}
os << matrix[i][matrix.y_dim_-1] << std::endl;
for (std::size_t j = 0; j < matrix.y_dim_ - 1; ++j)
{
os << matrix[i][j] << ',';
}
os << matrix[i][matrix.y_dim_ - 1] << std::endl;
}
return os;
}
Expand Down
12 changes: 5 additions & 7 deletions include/micm/util/sparse_matrix.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
#include <algorithm>
#include <cassert>
#include <iterator>
#include <ostream>
#include <set>
#include <stdexcept>
#include <utility>
#include <vector>
#include <ostream>

namespace micm
{
Expand Down Expand Up @@ -265,29 +265,28 @@ namespace micm
return *this;
}

friend std::ostream &operator<<(std::ostream &os, const SparseMatrix &matrix)
friend std::ostream& operator<<(std::ostream& os, const SparseMatrix& matrix)
{
for (std::size_t i = 0; i < matrix.number_of_blocks_; ++i)
{
os << "Block " << i << std::endl;
for (std::size_t j = 0; j < matrix.block_size_; ++j)
{
for (std::size_t k = 0; k < matrix.block_size_-1; ++k)
for (std::size_t k = 0; k < matrix.block_size_ - 1; ++k)
{
if (matrix.IsZero(j, k))
os << "0,";
else
os << matrix[i][j][k] << ',';
}
if (matrix.IsZero(j, matrix.block_size_-1))
if (matrix.IsZero(j, matrix.block_size_ - 1))
os << "0" << std::endl;
else
os << matrix[i][j][matrix.block_size_-1] << std::endl;
os << matrix[i][j][matrix.block_size_ - 1] << std::endl;
}
}
return os;
}

};

template<class T, class OrderingPolicy = SparseMatrixStandardOrdering>
Expand Down Expand Up @@ -336,7 +335,6 @@ namespace micm
{
return non_zero_elements_.size() * number_of_blocks_;
}

};

} // namespace micm
4 changes: 2 additions & 2 deletions include/micm/util/vector_matrix.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -365,11 +365,11 @@ namespace micm
{
for (std::size_t i = 0; i < matrix.x_dim_; ++i)
{
for (std::size_t j = 0; j < matrix.y_dim_-1; ++j)
for (std::size_t j = 0; j < matrix.y_dim_ - 1; ++j)
{
os << matrix[i][j] << ',';
}
os << matrix[i][matrix.y_dim_-1] << std::endl;
os << matrix[i][matrix.y_dim_ - 1] << std::endl;
}
return os;
}
Expand Down
2 changes: 1 addition & 1 deletion test/unit/util/test_matrix_policy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ MatrixPolicy<double> testPrint()
ss << matrix;
endline << std::endl;

EXPECT_EQ(ss.str(), "0,0,0"+endline.str()+"0,3,0"+endline.str());
EXPECT_EQ(ss.str(), "0,0,0" + endline.str() + "0,3,0" + endline.str());

return matrix;
}
9 changes: 5 additions & 4 deletions test/unit/util/test_sparse_matrix_policy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -495,11 +495,12 @@ MatrixPolicy<int, OrderingPolicy> testPrint()
ss << matrix;
endline << std::endl;

std::string expected_output = "Block 0"+endline.str()+"0,24,0,0"+endline.str()+"0,8,0,0"+endline.str()+"0,24,0,24"+endline.str()+"0,0,24,0"+endline.str()
+ "Block 1"+endline.str()+"0,24,0,0"+endline.str()+"0,10,0,0"+endline.str()+"0,24,0,24"+endline.str()+"0,0,24,0"+endline.str()
+ "Block 2"+endline.str()+"0,24,0,0"+endline.str()+"0,12,0,0"+endline.str()+"0,24,0,24"+endline.str()+"0,0,24,0"+endline.str();
std::string expected_output = "Block 0" + endline.str() + "0,24,0,0" + endline.str() + "0,8,0,0" + endline.str() +
"0,24,0,24" + endline.str() + "0,0,24,0" + endline.str() + "Block 1" + endline.str() +
"0,24,0,0" + endline.str() + "0,10,0,0" + endline.str() + "0,24,0,24" + endline.str() +
"0,0,24,0" + endline.str() + "Block 2" + endline.str() + "0,24,0,0" + endline.str() +
"0,12,0,0" + endline.str() + "0,24,0,24" + endline.str() + "0,0,24,0" + endline.str();
EXPECT_EQ(ss.str(), expected_output);

return matrix;
}

0 comments on commit e791ee1

Please sign in to comment.