dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Add operator* and operator/ for slice with type

This commit is contained in:
kamilritz 2020-06-11 19:44:29 +02:00 committed by Mathieu Bresciani
parent 38b3acce96
commit 674bd99f3b
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
matrix/Slice.hpp
View File

@ -184,6 +184,24 @@ public:
return operator*=(Type(1) / other); return operator*=(Type(1) / other);
} }
Matrix<Type, P, Q> operator*(const Type& other)
{
Slice<Type, P, Q, M, N>& self = *this;
Matrix<Type, P, Q> res;
for (size_t i = 0; i < P; i++) {
for (size_t j = 0; j < Q; j++) {
res(i, j) = self(i, j) * other;
}
}
return res;
}
Matrix<Type, P, Q> operator/(const Type& other)
{
Slice<Type, P, Q, M, N>& self = *this;
return self * (Type(1) / other);
}
template<size_t R, size_t S> template<size_t R, size_t S>
const Slice<Type, R, S, M, N> slice(size_t x0, size_t y0) const const Slice<Type, R, S, M, N> slice(size_t x0, size_t y0) const
{ {

10
test/slice.cpp
View File

@ -208,6 +208,16 @@ int main()
float O_check_data_10 [9] = {0, 2, 3, 4, 2.5, 6, 7, 4, 10}; float O_check_data_10 [9] = {0, 2, 3, 4, 2.5, 6, 7, 4, 10};
TEST(isEqual(O, SquareMatrix3f(O_check_data_10))); TEST(isEqual(O, SquareMatrix3f(O_check_data_10)));
// Different operations
O = SquareMatrix3f(data);
SquareMatrix<float, 2> res_11(O.slice<2,2>(1,1) * 2.f);
float O_check_data_11 [4] = {10, 12, 16, 20};
TEST(isEqual(res_11, SquareMatrix<float, 2>(O_check_data_11)));
O = SquareMatrix3f(data);
SquareMatrix<float, 2> res_12(O.slice<2,2>(1,1) / 2.f);
float O_check_data_12 [4] = {2.5, 3, 4, 5};
TEST(isEqual(res_12, SquareMatrix<float, 2>(O_check_data_12)));
return 0; return 0;
} }