Relintai/pmlpp
1
0
Fork 0
mirror of https://github.com/Relintai/pmlpp.git synced 2025-05-22 20:27:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

More cleanups to the matrix class.

Browse Source
This commit is contained in:
Relintai 2023-01-26 17:25:26 +01:00
parent 1718f33c84
commit eefded4f80
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mlpp/lin_alg/mlpp_matrix.cpp
View File

@ -12,7 +12,7 @@ void MLPPMatrix::_bind_methods() {
ClassDB::bind_method(D_METHOD("reset"), &MLPPMatrix::reset); ClassDB::bind_method(D_METHOD("reset"), &MLPPMatrix::reset);
ClassDB::bind_method(D_METHOD("empty"), &MLPPMatrix::empty); ClassDB::bind_method(D_METHOD("empty"), &MLPPMatrix::empty);
ClassDB::bind_method(D_METHOD("size"), &MLPPMatrix::size); ClassDB::bind_method(D_METHOD("data_size"), &MLPPMatrix::data_size);
ClassDB::bind_method(D_METHOD("get_element", "index"), &MLPPMatrix::get_element_bind); ClassDB::bind_method(D_METHOD("get_element", "index"), &MLPPMatrix::get_element_bind);
ClassDB::bind_method(D_METHOD("set_element", "index", "val"), &MLPPMatrix::set_element_bind); ClassDB::bind_method(D_METHOD("set_element", "index", "val"), &MLPPMatrix::set_element_bind);

17
mlpp/lin_alg/mlpp_matrix.h
View File

@ -100,7 +100,7 @@ public:
} }
_FORCE_INLINE_ bool empty() const { return _data_size == 0; } _FORCE_INLINE_ bool empty() const { return _data_size == 0; }
_FORCE_INLINE_ int size() const { return _data_size; } _FORCE_INLINE_ int data_size() const { return _data_size; }
void resize(int p_size) { void resize(int p_size) {
_data_size = p_size; _data_size = p_size;
@ -197,7 +197,7 @@ public:
Vector<double> to_vector() const { Vector<double> to_vector() const {
Vector<double> ret; Vector<double> ret;
ret.resize(size()); ret.resize(data_size());
double *w = ret.ptrw(); double *w = ret.ptrw();
memcpy(w, _data, sizeof(double) * _data_size); memcpy(w, _data, sizeof(double) * _data_size);
return ret; return ret;
@ -205,12 +205,12 @@ public:
PoolRealArray to_pool_vector() const { PoolRealArray to_pool_vector() const {
PoolRealArray pl; PoolRealArray pl;
if (size()) { if (data_size()) {
pl.resize(size()); pl.resize(data_size());
typename PoolRealArray::Write w = pl.write(); typename PoolRealArray::Write w = pl.write();
real_t *dest = w.ptr(); real_t *dest = w.ptr();
for (int i = 0; i < size(); ++i) { for (int i = 0; i < data_size(); ++i) {
dest[i] = static_cast<real_t>(_data[i]); dest[i] = static_cast<real_t>(_data[i]);
} }
} }
@ -235,7 +235,7 @@ public:
} }
_FORCE_INLINE_ void set_from_mlpp_matrixr(const MLPPMatrix &p_from) { _FORCE_INLINE_ void set_from_mlpp_matrixr(const MLPPMatrix &p_from) {
resize(p_from.size()); resize(p_from.data_size());
for (int i = 0; i < p_from._data_size; i++) { for (int i = 0; i < p_from._data_size; i++) {
_data[i] = p_from._data[i]; _data[i] = p_from._data[i];
} }
@ -281,7 +281,7 @@ public:
_data_size = 0; _data_size = 0;
_data = NULL; _data = NULL;
resize(p_from.size()); resize(p_from.data_size());
for (int i = 0; i < p_from._data_size; i++) { for (int i = 0; i < p_from._data_size; i++) {
_data[i] = p_from._data[i]; _data[i] = p_from._data[i];
} }
@ -317,7 +317,7 @@ public:
// TODO: These are temporary // TODO: These are temporary
std::vector<double> to_std_vector() const { std::vector<double> to_std_vector() const {
std::vector<double> ret; std::vector<double> ret;
ret.resize(size()); ret.resize(data_size());
double *w = &ret[0]; double *w = &ret[0];
memcpy(w, _data, sizeof(double) * _data_size); memcpy(w, _data, sizeof(double) * _data_size);
return ret; return ret;
@ -344,6 +344,7 @@ protected:
static void _bind_methods(); static void _bind_methods();
protected: protected:
Size2i _size;
int _data_size; int _data_size;
double *_data; double *_data;
}; };