Skip to content
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.

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

Rename MultiArray2SmallSpan to JaggedSmallSpan #1993

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ _executeTestMultiArray()
for (Int32 i = 0; i < dim1_size; ++i)
sizes[i] = i + 1;
values.resize(sizes);
MultiArray2SmallSpan<Int32> inout_values = values.span();
JaggedSmallSpan<Int32> inout_values = values.span();
for (Int32 i = 0; i < dim1_size; ++i) {
const Int32 dim2_size = inout_values[i].size();
Int32 total = 0;
Expand Down
6 changes: 3 additions & 3 deletions arcane/src/arcane/utils/MultiArray2.h
Original file line number Diff line number Diff line change
Expand Up @@ -183,19 +183,19 @@
}

//! Vue modifiable du tableau
MultiArray2SmallSpan<DataType> span()
JaggedSmallSpan<DataType> span()
{
return { m_buffer.smallSpan(), m_indexes, m_sizes };
}

//! Vue constante du tableau
MultiArray2SmallSpan<const DataType> span() const
JaggedSmallSpan<const DataType> span() const

Check warning on line 192 in arcane/src/arcane/utils/MultiArray2.h

View check run for this annotation

Codecov / codecov/patch

arcane/src/arcane/utils/MultiArray2.h#L192

Added line #L192 was not covered by tests
{
return { m_buffer, m_indexes, m_sizes };
}

//! Vue constante du tableau
MultiArray2SmallSpan<const DataType> constSpan() const
JaggedSmallSpan<const DataType> constSpan() const

Check warning on line 198 in arcane/src/arcane/utils/MultiArray2.h

View check run for this annotation

Codecov / codecov/patch

arcane/src/arcane/utils/MultiArray2.h#L198

Added line #L198 was not covered by tests
{
return { m_buffer.constSmallSpan(), m_indexes, m_sizes };
}
Expand Down
6 changes: 3 additions & 3 deletions arcane/src/arcane/utils/MultiArray2View.h
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class ConstMultiArray2View
* ou MultiArray2::constSpan().
*/
template <class DataType>
class MultiArray2SmallSpan
class JaggedSmallSpan
{
private:

Expand All @@ -149,12 +149,12 @@ class MultiArray2SmallSpan
public:

//! Vue vide
MultiArray2SmallSpan() = default;
JaggedSmallSpan() = default;

private:

//! Vue sur la tableau \a buf
MultiArray2SmallSpan(SmallSpan<DataType> buf, SmallSpan<const Int32> indexes,
JaggedSmallSpan(SmallSpan<DataType> buf, SmallSpan<const Int32> indexes,
SmallSpan<const Int32> sizes)
: m_buffer(buf)
, m_indexes(indexes)
Expand Down
Loading