Skip to content

Simplify tridiagonal solver constructor #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
julianlitz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Simplify tridiagonal solver constructor #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 3 additions & 63 deletions include/LinearAlgebra/diagonalSolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,8 @@ class DiagonalSolver
{
public:
DiagonalSolver();
DiagonalSolver(const DiagonalSolver& other);
DiagonalSolver(DiagonalSolver&& other) noexcept;

explicit DiagonalSolver(const int matrix_dimension);

DiagonalSolver& operator=(const DiagonalSolver& other);
DiagonalSolver& operator=(DiagonalSolver&& other) noexcept;

int rows() const;
int columns() const;

Expand Down Expand Up @@ -62,99 +56,45 @@ std::ostream& operator<<(std::ostream& stream, const DiagonalSolver<U>& solver)
return stream;
}

// default construction
template <typename T>
DiagonalSolver<T>::DiagonalSolver()
: matrix_dimension_(0)
{
}

// copy construction
template <typename T>
DiagonalSolver<T>::DiagonalSolver(const DiagonalSolver& other)
: matrix_dimension_(other.matrix_dimension_)
, diagonal_values_("Diagonal matrix values", matrix_dimension_)
{
Kokkos::deep_copy(diagonal_values_, other.diagonal_values_);
}

// copy assignment
template <typename T>
DiagonalSolver<T>& DiagonalSolver<T>::operator=(const DiagonalSolver& other)
{
if (this == &other) {
// Self-assignment, no work needed
return *this;
}
// Only allocate new memory if the sizes are different
if (matrix_dimension_ != other.matrix_dimension_) {
matrix_dimension_ = other.matrix_dimension_;
diagonal_values_ = Vector<T>("Diagonal matrix values", matrix_dimension_);
}
Kokkos::deep_copy(diagonal_values_, other.diagonal_values_);
return *this;
}

// move construction
template <typename T>
DiagonalSolver<T>::DiagonalSolver(DiagonalSolver&& other) noexcept
: matrix_dimension_(other.matrix_dimension_)
, diagonal_values_(std::move(other.diagonal_values_))
{
other.matrix_dimension_ = 0;
}

// move assignment
template <typename T>
DiagonalSolver<T>& DiagonalSolver<T>::operator=(DiagonalSolver&& other) noexcept
{
matrix_dimension_ = other.matrix_dimension_;
diagonal_values_ = std::move(other.diagonal_values_);
other.matrix_dimension_ = 0;
return *this;
}

template <typename T>
DiagonalSolver<T>::DiagonalSolver(const int matrix_dimension)
: matrix_dimension_(matrix_dimension)
, diagonal_values_("Diagonal matrix values", matrix_dimension_)
{
assert(matrix_dimension_ >= 1);
assert(matrix_dimension_ >= 0);
Kokkos::deep_copy(diagonal_values_, T(0));
}

template <typename T>
int DiagonalSolver<T>::rows() const
{
assert(matrix_dimension_ >= 0);
return matrix_dimension_;
}
template <typename T>
int DiagonalSolver<T>::columns() const
{
assert(matrix_dimension_ >= 0);
return matrix_dimension_;
}

template <typename T>
const T& DiagonalSolver<T>::diagonal(const int index) const
{
assert(index >= 0);
assert(index < matrix_dimension_);
assert(0 <= index && index < matrix_dimension_);
return diagonal_values_(index);
}
template <typename T>
T& DiagonalSolver<T>::diagonal(const int index)
{
assert(index >= 0);
assert(index < matrix_dimension_);
assert(0 <= index && index < matrix_dimension_);
return diagonal_values_(index);
}

// --------------- //
// Diagonal Solver //
// --------------- //

template <typename T>
void DiagonalSolver<T>::solveInPlace(T* sol_rhs) const
{
Expand Down
Loading