Merged in fix/move_numpy_eigen (pull request #211)
Moved numpy_eigen headers to a more logical placerelease/4.3a0
						commit
						0c9910466e
					
				|  | @ -7,3 +7,4 @@ | |||
| *.txt.user | ||||
| *.txt.user.6d59f0c | ||||
| /python-build/ | ||||
| *.pydevproject | ||||
|  |  | |||
|  | @ -48,7 +48,7 @@ if(Boost_PYTHON${BOOST_PYTHON_VERSION_SUFFIX_UPPERCASE}_FOUND AND PYTHONLIBS_FOU | |||
| 	include_directories(${NUMPY_INCLUDE_DIRS}) | ||||
| 	include_directories(${PYTHON_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 | ||||
| 	add_subdirectory(handwritten) | ||||
|  |  | |||
|  | @ -3,15 +3,14 @@ | |||
| #define NO_IMPORT_ARRAY | ||||
| #include <numpy_eigen/NumpyEigenConverter.hpp> | ||||
| 
 | ||||
| #include <gtsam/slam/BearingFactor.h> | ||||
| #include <gtsam/sam/BearingFactor.h> | ||||
| 
 | ||||
| using namespace boost::python; | ||||
| using namespace gtsam; | ||||
| 
 | ||||
| using namespace std; | ||||
| 
 | ||||
| template<class VALUE> | ||||
| void exportBearingFactor(const std::string& name){ | ||||
|   class_<VALUE>(name, init<>()) | ||||
|   ; | ||||
| } | ||||
| template <class VALUE> | ||||
| void exportBearingFactor(const std::string& name) { | ||||
|   class_<VALUE>(name, init<>()); | ||||
| } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue