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

Merge pull request #59 from borglab/fix/41_tbb_issue 

Fixed exception type for TBB path
release/4.3a0
Frank Dellaert 2019-06-11 19:50:02 -04:00 committed by GitHub
parent 8e13655fc8 07b670423d
commit 87ab40d48d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/testDoglegOptimizer.cpp
View File

@ -10,9 +10,10 @@
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/** /**
* @file DoglegOptimizer.h * @file testDoglegOptimizer.cpp
* @brief Unit tests for DoglegOptimizer * @brief Unit tests for DoglegOptimizer
* @author Richard Roberts * @author Richard Roberts
* @author Frank dellaert
*/ */
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
@ -181,7 +182,12 @@ TEST(DoglegOptimizer, Constraint) {
// Try optimizing with infeasible initial estimate // Try optimizing with infeasible initial estimate
DoglegOptimizer optimizer2(graph, infeasible, params); DoglegOptimizer optimizer2(graph, infeasible, params);
#ifdef GTSAM_USE_TBB
CHECK_EXCEPTION(optimizer2.optimize(), std::exception);
#else
CHECK_EXCEPTION(optimizer2.optimize(), std::invalid_argument); CHECK_EXCEPTION(optimizer2.optimize(), std::invalid_argument);
#endif
} }
/* ************************************************************************* */ /* ************************************************************************* */