Merge remote-tracking branch 'origin/fix/move_numpy_eigen' into feature/ImuFactorPush2

release/4.3a0
Frank 2016-01-28 16:57:12 -08:00
commit 0560467bfc
9 changed files with 8 additions and 9 deletions

View File

@ -318,7 +318,7 @@ if(GTSAM_ENABLE_CONSISTENCY_CHECKS)
add_definitions(-DGTSAM_EXTRA_CONSISTENCY_CHECKS) add_definitions(-DGTSAM_EXTRA_CONSISTENCY_CHECKS)
endif() endif()
if(GTSAM_ENABLE_CONSISTENCY_CHECKS) if(GTSAM_ALLOW_DEPRECATED_SINCE_V4)
add_definitions(-DGTSAM_ALLOW_DEPRECATED_SINCE_V4) add_definitions(-DGTSAM_ALLOW_DEPRECATED_SINCE_V4)
endif() endif()

View File

@ -493,7 +493,7 @@ namespace gtsam {
static Rot3 roll (double t) { return Roll(t); } static Rot3 roll (double t) { return Roll(t); }
static Rot3 ypr(double y, double p, double r) { return Ypr(r,p,y);} static Rot3 ypr(double y, double p, double r) { return Ypr(r,p,y);}
static Rot3 quaternion(double w, double x, double y, double z) { static Rot3 quaternion(double w, double x, double y, double z) {
return Rot3::Quaternion q(w, x, y, z); return Rot3::Quaternion(w, x, y, z);
} }
/// @} /// @}
#endif #endif

View File

@ -48,7 +48,7 @@ if(Boost_PYTHON${BOOST_PYTHON_VERSION_SUFFIX_UPPERCASE}_FOUND AND PYTHONLIBS_FOU
include_directories(${NUMPY_INCLUDE_DIRS}) include_directories(${NUMPY_INCLUDE_DIRS})
include_directories(${PYTHON_INCLUDE_DIRS}) include_directories(${PYTHON_INCLUDE_DIRS})
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
include_directories(${CMAKE_SOURCE_DIR}/gtsam/3rdparty/numpy_eigen/include/) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
# Build the python module library # Build the python module library
add_subdirectory(handwritten) add_subdirectory(handwritten)

View File

@ -3,15 +3,14 @@
#define NO_IMPORT_ARRAY #define NO_IMPORT_ARRAY
#include <numpy_eigen/NumpyEigenConverter.hpp> #include <numpy_eigen/NumpyEigenConverter.hpp>
#include <gtsam/slam/BearingFactor.h> #include <gtsam/sam/BearingFactor.h>
using namespace boost::python; using namespace boost::python;
using namespace gtsam; using namespace gtsam;
using namespace std; using namespace std;
template<class VALUE> template <class VALUE>
void exportBearingFactor(const std::string& name){ void exportBearingFactor(const std::string& name) {
class_<VALUE>(name, init<>()) class_<VALUE>(name, init<>());
;
} }