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

Added min helper methods to Matrix.

Browse Source
This commit is contained in:
Relintai 2023-04-29 15:12:14 +02:00
parent a680e6bd6e
commit f9eabcfcdd
2 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
mlpp/lin_alg/mlpp_matrix.cpp
View File

@ -1876,6 +1876,59 @@ void MLPPMatrix::maxb(const Ref<MLPPMatrix> &A, const Ref<MLPPMatrix> &B) {
} }
} }
void MLPPMatrix::min(const Ref<MLPPMatrix> &B) {
ERR_FAIL_COND(!B.is_valid());
ERR_FAIL_COND(_size != B->size());
const real_t *b_ptr = B->ptr();
real_t *c_ptr = ptrw();
int ds = data_size();
for (int i = 0; i < ds; ++i) {
c_ptr[i] = MIN(c_ptr[i], b_ptr[i]);
}
}
Ref<MLPPMatrix> MLPPMatrix::minn(const Ref<MLPPMatrix> &B) const {
ERR_FAIL_COND_V(!B.is_valid(), Ref<MLPPMatrix>());
ERR_FAIL_COND_V(_size != B->size(), Ref<MLPPMatrix>());
Ref<MLPPMatrix> C;
C.instance();
C->resize(_size);
const real_t *a_ptr = ptr();
const real_t *b_ptr = B->ptr();
real_t *c_ptr = C->ptrw();
int ds = data_size();
for (int i = 0; i < ds; ++i) {
c_ptr[i] = MIN(a_ptr[i], b_ptr[i]);
}
return C;
}
void MLPPMatrix::minb(const Ref<MLPPMatrix> &A, const Ref<MLPPMatrix> &B) {
ERR_FAIL_COND(!A.is_valid() || !B.is_valid());
Size2i a_size = A->size();
ERR_FAIL_COND(a_size != B->size());
if (_size != a_size) {
resize(a_size);
}
const real_t *a_ptr = A->ptr();
const real_t *b_ptr = B->ptr();
real_t *c_ptr = ptrw();
int data_size = A->data_size();
for (int i = 0; i < data_size; ++i) {
c_ptr[i] = MIN(a_ptr[i], b_ptr[i]);
}
}
/* /*
real_t MLPPMatrix::max(std::vector<std::vector<real_t>> A) { real_t MLPPMatrix::max(std::vector<std::vector<real_t>> A) {
return max(flatten(A)); return max(flatten(A));
@ -3150,6 +3203,10 @@ void MLPPMatrix::_bind_methods() {
ClassDB::bind_method(D_METHOD("maxn", "B"), &MLPPMatrix::maxn); ClassDB::bind_method(D_METHOD("maxn", "B"), &MLPPMatrix::maxn);
ClassDB::bind_method(D_METHOD("maxb", "A", "B"), &MLPPMatrix::maxb); ClassDB::bind_method(D_METHOD("maxb", "A", "B"), &MLPPMatrix::maxb);
ClassDB::bind_method(D_METHOD("min", "B"), &MLPPMatrix::min);
ClassDB::bind_method(D_METHOD("minn", "B"), &MLPPMatrix::minn);
ClassDB::bind_method(D_METHOD("minb", "A", "B"), &MLPPMatrix::minb);
ClassDB::bind_method(D_METHOD("identity"), &MLPPMatrix::identity); ClassDB::bind_method(D_METHOD("identity"), &MLPPMatrix::identity);
ClassDB::bind_method(D_METHOD("identityn"), &MLPPMatrix::identityn); ClassDB::bind_method(D_METHOD("identityn"), &MLPPMatrix::identityn);
ClassDB::bind_method(D_METHOD("identity_mat", "d"), &MLPPMatrix::identity_mat); ClassDB::bind_method(D_METHOD("identity_mat", "d"), &MLPPMatrix::identity_mat);

4
mlpp/lin_alg/mlpp_matrix.h
View File

@ -233,6 +233,10 @@ public:
Ref<MLPPMatrix> maxn(const Ref<MLPPMatrix> &B) const; Ref<MLPPMatrix> maxn(const Ref<MLPPMatrix> &B) const;
void maxb(const Ref<MLPPMatrix> &A, const Ref<MLPPMatrix> &B); void maxb(const Ref<MLPPMatrix> &A, const Ref<MLPPMatrix> &B);
void min(const Ref<MLPPMatrix> &B);
Ref<MLPPMatrix> minn(const Ref<MLPPMatrix> &B) const;
void minb(const Ref<MLPPMatrix> &A, const Ref<MLPPMatrix> &B);
//real_t max(std::vector<std::vector<real_t>> A); //real_t max(std::vector<std::vector<real_t>> A);
//real_t min(std::vector<std::vector<real_t>> A); //real_t min(std::vector<std::vector<real_t>> A);