diff --git a/.cproject b/.cproject
index e5b781d91..2616f38a8 100644
--- a/.cproject
+++ b/.cproject
@@ -375,14 +375,6 @@
true
true
-
- make
- -j2
- testGaussianFactor.run
- true
- true
- true
-
make
-j2
@@ -409,6 +401,7 @@
make
+
tests/testBayesTree.run
true
false
@@ -416,6 +409,7 @@
make
+
testBinaryBayesNet.run
true
false
@@ -463,6 +457,7 @@
make
+
testSymbolicBayesNet.run
true
false
@@ -470,6 +465,7 @@
make
+
tests/testSymbolicFactor.run
true
false
@@ -477,6 +473,7 @@
make
+
testSymbolicFactorGraph.run
true
false
@@ -492,11 +489,20 @@
make
+
tests/testBayesTree
true
false
true
+
+ make
+ -j2
+ testGaussianFactor.run
+ true
+ true
+ true
+
make
-j2
@@ -523,7 +529,6 @@
make
-
testGraph.run
true
false
@@ -595,7 +600,6 @@
make
-
testInference.run
true
false
@@ -603,7 +607,6 @@
make
-
testGaussianFactor.run
true
false
@@ -611,7 +614,6 @@
make
-
testJunctionTree.run
true
false
@@ -619,7 +621,6 @@
make
-
testSymbolicBayesNet.run
true
false
@@ -627,7 +628,6 @@
make
-
testSymbolicFactorGraph.run
true
false
@@ -721,7 +721,15 @@
true
true
-
+
+ make
+ -j2
+ all
+ true
+ true
+ true
+
+
make
-j2
check
@@ -729,6 +737,14 @@
true
true
+
+ make
+ -j2
+ clean
+ true
+ true
+ true
+
make
-j2
@@ -777,15 +793,7 @@
true
true
-
- make
- -j2
- all
- true
- true
- true
-
-
+
make
-j2
check
@@ -793,14 +801,6 @@
true
true
-
- make
- -j2
- clean
- true
- true
- true
-
make
-j2
@@ -913,10 +913,10 @@
true
true
-
+
make
-j2
- testTupleConfig.run
+ testTupleValues.run
true
true
true
@@ -1115,6 +1115,7 @@
make
+
testErrors.run
true
false
@@ -1514,7 +1515,6 @@
make
-
testSimulated2DOriented.run
true
false
@@ -1554,7 +1554,6 @@
make
-
testSimulated2D.run
true
false
@@ -1562,7 +1561,6 @@
make
-
testSimulated3D.run
true
false
@@ -1754,7 +1752,6 @@
make
-
tests/testGaussianISAM2
true
false
@@ -1776,6 +1773,46 @@
true
true
+
+ make
+ -j2
+ install
+ true
+ true
+ true
+
+
+ make
+ -j2
+ clean
+ true
+ true
+ true
+
+
+ make
+ -j2
+ check
+ true
+ true
+ true
+
+
+ make
+ -j2
+ all
+ true
+ true
+ true
+
+
+ make
+ -j2
+ dist
+ true
+ true
+ true
+
make
-j2
@@ -1872,62 +1909,6 @@
true
true
-
- make
- -j2
- install
- true
- true
- true
-
-
- make
- -j2
- clean
- true
- true
- true
-
-
- make
- -j2
- check
- true
- true
- true
-
-
- make
- -j2
- all
- true
- true
- true
-
-
- make
- -j2
- dist
- true
- true
- true
-
-
- make
- -j2
- check
- true
- true
- true
-
-
- make
- -j2
- install
- true
- true
- true
-
make
-j2
@@ -1968,6 +1949,22 @@
true
true
+
+ make
+ -j2
+ check
+ true
+ true
+ true
+
+
+ make
+ -j2
+ install
+ true
+ true
+ true
+
diff --git a/gtsam/slam/PlanarSLAMGraph.h b/gtsam/slam/PlanarSLAMGraph.h
index ae1681fde..e1db5a3e5 100644
--- a/gtsam/slam/PlanarSLAMGraph.h
+++ b/gtsam/slam/PlanarSLAMGraph.h
@@ -19,7 +19,7 @@
#include
#include
-// #include
+#include
namespace gtsam {
diff --git a/gtsam/slam/planarSLAM.cpp b/gtsam/slam/planarSLAM.cpp
index e189928f4..52030992e 100644
--- a/gtsam/slam/planarSLAM.cpp
+++ b/gtsam/slam/planarSLAM.cpp
@@ -18,7 +18,7 @@
#include
#include
#include
-#include
+//#include
#include
// Use planarSLAM namespace for specific SLAM instance
@@ -26,6 +26,7 @@ namespace gtsam {
using namespace planarSLAM;
INSTANTIATE_LIE_VALUES(PointKey)
+ INSTANTIATE_LIE_VALUES(PoseKey)
INSTANTIATE_TUPLE_VALUES2(PoseValues, PointValues)
INSTANTIATE_NONLINEAR_FACTOR_GRAPH(Values)
INSTANTIATE_NONLINEAR_OPTIMIZER(Graph, Values)
diff --git a/gtsam/slam/planarSLAM.h b/gtsam/slam/planarSLAM.h
index bfb6d482d..840c7adae 100644
--- a/gtsam/slam/planarSLAM.h
+++ b/gtsam/slam/planarSLAM.h
@@ -58,6 +58,11 @@ namespace gtsam {
TupleValues2(values) {
}
+ /// Copy constructor - FIXME: shouldn't need to exist
+ Values(const TupleValues2::Base& values) :
+ TupleValues2(values) {
+ }
+
// Convenience for MATLAB wrapper, which does not allow for identically named methods
/// insert a pose
diff --git a/wrap/tests/expected/make_geometry.m b/wrap/tests/expected/make_geometry.m
index a266b2d6d..630e6465a 100644
--- a/wrap/tests/expected/make_geometry.m
+++ b/wrap/tests/expected/make_geometry.m
@@ -4,6 +4,7 @@ echo on
toolboxpath = pwd
addpath(toolboxpath);
+%% Point2
cd(toolboxpath)
mex -O5 new_Point2_.cpp
mex -O5 new_Point2_dd.cpp
@@ -13,12 +14,14 @@ mex -O5 x.cpp
mex -O5 y.cpp
mex -O5 dim.cpp
+%% Point3
cd(toolboxpath)
mex -O5 new_Point3_ddd.cpp
cd @Point3
mex -O5 norm.cpp
+%% Test
cd(toolboxpath)
mex -O5 new_Test_.cpp
diff --git a/wrap/tests/testWrap.cpp b/wrap/tests/testWrap.cpp
index 30a3a80c9..0650538a5 100644
--- a/wrap/tests/testWrap.cpp
+++ b/wrap/tests/testWrap.cpp
@@ -28,7 +28,7 @@ static bool verbose = false;
#ifdef TOPSRCDIR
static string topdir = TOPSRCDIR;
#else
-static string topdir = "penguin";
+static string topdir = "notarealdirectory"; // If TOPSRCDIR is not defined, we error
#endif
/* ************************************************************************* */