fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-14 13:47:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'MaEtUgR-maetugr-fix2'

Browse Source
This commit is contained in:
James Goppert
2016-05-09 11:24:55 -04:00
parent bd8420fcf6 8b7eae3b4a
commit 3f77991388
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrix/Matrix.hpp
+1 -1
View File
@@ -341,7 +341,7 @@ public:
{
Matrix<Type, M, N> &self = *this;
for (size_t i = 0; i < M; i++) {
self(i, j) = col(i, 1);
self(i, j) = col(i, 0);
}
}
test/matrixAssignment.cpp
+8 -2
View File
@@ -78,8 +78,14 @@ int main()
TEST(fabs(m5(0,0) - s) < 1e-5);
Matrix<float, 2, 2> m6;
m6.setRow(0, Vector2f(1, 1));
m6.setCol(0, Vector2f(1, 1));
m6.setRow(0, Vector2f(1, 2));
float m7_array[] = {1,2,0,0};
Matrix<float, 2, 2> m7(m7_array);
TEST(isEqual(m6, m7));
m6.setCol(0, Vector2f(3, 4));
float m8_array[] = {3,2,4,0};
Matrix<float, 2, 2> m8(m8_array);
TEST(isEqual(m6, m8));
return 0;
}