From f68ba93f3dd47fa9613a83c212ad75a307417366 Mon Sep 17 00:00:00 2001 From: Andrew Melim Date: Sat, 30 Jun 2012 01:34:04 +0000 Subject: [PATCH] Dep checking for cmake --- CMakeLists.txt | 1 + gtsam_unstable/base/Dummy.h | 4 ++++ gtsam_unstable/gtsam_unstable.h | 1 + matlab/tests/testOdometryExample.m | 6 +++--- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96efa97dd..675e7c80b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ option(GTSAM_INSTALL_MATLAB_TESTS "Enable/Disable installation of matlab option(GTSAM_INSTALL_WRAP "Enable/Disable installation of wrap utility" ON) set(GTSAM_TOOLBOX_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/borg/toolbox CACHE DOCSTRING "Path to install matlab toolbox") +set(GTSAM_WRAP_HEADER_PATH ${PROJECT_SOURCE_DIR}/wrap CACHE DOCSTRING "Path to directory of matlab.h") # TODO: Check for matlab mex binary before handling building of binaries diff --git a/gtsam_unstable/base/Dummy.h b/gtsam_unstable/base/Dummy.h index ccf23af5d..995186cd6 100644 --- a/gtsam_unstable/base/Dummy.h +++ b/gtsam_unstable/base/Dummy.h @@ -33,6 +33,10 @@ namespace gtsam { std::cout << s << "Dummy " << id << std::endl; } + unsigned char dummyTwoVar(unsigned char a) const { + return a; + } + }; } // namespace gtsam diff --git a/gtsam_unstable/gtsam_unstable.h b/gtsam_unstable/gtsam_unstable.h index fda6ff8c4..c9d114d58 100644 --- a/gtsam_unstable/gtsam_unstable.h +++ b/gtsam_unstable/gtsam_unstable.h @@ -14,6 +14,7 @@ namespace gtsam { class Dummy { Dummy(); void print(string s) const; + unsigned char dummyTwoVar(unsigned char a) const; }; #include diff --git a/matlab/tests/testOdometryExample.m b/matlab/tests/testOdometryExample.m index 0056a43e8..634c52799 100644 --- a/matlab/tests/testOdometryExample.m +++ b/matlab/tests/testOdometryExample.m @@ -33,8 +33,8 @@ initialEstimate.insertPose(3, gtsamPose2(4.1, 0.1, 0.1)); %% Optimize using Levenberg-Marquardt optimization with an ordering from colamd result = graph.optimize(initialEstimate,0); marginals = graph.marginals(result); -marginals.marginalCovariance(i); +marginals.marginalCovariance(1); %% Check first pose equality -pose_i = result.pose(1); -CHECK('pose_1.equals(gtsamPose2,1e-4)',pose_1.equals(gtsamPose2,1e-4)); \ No newline at end of file +pose_1 = result.pose(1); +CHECK('pose_1.equals(gtsamPose2,1e-4)',pose_1.equals(gtsamPose2,1e-4));