@@ -103,79 +103,79 @@ TEST_F(KinematicsUtilsFixture, load_link_m) {
103103 EXPECT_DOUBLE_EQ (links[10 ].m , 0.8 );
104104}
105105
106- // TEST_F(KinematicsUtilsFixture, load_link_c) {
107- // double x = 0.001; // meters
108- // double y = 0.002; // meters
109- // double z = 0.003; // meters
110-
111- // EXPECT_DOUBLE_EQ(links[1].c[0], x) << "回転軸方向:-";
112- // EXPECT_DOUBLE_EQ(links[1].c[1], y) << "回転軸方向:-";
113- // EXPECT_DOUBLE_EQ(links[1].c[2], z) << "回転軸方向:-";
114-
115- // EXPECT_DOUBLE_EQ(links[2].c[0], x) << "回転軸方向:Z+";
116- // EXPECT_DOUBLE_EQ(links[2].c[1], y) << "回転軸方向:Z+";
117- // EXPECT_DOUBLE_EQ(links[2].c[2], z) << "回転軸方向:Z+";
118-
119- // // Z-は座標系をX軸回りに180 deg回転して表現する
120- // EXPECT_DOUBLE_EQ(links[3].c[0], x) << "回転軸方向:Z-";
121- // EXPECT_DOUBLE_EQ(links[3].c[1], -y) << "回転軸方向:Z-";
122- // EXPECT_DOUBLE_EQ(links[3].c[2], -z) << "回転軸方向:Z-";
123-
124- // EXPECT_DOUBLE_EQ(links[4].c[0], x) << "回転軸方向:Y+";
125- // EXPECT_DOUBLE_EQ(links[4].c[1], z) << "回転軸方向:Y+";
126- // EXPECT_DOUBLE_EQ(links[4].c[2], -y) << "回転軸方向:Y+";
127-
128- // EXPECT_DOUBLE_EQ(links[5].c[0], x) << "回転軸方向:Y-";
129- // EXPECT_DOUBLE_EQ(links[5].c[1], -z) << "回転軸方向:Y-";
130- // EXPECT_DOUBLE_EQ(links[5].c[2], y) << "回転軸方向:Y-";
131-
132- // EXPECT_DOUBLE_EQ(links[6].c[0], z) << "回転軸方向:X+";
133- // EXPECT_DOUBLE_EQ(links[6].c[1], y) << "回転軸方向:X+";
134- // EXPECT_DOUBLE_EQ(links[6].c[2], -x) << "回転軸方向:X+";
135-
136- // EXPECT_DOUBLE_EQ(links[7].c[0], -z) << "回転軸方向:X-";
137- // EXPECT_DOUBLE_EQ(links[7].c[1], y) << "回転軸方向:X-";
138- // EXPECT_DOUBLE_EQ(links[7].c[2], x) << "回転軸方向:X-";
139- // }
140-
141- // TEST_F(KinematicsUtilsFixture, load_link_I) {
142- // Eigen::Matrix3d expected;
143- // expected << 1, 2, 4,
144- // 2, 3, 5,
145- // 4, 5, 6;
146- // expect_matrix_approximation(links[1].I, expected, "回転軸方向:-");
147-
148- // expected << 1, 2, 4,
149- // 2, 3, 5,
150- // 4, 5, 6;
151- // expect_matrix_approximation(links[2].I, expected, "回転軸方向:Z+");
152-
153- // // Z-は座標系をX軸回りに180 deg回転して表現する
154- // expected << 1, -2, -4,
155- // -2, 3, 5,
156- // -4, 5, 6;
157- // expect_matrix_approximation(links[3].I, expected, "回転軸方向:Z-");
158-
159- // expected << 1, 4, -2,
160- // 4, 6, -5,
161- // -2, -5, 3;
162- // expect_matrix_approximation(links[4].I, expected, "回転軸方向:Y+");
163-
164- // expected << 1, -4, 2,
165- // -4, 6, -5,
166- // 2, -5, 3;
167- // expect_matrix_approximation(links[5].I, expected, "回転軸方向:Y-");
168-
169- // expected << 6, 5, -4,
170- // 5, 3, -2,
171- // -4, -2, 1;
172- // expect_matrix_approximation(links[6].I, expected, "回転軸方向:X+");
173-
174- // expected << 6, -5, -4,
175- // -5, 3, 2,
176- // -4, 2, 1;
177- // expect_matrix_approximation(links[7].I, expected, "回転軸方向:X-");
178- // }
106+ TEST_F (KinematicsUtilsFixture, load_link_c) {
107+ double x = 0.001 ; // meters
108+ double y = 0.002 ; // meters
109+ double z = 0.003 ; // meters
110+
111+ EXPECT_DOUBLE_EQ (links[1 ].c [0 ], x) << " 回転軸方向:-" ;
112+ EXPECT_DOUBLE_EQ (links[1 ].c [1 ], y) << " 回転軸方向:-" ;
113+ EXPECT_DOUBLE_EQ (links[1 ].c [2 ], z) << " 回転軸方向:-" ;
114+
115+ EXPECT_DOUBLE_EQ (links[2 ].c [0 ], x) << " 回転軸方向:Z+" ;
116+ EXPECT_DOUBLE_EQ (links[2 ].c [1 ], y) << " 回転軸方向:Z+" ;
117+ EXPECT_DOUBLE_EQ (links[2 ].c [2 ], z) << " 回転軸方向:Z+" ;
118+
119+ // Z-は座標系をX軸回りに180 deg回転して表現する
120+ EXPECT_DOUBLE_EQ (links[3 ].c [0 ], x) << " 回転軸方向:Z-" ;
121+ EXPECT_DOUBLE_EQ (links[3 ].c [1 ], -y) << " 回転軸方向:Z-" ;
122+ EXPECT_DOUBLE_EQ (links[3 ].c [2 ], -z) << " 回転軸方向:Z-" ;
123+
124+ EXPECT_DOUBLE_EQ (links[4 ].c [0 ], x) << " 回転軸方向:Y+" ;
125+ EXPECT_DOUBLE_EQ (links[4 ].c [1 ], z) << " 回転軸方向:Y+" ;
126+ EXPECT_DOUBLE_EQ (links[4 ].c [2 ], -y) << " 回転軸方向:Y+" ;
127+
128+ EXPECT_DOUBLE_EQ (links[5 ].c [0 ], x) << " 回転軸方向:Y-" ;
129+ EXPECT_DOUBLE_EQ (links[5 ].c [1 ], -z) << " 回転軸方向:Y-" ;
130+ EXPECT_DOUBLE_EQ (links[5 ].c [2 ], y) << " 回転軸方向:Y-" ;
131+
132+ EXPECT_DOUBLE_EQ (links[6 ].c [0 ], z) << " 回転軸方向:X+" ;
133+ EXPECT_DOUBLE_EQ (links[6 ].c [1 ], y) << " 回転軸方向:X+" ;
134+ EXPECT_DOUBLE_EQ (links[6 ].c [2 ], -x) << " 回転軸方向:X+" ;
135+
136+ EXPECT_DOUBLE_EQ (links[7 ].c [0 ], -z) << " 回転軸方向:X-" ;
137+ EXPECT_DOUBLE_EQ (links[7 ].c [1 ], y) << " 回転軸方向:X-" ;
138+ EXPECT_DOUBLE_EQ (links[7 ].c [2 ], x) << " 回転軸方向:X-" ;
139+ }
140+
141+ TEST_F (KinematicsUtilsFixture, load_link_I) {
142+ Eigen::Matrix3d expected;
143+ expected << 1 , 2 , 4 ,
144+ 2 , 3 , 5 ,
145+ 4 , 5 , 6 ;
146+ expect_matrix_approximation (links[1 ].I , expected, " 回転軸方向:-" );
147+
148+ expected << 1 , 2 , 4 ,
149+ 2 , 3 , 5 ,
150+ 4 , 5 , 6 ;
151+ expect_matrix_approximation (links[2 ].I , expected, " 回転軸方向:Z+" );
152+
153+ // Z-は座標系をX軸回りに180 deg回転して表現する
154+ expected << 1 , -2 , -4 ,
155+ -2 , 3 , 5 ,
156+ -4 , 5 , 6 ;
157+ expect_matrix_approximation (links[3 ].I , expected, " 回転軸方向:Z-" );
158+
159+ expected << 1 , 4 , -2 ,
160+ 4 , 6 , -5 ,
161+ -2 , -5 , 3 ;
162+ expect_matrix_approximation (links[4 ].I , expected, " 回転軸方向:Y+" );
163+
164+ expected << 1 , -4 , 2 ,
165+ -4 , 6 , -5 ,
166+ 2 , -5 , 3 ;
167+ expect_matrix_approximation (links[5 ].I , expected, " 回転軸方向:Y-" );
168+
169+ expected << 6 , 5 , -4 ,
170+ 5 , 3 , -2 ,
171+ -4 , -2 , 1 ;
172+ expect_matrix_approximation (links[6 ].I , expected, " 回転軸方向:X+" );
173+
174+ expected << 6 , -5 , -4 ,
175+ -5 , 3 , 2 ,
176+ -4 , 2 , 1 ;
177+ expect_matrix_approximation (links[7 ].I , expected, " 回転軸方向:X-" );
178+ }
179179
180180TEST_F (KinematicsUtilsFixture, load_link_a) {
181181 Eigen::Vector3d expected;
0 commit comments