cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ensure size

Browse Source
This commit is contained in:
chriseth 2022-08-18 17:44:16 +02:00
parent cfc155cfbd
commit 9f4630b993
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libsolutil/LinearExpression.cpp
View File

@ -103,6 +103,7 @@ void SparseMatrix::addMultipleOfRow(size_t _sourceRow, size_t _targetRow, ration
SparseMatrix::Entry& SparseMatrix::entry(size_t _row, size_t _column) SparseMatrix::Entry& SparseMatrix::entry(size_t _row, size_t _column)
{ {
ensureSize(_row, _column);
Entry* successor = entryOrSuccessorInRow(_row, _column); Entry* successor = entryOrSuccessorInRow(_row, _column);
if (successor && successor->col == _column) if (successor && successor->col == _column)
return *successor; return *successor;
@ -112,17 +113,7 @@ SparseMatrix::Entry& SparseMatrix::entry(size_t _row, size_t _column)
void SparseMatrix::insert(size_t _row, size_t _column, rational _value) void SparseMatrix::insert(size_t _row, size_t _column, rational _value)
{ {
if (_column >= m_col_start.size()) ensureSize(_row, _column);
{
m_col_start.resize(_column + 1);
m_col_end.resize(_column + 1);
}
if (_row >= m_row_start.size())
{
m_row_start.resize(_row + 1);
m_row_end.resize(_row + 1);
}
prependInRow(entryOrSuccessorInRow(_row, _column), _row, _column, move(_value)); prependInRow(entryOrSuccessorInRow(_row, _column), _row, _column, move(_value));
} }
@ -138,6 +129,20 @@ void SparseMatrix::appendRow(LinearExpression const& _entries)
} }
} }
void SparseMatrix::ensureSize(size_t _row, size_t _column)
{
if (_column >= m_col_start.size())
{
m_col_start.resize(_column + 1);
m_col_end.resize(_column + 1);
}
if (_row >= m_row_start.size())
{
m_row_start.resize(_row + 1);
m_row_end.resize(_row + 1);
}
}
SparseMatrix::Entry* SparseMatrix::entryOrSuccessorInRow(size_t _row, size_t _column) SparseMatrix::Entry* SparseMatrix::entryOrSuccessorInRow(size_t _row, size_t _column)
{ {
Entry* successor = nullptr; Entry* successor = nullptr;

1
libsolutil/LinearExpression.h
View File

@ -256,6 +256,7 @@ public:
void appendRow(LinearExpression const& _entries); void appendRow(LinearExpression const& _entries);
private: private:
void ensureSize(size_t _row, size_t _column);
/// @returns the entry at the row/column if it exists or its successor in the row. /// @returns the entry at the row/column if it exists or its successor in the row.
Entry* entryOrSuccessorInRow(size_t _row, size_t _column); Entry* entryOrSuccessorInRow(size_t _row, size_t _column);