Skip to content

Commit a9442cb

Browse files
committed
Fixed some set<Key> leftovers
1 parent f446238 commit a9442cb

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

gtsam/nonlinear/tests/testAdaptAutoDiff.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ TEST(AdaptAutoDiff, SnavelyExpression) {
250250
internal::upAligned(RecordSize) + P.traceSize() + X.traceSize(),
251251
expression.traceSize());
252252

253-
const set<Key> expected{1, 2};
253+
const KeySet expected{1, 2};
254254
EXPECT(expected == expression.keys());
255255
}
256256

gtsam/nonlinear/tests/testExpression.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Vector f3(const Point3& p, OptionalJacobian<Eigen::Dynamic, 3> H) {
8686
return p;
8787
}
8888
Point3_ pointExpression(1);
89-
const set<Key> expected{1};
89+
const KeySet expected{1};
9090
} // namespace unary
9191

9292
// Create a unary expression that takes another expression as a single argument.
@@ -186,7 +186,7 @@ TEST(Expression, BinaryToDouble) {
186186
/* ************************************************************************* */
187187
// Check keys of an expression created from class method.
188188
TEST(Expression, BinaryKeys) {
189-
const set<Key> expected{1, 2};
189+
const KeySet expected{1, 2};
190190
EXPECT(expected == binary::p_cam.keys())
191191
}
192192

@@ -223,7 +223,7 @@ Expression<Point2> uv_hat(uncalibrate<Cal3_S2>, K, projection);
223223
/* ************************************************************************* */
224224
// keys
225225
TEST(Expression, TreeKeys) {
226-
const set<Key> expected{1, 2, 3};
226+
const KeySet expected{1, 2, 3};
227227
EXPECT(expected == tree::uv_hat.keys())
228228
}
229229

@@ -261,7 +261,7 @@ TEST(Expression, compose1) {
261261
Rot3_ R3 = R1 * R2;
262262

263263
// Check keys
264-
const set<Key> expected{1, 2};
264+
const KeySet expected{1, 2};
265265
EXPECT(expected == R3.keys())
266266
}
267267

@@ -273,7 +273,7 @@ TEST(Expression, compose2) {
273273
Rot3_ R3 = R1 * R2;
274274

275275
// Check keys
276-
const set<Key> expected{1};
276+
const KeySet expected{1};
277277
EXPECT(expected == R3.keys())
278278
}
279279

@@ -285,7 +285,7 @@ TEST(Expression, compose3) {
285285
Rot3_ R3 = R1 * R2;
286286

287287
// Check keys
288-
const set<Key> expected{3};
288+
const KeySet expected{3};
289289
EXPECT(expected == R3.keys())
290290
}
291291

@@ -298,7 +298,7 @@ TEST(Expression, compose4) {
298298
Double_ R3 = R1 * R2;
299299

300300
// Check keys
301-
const set<Key> expected{1};
301+
const KeySet expected{1};
302302
EXPECT(expected == R3.keys())
303303
}
304304

@@ -322,7 +322,7 @@ TEST(Expression, ternary) {
322322
Rot3_ ABC(composeThree, A, B, C);
323323

324324
// Check keys
325-
const set<Key> expected {1, 2, 3};
325+
const KeySet expected {1, 2, 3};
326326
EXPECT(expected == ABC.keys())
327327
}
328328

@@ -332,7 +332,7 @@ TEST(Expression, ScalarMultiply) {
332332
const Key key(67);
333333
const Point3_ expr = 23 * Point3_(key);
334334

335-
const set<Key> expected_keys{key};
335+
const KeySet expected_keys{key};
336336
EXPECT(expected_keys == expr.keys())
337337

338338
map<Key, int> actual_dims, expected_dims {{key, 3}};
@@ -363,7 +363,7 @@ TEST(Expression, BinarySum) {
363363
const Key key(67);
364364
const Point3_ sum_ = Point3_(key) + Point3_(Point3(1, 1, 1));
365365

366-
const set<Key> expected_keys{key};
366+
const KeySet expected_keys{key};
367367
EXPECT(expected_keys == sum_.keys())
368368

369369
map<Key, int> actual_dims, expected_dims {{key, 3}};
@@ -508,7 +508,7 @@ TEST(Expression, Subtract) {
508508
values.insert(0, p);
509509
values.insert(1, q);
510510
const Vector3_ expression = Vector3_(0) - Vector3_(1);
511-
set<Key> expected_keys = {0, 1};
511+
KeySet expected_keys = {0, 1};
512512
EXPECT(expression.keys() == expected_keys)
513513

514514
// Check value + Jacobians

0 commit comments

Comments
 (0)