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

Merge pull request #1262 from borglab/fix/matlab 

Fix matlab toolbox compilation
release/4.3a0
Varun Agrawal 2022-08-01 16:38:45 -04:00 committed by GitHub
parent 3e22039fd5 9ec762b76d
commit 0b9ddb7957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/HandlePrintConfiguration.cmake
View File

@ -33,6 +33,7 @@ print_build_options_for_target(gtsam)
print_config("Use System Eigen" "${GTSAM_USE_SYSTEM_EIGEN} (Using version: ${GTSAM_EIGEN_VERSION})") print_config("Use System Eigen" "${GTSAM_USE_SYSTEM_EIGEN} (Using version: ${GTSAM_EIGEN_VERSION})")
print_config("Use System Metis" "${GTSAM_USE_SYSTEM_METIS}") print_config("Use System Metis" "${GTSAM_USE_SYSTEM_METIS}")
print_config("Using Boost version" "${Boost_VERSION}")
if(GTSAM_USE_TBB) if(GTSAM_USE_TBB)
print_config("Use Intel TBB" "Yes (Version: ${TBB_VERSION})") print_config("Use Intel TBB" "Yes (Version: ${TBB_VERSION})")

2
gtsam/basis/basis.i
View File

@ -137,7 +137,7 @@ class FitBasis {
static gtsam::GaussianFactorGraph::shared_ptr LinearGraph( static gtsam::GaussianFactorGraph::shared_ptr LinearGraph(
const std::map<double, double>& sequence, const std::map<double, double>& sequence,
const gtsam::noiseModel::Base* model, size_t N); const gtsam::noiseModel::Base* model, size_t N);
This::Parameters parameters() const; gtsam::This::Parameters parameters() const;
}; };
} // namespace gtsam } // namespace gtsam

8
gtsam/geometry/geometry.i
View File

@ -1126,10 +1126,10 @@ class TriangulationResult {
Status status; Status status;
TriangulationResult(const gtsam::Point3& p); TriangulationResult(const gtsam::Point3& p);
const gtsam::Point3& get() const; const gtsam::Point3& get() const;
static TriangulationResult Degenerate(); static gtsam::TriangulationResult Degenerate();
static TriangulationResult Outlier(); static gtsam::TriangulationResult Outlier();
static TriangulationResult FarPoint(); static gtsam::TriangulationResult FarPoint();
static TriangulationResult BehindCamera(); static gtsam::TriangulationResult BehindCamera();
bool valid() const; bool valid() const;
bool degenerate() const; bool degenerate() const;
bool outlier() const; bool outlier() const;

2
gtsam/nonlinear/nonlinear.i
View File

@ -701,7 +701,7 @@ class ISAM2Result {
/** Getters and Setters for all properties */ /** Getters and Setters for all properties */
size_t getVariablesRelinearized() const; size_t getVariablesRelinearized() const;
size_t getVariablesReeliminated() const; size_t getVariablesReeliminated() const;
FactorIndices getNewFactorsIndices() const; gtsam::FactorIndices getNewFactorsIndices() const;
size_t getCliques() const; size_t getCliques() const;
double getErrorBefore() const; double getErrorBefore() const;
double getErrorAfter() const; double getErrorAfter() const;

1
matlab/CMakeLists.txt
View File

@ -99,7 +99,6 @@ endif(GTSAM_UNSTABLE_INSTALL_MATLAB_TOOLBOX)
# Record the root dir for gtsam - needed during external builds, e.g., ROS # Record the root dir for gtsam - needed during external builds, e.g., ROS
set(GTSAM_SOURCE_ROOT_DIR ${GTSAM_SOURCE_DIR}) set(GTSAM_SOURCE_ROOT_DIR ${GTSAM_SOURCE_DIR})
message(STATUS "GTSAM_SOURCE_ROOT_DIR: [${GTSAM_SOURCE_ROOT_DIR}]")
# Tests message(STATUS "Installing Matlab Toolbox") # Tests message(STATUS "Installing Matlab Toolbox")
install_matlab_scripts("${GTSAM_SOURCE_ROOT_DIR}/matlab/" "*.m;*.fig") install_matlab_scripts("${GTSAM_SOURCE_ROOT_DIR}/matlab/" "*.m;*.fig")