Introduced 2d arrays in Variant #5132
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| // Copyright CERN and copyright holders of ALICE O2. This software is | ||
| // distributed under the terms of the GNU General Public License v3 (GPL | ||
| // Version 3), copied verbatim in the file "COPYING". | ||
| // | ||
| // See http://alice-o2.web.cern.ch/license for full licensing information. | ||
| // | ||
| // In applying this license CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
| #ifndef FRAMEWORK_ARRAY2D_H | ||
| #define FRAMEWORK_ARRAY2D_H | ||
| #include <cstdint> | ||
| #include <vector> | ||
|
|
||
| namespace o2::framework | ||
| { | ||
| // matrix-like wrapper for std::vector | ||
| // has no range checks | ||
| template <typename T> | ||
| struct Array2D { | ||
| using element_t = T; | ||
|
|
||
| Array2D(T const* data_, uint32_t r, uint32_t c) | ||
| : rows{r}, cols{c} | ||
| { | ||
| data = new T[rows * cols]; | ||
| for (auto i = 0U; i < rows; ++i) { | ||
| for (auto j = 0U; j < cols; ++j) { | ||
| data[i * cols + j] = *(data_ + (i * cols + j)); | ||
| } | ||
| } | ||
| } | ||
| Array2D(std::vector<T> data_, uint32_t r, uint32_t c) | ||
| : rows{r}, cols{c} | ||
| { | ||
| data = new T[rows * cols]; | ||
| for (auto i = 0U; i < rows; ++i) { | ||
| for (auto j = 0U; j < cols; ++j) { | ||
| data[i * cols + j] = data_[i * cols + j]; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Array2D(Array2D<T> const& other) | ||
| : rows{other.rows}, | ||
| cols{other.cols} | ||
| { | ||
| data = new T[rows * cols]; | ||
| for (auto i = 0U; i < rows; ++i) { | ||
| for (auto j = 0U; j < cols; ++j) { | ||
| data[i * cols + j] = *(other.data + (i * cols + j)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Array2D(Array2D<T>&& other) | ||
| : rows{other.rows}, | ||
| cols{other.cols} | ||
| { | ||
| data = other.data; | ||
| other.data = nullptr; | ||
| other.rows = 0; | ||
| other.cols = 0; | ||
| } | ||
|
|
||
| Array2D& operator=(Array2D<T> const& other) | ||
| { | ||
| this->rows = other.rows; | ||
| this->cols = other.cols; | ||
| data = new T[rows * cols]; | ||
| for (auto i = 0U; i < rows; ++i) { | ||
| for (auto j = 0U; j < cols; ++j) { | ||
| data[i * cols + j] = *(other.data + (i * cols + j)); | ||
| } | ||
| } | ||
| return *this; | ||
| } | ||
|
|
||
| Array2D& operator=(Array2D<T>&& other) | ||
| { | ||
| this->rows = other.rows; | ||
| this->cols = other.cols; | ||
| data = other.data; | ||
| other.data = nullptr; | ||
| other.rows = 0; | ||
| other.cols = 0; | ||
| return *this; | ||
| } | ||
|
|
||
| ~Array2D() | ||
| { | ||
| if (data != nullptr) { | ||
| delete[] data; | ||
| } | ||
| } | ||
|
|
||
| T operator()(uint32_t y, uint32_t x) const | ||
| { | ||
| return data[y * cols + x]; | ||
| } | ||
| T* operator[](uint32_t y) const | ||
| { | ||
| return data + y * cols; | ||
| } | ||
|
|
||
| T* data = nullptr; | ||
| uint32_t rows = 0; | ||
| uint32_t cols = 0; | ||
| }; | ||
| } // namespace o2::framework | ||
|
|
||
| #endif // FRAMEWORK_ARRAY2D_H |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should probably be
extractArray2D, fine for now.