Relintai/pmlpp
1
0
Fork 0
mirror of https://github.com/Relintai/pmlpp.git synced 2025-01-03 16:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

More cleanups.

Browse Source
This commit is contained in:
Relintai 2023-01-26 17:32:19 +01:00
parent b568eca5fe
commit 862c66a846
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mlpp/lin_alg/mlpp_matrix.cpp
View File

@ -13,6 +13,7 @@ void MLPPMatrix::_bind_methods() {
ClassDB::bind_method(D_METHOD("empty"), &MLPPMatrix::empty); ClassDB::bind_method(D_METHOD("empty"), &MLPPMatrix::empty);
ClassDB::bind_method(D_METHOD("data_size"), &MLPPMatrix::data_size); ClassDB::bind_method(D_METHOD("data_size"), &MLPPMatrix::data_size);
ClassDB::bind_method(D_METHOD("resize_data", "size"), &MLPPMatrix::resize_data);
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);

26
mlpp/lin_alg/mlpp_matrix.h
View File

@ -89,7 +89,7 @@ public:
} }
} }
_FORCE_INLINE_ void clear() { resize(0); } _FORCE_INLINE_ void clear() { resize_data(0); }
_FORCE_INLINE_ void reset() { _FORCE_INLINE_ void reset() {
clear(); clear();
if (_data) { if (_data) {
@ -102,7 +102,7 @@ public:
_FORCE_INLINE_ bool empty() const { return _data_size == 0; } _FORCE_INLINE_ bool empty() const { return _data_size == 0; }
_FORCE_INLINE_ int data_size() const { return _data_size; } _FORCE_INLINE_ int data_size() const { return _data_size; }
void resize(int p_size) { void resize_data(int p_size) {
_data_size = p_size; _data_size = p_size;
_data = (double *)memrealloc(_data, _data_size * sizeof(double)); _data = (double *)memrealloc(_data, _data_size * sizeof(double));
@ -153,7 +153,7 @@ public:
if (p_pos == _data_size) { if (p_pos == _data_size) {
push_back(p_val); push_back(p_val);
} else { } else {
resize(_data_size + 1); resize_data(_data_size + 1);
for (int i = _data_size - 1; i > p_pos; i--) { for (int i = _data_size - 1; i > p_pos; i--) {
_data[i] = _data[i - 1]; _data[i] = _data[i - 1];
} }
@ -235,14 +235,14 @@ 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.data_size()); resize_data(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];
} }
} }
_FORCE_INLINE_ void set_from_mlpp_vectorr(const MLPPVector &p_from) { _FORCE_INLINE_ void set_from_mlpp_vectorr(const MLPPVector &p_from) {
resize(p_from.size()); resize_data(p_from.size());
const double *from_ptr = p_from.ptr(); const double *from_ptr = p_from.ptr();
for (int i = 0; i < p_from.size(); i++) { for (int i = 0; i < p_from.size(); i++) {
_data[i] = from_ptr[i]; _data[i] = from_ptr[i];
@ -251,7 +251,7 @@ public:
_FORCE_INLINE_ void set_from_mlpp_vector(const Ref<MLPPVector> &p_from) { _FORCE_INLINE_ void set_from_mlpp_vector(const Ref<MLPPVector> &p_from) {
ERR_FAIL_COND(!p_from.is_valid()); ERR_FAIL_COND(!p_from.is_valid());
resize(p_from->size()); resize_data(p_from->size());
const double *from_ptr = p_from->ptr(); const double *from_ptr = p_from->ptr();
for (int i = 0; i < p_from->size(); i++) { for (int i = 0; i < p_from->size(); i++) {
_data[i] = from_ptr[i]; _data[i] = from_ptr[i];
@ -259,14 +259,14 @@ public:
} }
_FORCE_INLINE_ void set_from_vector(const Vector<double> &p_from) { _FORCE_INLINE_ void set_from_vector(const Vector<double> &p_from) {
resize(p_from.size()); resize_data(p_from.size());
for (int i = 0; i < _data_size; i++) { for (int i = 0; i < _data_size; i++) {
_data[i] = p_from[i]; _data[i] = p_from[i];
} }
} }
_FORCE_INLINE_ void set_from_pool_vector(const PoolRealArray &p_from) { _FORCE_INLINE_ void set_from_pool_vector(const PoolRealArray &p_from) {
resize(p_from.size()); resize_data(p_from.size());
typename PoolRealArray::Read r = p_from.read(); typename PoolRealArray::Read r = p_from.read();
for (int i = 0; i < _data_size; i++) { for (int i = 0; i < _data_size; i++) {
_data[i] = r[i]; _data[i] = r[i];
@ -281,7 +281,7 @@ public:
_data_size = 0; _data_size = 0;
_data = NULL; _data = NULL;
resize(p_from.data_size()); resize_data(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];
} }
@ -291,7 +291,7 @@ public:
_data_size = 0; _data_size = 0;
_data = NULL; _data = NULL;
resize(p_from.size()); resize_data(p_from.size());
for (int i = 0; i < _data_size; i++) { for (int i = 0; i < _data_size; i++) {
_data[i] = p_from[i]; _data[i] = p_from[i];
} }
@ -301,7 +301,7 @@ public:
_data_size = 0; _data_size = 0;
_data = NULL; _data = NULL;
resize(p_from.size()); resize_data(p_from.size());
typename PoolRealArray::Read r = p_from.read(); typename PoolRealArray::Read r = p_from.read();
for (int i = 0; i < _data_size; i++) { for (int i = 0; i < _data_size; i++) {
_data[i] = r[i]; _data[i] = r[i];
@ -324,7 +324,7 @@ public:
} }
_FORCE_INLINE_ void set_from_std_vector(const std::vector<double> &p_from) { _FORCE_INLINE_ void set_from_std_vector(const std::vector<double> &p_from) {
resize(p_from.size()); resize_data(p_from.size());
for (int i = 0; i < _data_size; i++) { for (int i = 0; i < _data_size; i++) {
_data[i] = p_from[i]; _data[i] = p_from[i];
} }
@ -334,7 +334,7 @@ public:
_data_size = 0; _data_size = 0;
_data = NULL; _data = NULL;
resize(p_from.size()); resize_data(p_from.size());
for (int i = 0; i < _data_size; i++) { for (int i = 0; i < _data_size; i++) {
_data[i] = p_from[i]; _data[i] = p_from[i];
} }