12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update METIS test for _WIN32

release/4.3a0
Varun Agrawal 2022-02-17 02:40:44 -05:00
parent 6e6c64749d
commit b13a219a3b
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtsam/inference/tests/testOrdering.cpp
View File

@ -270,17 +270,7 @@ TEST(Ordering, MetisLoop) {
symbolicGraph.push_factor(0, 5); symbolicGraph.push_factor(0, 5);
// METIS // METIS
#if !defined(__APPLE__) #if defined(__APPLE__)
{
Ordering actual = Ordering::Create(Ordering::METIS, symbolicGraph);
// - P( 0 4 1)
// | - P( 2 | 4 1)
// | | - P( 3 | 4 2)
// | - P( 5 | 0 1)
Ordering expected = Ordering(list_of(3)(2)(5)(0)(4)(1));
EXPECT(assert_equal(expected, actual));
}
#else
{ {
Ordering actual = Ordering::Create(Ordering::METIS, symbolicGraph); Ordering actual = Ordering::Create(Ordering::METIS, symbolicGraph);
// - P( 1 0 3) // - P( 1 0 3)
@ -290,6 +280,26 @@ TEST(Ordering, MetisLoop) {
Ordering expected = Ordering(list_of(5)(4)(2)(1)(0)(3)); Ordering expected = Ordering(list_of(5)(4)(2)(1)(0)(3));
EXPECT(assert_equal(expected, actual)); EXPECT(assert_equal(expected, actual));
} }
#elif defined(_WIN32)
{
Ordering actual = Ordering::Create(Ordering::METIS, symbolicGraph);
// - P( 0 5 2)
// | - P( 3 | 5 2)
// | | - P( 4 | 5 3)
// | - P( 1 | 0 2)
Ordering expected = Ordering(list_of(4)(3)(1)(0)(5)(2));
EXPECT(assert_equal(expected, actual));
}
#else
{
Ordering actual = Ordering::Create(Ordering::METIS, symbolicGraph);
// - P( 0 4 1)
// | - P( 2 | 4 1)
// | | - P( 3 | 4 2)
// | - P( 5 | 0 1)
Ordering expected = Ordering(list_of(3)(2)(5)(0)(4)(1));
EXPECT(assert_equal(expected, actual));
}
#endif #endif
} }
#endif #endif