Relintai/pmlpp
1
0
Fork 0
mirror of https://github.com/Relintai/pmlpp.git synced 2024-12-22 15:06:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed getters in MLPPMatrix.

Browse Source
This commit is contained in:
Relintai 2023-01-31 02:37:06 +01:00
parent 048dc20f6a
commit 3db6f0faa4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mlpp/lin_alg/mlpp_matrix.h
View File

@ -160,6 +160,10 @@ public:
CRASH_COND_MSG(!_data, "Out of memory"); CRASH_COND_MSG(!_data, "Out of memory");
} }
_FORCE_INLINE_ int calculate_index(int p_index_x, int p_index_y) const {
return p_index_y * _size.y + p_index_x;
}
_FORCE_INLINE_ const real_t &operator[](int p_index) const { _FORCE_INLINE_ const real_t &operator[](int p_index) const {
CRASH_BAD_INDEX(p_index, data_size()); CRASH_BAD_INDEX(p_index, data_size());
return _data[p_index]; return _data[p_index];
@ -173,34 +177,34 @@ public:
ERR_FAIL_INDEX_V(p_index_x, _size.x, 0); ERR_FAIL_INDEX_V(p_index_x, _size.x, 0);
ERR_FAIL_INDEX_V(p_index_y, _size.y, 0); ERR_FAIL_INDEX_V(p_index_y, _size.y, 0);
return _data[p_index_x * p_index_y]; return _data[p_index_y * _size.y + p_index_x];
} }
_FORCE_INLINE_ real_t get_element(int p_index_x, int p_index_y) { _FORCE_INLINE_ real_t get_element(int p_index_x, int p_index_y) {
ERR_FAIL_INDEX_V(p_index_x, _size.x, 0); ERR_FAIL_INDEX_V(p_index_x, _size.x, 0);
ERR_FAIL_INDEX_V(p_index_y, _size.y, 0); ERR_FAIL_INDEX_V(p_index_y, _size.y, 0);
return _data[p_index_x * p_index_y]; return _data[p_index_y * _size.y + p_index_x];
} }
_FORCE_INLINE_ real_t get_element_bind(int p_index_x, int p_index_y) const { _FORCE_INLINE_ real_t get_element_bind(int p_index_x, int p_index_y) const {
ERR_FAIL_INDEX_V(p_index_x, _size.x, 0); ERR_FAIL_INDEX_V(p_index_x, _size.x, 0);
ERR_FAIL_INDEX_V(p_index_y, _size.y, 0); ERR_FAIL_INDEX_V(p_index_y, _size.y, 0);
return static_cast<real_t>(_data[p_index_x * p_index_y]); return static_cast<real_t>(_data[p_index_y * _size.y + p_index_x]);
} }
_FORCE_INLINE_ void set_element(int p_index_x, int p_index_y, real_t p_val) { _FORCE_INLINE_ void set_element(int p_index_x, int p_index_y, real_t p_val) {
ERR_FAIL_INDEX(p_index_x, _size.x); ERR_FAIL_INDEX(p_index_x, _size.x);
ERR_FAIL_INDEX(p_index_y, _size.y); ERR_FAIL_INDEX(p_index_y, _size.y);
_data[p_index_x * p_index_y] = p_val; _data[p_index_y * _size.y + p_index_x] = p_val;
} }
_FORCE_INLINE_ void set_element_bind(int p_index_x, int p_index_y, real_t p_val) { _FORCE_INLINE_ void set_element_bind(int p_index_x, int p_index_y, real_t p_val) {
ERR_FAIL_INDEX(p_index_x, _size.x); ERR_FAIL_INDEX(p_index_x, _size.x);
ERR_FAIL_INDEX(p_index_y, _size.y); ERR_FAIL_INDEX(p_index_y, _size.y);
_data[p_index_x * p_index_y] = p_val; _data[p_index_y * _size.y + p_index_x] = p_val;
} }
_FORCE_INLINE_ Vector<real_t> get_row_vector(int p_index_y) { _FORCE_INLINE_ Vector<real_t> get_row_vector(int p_index_y) {