diff --git a/CppUnitLite/Makefile.am b/CppUnitLite/Makefile.am index 7767347c3..760b18bf5 100644 --- a/CppUnitLite/Makefile.am +++ b/CppUnitLite/Makefile.am @@ -8,6 +8,5 @@ sources = Failure.cpp SimpleString.cpp Test.cpp TestRegistry.cpp TestResult.cpp headers += $(sources:.cpp=.h) CppUnitLitedir = $(pkgincludedir)/CppUnitLite -CppUnitLite_HEADERS = $(headers) noinst_LIBRARIES = libCppUnitLite.a libCppUnitLite_a_SOURCES = $(sources) diff --git a/Makefile.am b/Makefile.am index 51fb6f1a3..eec521075 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,37 +11,8 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign nostdinc # All the sub-directories that need to be built -SUBDIRS = CppUnitLite base geometry inference linear nonlinear slam . tests wrap examples - -# And the corresponding libraries produced -SUBLIBS = base/libbase.la geometry/libgeometry.la inference/libinference.la \ - linear/liblinear.la nonlinear/libnonlinear.la slam/libslam.la - -# TODO: UFconfig, CCOLAMD, and LDL automake magic without adding or touching any file -# in those directories as to not invalidate the LGPL license -# See some possibilities in -# http://www.gnu.org/software/hello/manual/automake/Third_002dParty-Makefiles.html - -# The following lines specify the actual shared library to be built with libtool -lib_LTLIBRARIES = libgtsam.la -libgtsam_la_SOURCES = -nodist_EXTRA_libgtsam_la_SOURCES = dummy.cxx -libgtsam_la_LIBADD = $(SUBLIBS) -L$(CCOLAMDLib) $(BOOST_LDFLAGS) -lccolamd -libgtsam_la_LDFLAGS = -no-undefined -version-info 0:0:0 - -if USE_ACCELERATE_MACOS -libgtsam_la_LDFLAGS += -Wl,/System/Library/Frameworks/Accelerate.framework/Accelerate -endif +SUBDIRS = CppUnitLite gtsam tests examples # Add these files to make sure they're in the distribution -noinst_HEADERS = gtsam.h EXTRA_DIST = autogen.sh configure.ac THANKS -# Todo: Also do CppUnitLite with automake -dist-hook: - mkdir $(distdir)/config - mkdir $(distdir)/matlab - cp -p $(srcdir)/matlab/*.m $(distdir)/matlab - cp -r $(srcdir)/wrap/expected $(distdir)/wrap - - diff --git a/configure.ac b/configure.ac index 054dc152e..e317ab40a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,18 +4,16 @@ AC_PREREQ(2.59) AC_INIT(gtsam, 0.9.0, dellaert@cc.gatech.edu) AM_INIT_AUTOMAKE(gtsam, 0.9.0) -AC_OUTPUT(Makefile CppUnitLite/Makefile base/Makefile inference/Makefile linear/Makefile geometry/Makefile nonlinear/Makefile slam/Makefile tests/Makefile wrap/Makefile examples/Makefile examples/vSLAMexample/Makefile) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_SRCDIR([CppUnitLite/Test.cpp]) -AC_CONFIG_SRCDIR([base/DSFVector.cpp]) -AC_CONFIG_SRCDIR([geometry/Cal3_S2.cpp]) -AC_CONFIG_SRCDIR([inference/SymbolicFactorGraph.cpp]) -AC_CONFIG_SRCDIR([linear/GaussianFactor.cpp]) -AC_CONFIG_SRCDIR([nonlinear/NonlinearOptimizer.cpp]) -AC_CONFIG_SRCDIR([slam/pose2SLAM.cpp]) +AC_CONFIG_SRCDIR([gtsam/base/DSFVector.cpp]) +AC_CONFIG_SRCDIR([gtsam/geometry/Cal3_S2.cpp]) +AC_CONFIG_SRCDIR([gtsam/inference/SymbolicFactorGraph.cpp]) +AC_CONFIG_SRCDIR([gtsam/linear/GaussianFactor.cpp]) +AC_CONFIG_SRCDIR([gtsam/nonlinear/NonlinearOptimizer.cpp]) +AC_CONFIG_SRCDIR([gtsam/slam/pose2SLAM.cpp]) AC_CONFIG_SRCDIR([tests/testSQP.cpp]) -AC_CONFIG_SRCDIR([wrap/wrap.cpp]) AC_CONFIG_SRCDIR([examples/SimpleRotation.cpp]) # Check for OS @@ -169,4 +167,13 @@ AC_ARG_WITH([ccolamd-lib], [CCOLAMDLib=${HOME}/lib]) AC_SUBST([CCOLAMDLib]) +# For now we require blas, atlas, and lapack +#AM_COND_IF([test x$ISMAC = xtrue], +# [LINALG_CPPFLAGS="-I/System/Library/Frameworks/vecLib.framework/Headers ${CCOLAMDInc} -DGT_USE_LAPACK"], +# [LINALG_CPPFLAGS="${CCOLAMDInc} -DGT_USE_LAPACK"]) +#AM_COND_IF([test x$ISMAC = xtrue], +# [LINALG_LDFLAGS="-Wl,/System/Library/Frameworks/Accelerate.framework/Accelerate ${CCOLAMDLib}"], +# [LINALG_LDFLAGS="-lcblas -latlas -llapack ${CCOLAMDLib}"]) + +AC_CONFIG_FILES([CppUnitLite/Makefile gtsam/base/Makefile gtsam/geometry/Makefile gtsam/inference/Makefile gtsam/linear/Makefile gtsam/nonlinear/Makefile gtsam/slam/Makefile gtsam/Makefile tests/Makefile examples/Makefile Makefile]) AC_OUTPUT diff --git a/examples/Makefile.am b/examples/Makefile.am index f128cc40f..1be114f5c 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -22,9 +22,9 @@ noinst_PROGRAMS += Pose2SLAMwSPCG_advanced # Solves a simple Pose2 SLAM examp #---------------------------------------------------------------------------------------------------- # rules to build local programs #---------------------------------------------------------------------------------------------------- -AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/.. +AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir) AM_LDFLAGS = $(BOOST_LDFLAGS) -LDADD = ../libgtsam.la +LDADD = ../gtsam/libgtsam.la AM_DEFAULT_SOURCE_EXT = .cpp # rule to run an executable diff --git a/examples/vSLAMexample/Makefile.am b/examples/vSLAMexample/Makefile.am index 0524ce704..43c864754 100644 --- a/examples/vSLAMexample/Makefile.am +++ b/examples/vSLAMexample/Makefile.am @@ -23,7 +23,7 @@ vISAMexample_SOURCES = vISAMexample.cpp Feature2D.cpp vSLAMutils.cpp #---------------------------------------------------------------------------------------------------- AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/.. AM_LDFLAGS = $(BOOST_LDFLAGS) -LDADD = ../../libgtsam.la +LDADD = ../../gtsam/libgtsam.la AM_DEFAULT_SOURCE_EXT = .cpp diff --git a/base/BTree.h b/gtsam/base/BTree.h similarity index 100% rename from base/BTree.h rename to gtsam/base/BTree.h diff --git a/base/DSF.h b/gtsam/base/DSF.h similarity index 100% rename from base/DSF.h rename to gtsam/base/DSF.h diff --git a/base/DSFVector.cpp b/gtsam/base/DSFVector.cpp similarity index 100% rename from base/DSFVector.cpp rename to gtsam/base/DSFVector.cpp diff --git a/base/DSFVector.h b/gtsam/base/DSFVector.h similarity index 100% rename from base/DSFVector.h rename to gtsam/base/DSFVector.h diff --git a/base/DenseQR.cpp b/gtsam/base/DenseQR.cpp similarity index 100% rename from base/DenseQR.cpp rename to gtsam/base/DenseQR.cpp diff --git a/base/DenseQR.h b/gtsam/base/DenseQR.h similarity index 100% rename from base/DenseQR.h rename to gtsam/base/DenseQR.h diff --git a/base/DenseQRUtil.cpp b/gtsam/base/DenseQRUtil.cpp similarity index 100% rename from base/DenseQRUtil.cpp rename to gtsam/base/DenseQRUtil.cpp diff --git a/base/DenseQRUtil.h b/gtsam/base/DenseQRUtil.h similarity index 100% rename from base/DenseQRUtil.h rename to gtsam/base/DenseQRUtil.h diff --git a/base/FastList.h b/gtsam/base/FastList.h similarity index 100% rename from base/FastList.h rename to gtsam/base/FastList.h diff --git a/base/FastMap.h b/gtsam/base/FastMap.h similarity index 100% rename from base/FastMap.h rename to gtsam/base/FastMap.h diff --git a/base/FastSet.h b/gtsam/base/FastSet.h similarity index 100% rename from base/FastSet.h rename to gtsam/base/FastSet.h diff --git a/base/FixedVector.h b/gtsam/base/FixedVector.h similarity index 100% rename from base/FixedVector.h rename to gtsam/base/FixedVector.h diff --git a/base/Lie-inl.h b/gtsam/base/Lie-inl.h similarity index 100% rename from base/Lie-inl.h rename to gtsam/base/Lie-inl.h diff --git a/base/Lie.h b/gtsam/base/Lie.h similarity index 100% rename from base/Lie.h rename to gtsam/base/Lie.h diff --git a/base/LieScalar.h b/gtsam/base/LieScalar.h similarity index 100% rename from base/LieScalar.h rename to gtsam/base/LieScalar.h diff --git a/base/LieVector.cpp b/gtsam/base/LieVector.cpp similarity index 100% rename from base/LieVector.cpp rename to gtsam/base/LieVector.cpp diff --git a/base/LieVector.h b/gtsam/base/LieVector.h similarity index 100% rename from base/LieVector.h rename to gtsam/base/LieVector.h diff --git a/base/Makefile.am b/gtsam/base/Makefile.am similarity index 96% rename from base/Makefile.am rename to gtsam/base/Makefile.am index 4086a62af..61db190b3 100644 --- a/base/Makefile.am +++ b/gtsam/base/Makefile.am @@ -50,7 +50,7 @@ base_HEADERS = $(headers) noinst_LTLIBRARIES = libbase.la libbase_la_SOURCES = $(sources) -AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/.. +AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir) AM_LDFLAGS = $(BOOST_LDFLAGS) if USE_BLAS @@ -68,7 +68,7 @@ endif TESTS = $(check_PROGRAMS) AM_DEFAULT_SOURCE_EXT = .cpp AM_LDFLAGS += $(boost_serialization) -L$(CCOLAMDLib) -lccolamd -LDADD = libbase.la ../CppUnitLite/libCppUnitLite.a +LDADD = libbase.la ../../CppUnitLite/libCppUnitLite.a if USE_BLAS_LINUX AM_LDFLAGS += -lcblas -latlas diff --git a/base/Matrix-inl.h b/gtsam/base/Matrix-inl.h similarity index 100% rename from base/Matrix-inl.h rename to gtsam/base/Matrix-inl.h diff --git a/base/Matrix.cpp b/gtsam/base/Matrix.cpp similarity index 100% rename from base/Matrix.cpp rename to gtsam/base/Matrix.cpp diff --git a/base/Matrix.h b/gtsam/base/Matrix.h similarity index 100% rename from base/Matrix.h rename to gtsam/base/Matrix.h diff --git a/base/Testable.h b/gtsam/base/Testable.h similarity index 100% rename from base/Testable.h rename to gtsam/base/Testable.h diff --git a/base/TestableAssertions.h b/gtsam/base/TestableAssertions.h similarity index 100% rename from base/TestableAssertions.h rename to gtsam/base/TestableAssertions.h diff --git a/base/Vector.cpp b/gtsam/base/Vector.cpp similarity index 100% rename from base/Vector.cpp rename to gtsam/base/Vector.cpp diff --git a/base/Vector.h b/gtsam/base/Vector.h similarity index 100% rename from base/Vector.h rename to gtsam/base/Vector.h diff --git a/base/blockMatrices.h b/gtsam/base/blockMatrices.h similarity index 100% rename from base/blockMatrices.h rename to gtsam/base/blockMatrices.h diff --git a/base/lieProxies.h b/gtsam/base/lieProxies.h similarity index 100% rename from base/lieProxies.h rename to gtsam/base/lieProxies.h diff --git a/base/numericalDerivative.h b/gtsam/base/numericalDerivative.h similarity index 100% rename from base/numericalDerivative.h rename to gtsam/base/numericalDerivative.h diff --git a/base/svdcmp.cpp b/gtsam/base/svdcmp.cpp similarity index 100% rename from base/svdcmp.cpp rename to gtsam/base/svdcmp.cpp diff --git a/base/svdcmp.h b/gtsam/base/svdcmp.h similarity index 100% rename from base/svdcmp.h rename to gtsam/base/svdcmp.h diff --git a/base/tests/testBTree.cpp b/gtsam/base/tests/testBTree.cpp similarity index 99% rename from base/tests/testBTree.cpp rename to gtsam/base/tests/testBTree.cpp index f5c1c5a8a..9343f00e7 100644 --- a/base/tests/testBTree.cpp +++ b/gtsam/base/tests/testBTree.cpp @@ -22,7 +22,7 @@ #include // for += using namespace boost::assign; -#include +#include #include using namespace std; diff --git a/base/tests/testDSF.cpp b/gtsam/base/tests/testDSF.cpp similarity index 99% rename from base/tests/testDSF.cpp rename to gtsam/base/tests/testDSF.cpp index 56dea529d..39d8d447e 100644 --- a/base/tests/testDSF.cpp +++ b/gtsam/base/tests/testDSF.cpp @@ -21,7 +21,7 @@ #include #include using namespace boost::assign; -#include +#include #include diff --git a/base/tests/testDSFVector.cpp b/gtsam/base/tests/testDSFVector.cpp similarity index 98% rename from base/tests/testDSFVector.cpp rename to gtsam/base/tests/testDSFVector.cpp index 6112a2ec6..abe3e1ac0 100644 --- a/base/tests/testDSFVector.cpp +++ b/gtsam/base/tests/testDSFVector.cpp @@ -21,7 +21,7 @@ #include #include using namespace boost::assign; -#include +#include #include diff --git a/base/tests/testDenseQRUtil.cpp b/gtsam/base/tests/testDenseQRUtil.cpp similarity index 99% rename from base/tests/testDenseQRUtil.cpp rename to gtsam/base/tests/testDenseQRUtil.cpp index 755be6e51..62ae6a7d7 100644 --- a/base/tests/testDenseQRUtil.cpp +++ b/gtsam/base/tests/testDenseQRUtil.cpp @@ -16,7 +16,7 @@ **/ #include -#include +#include #include using namespace std; diff --git a/base/tests/testFixedVector.cpp b/gtsam/base/tests/testFixedVector.cpp similarity index 98% rename from base/tests/testFixedVector.cpp rename to gtsam/base/tests/testFixedVector.cpp index 4f0e86131..85a963c89 100644 --- a/base/tests/testFixedVector.cpp +++ b/gtsam/base/tests/testFixedVector.cpp @@ -14,7 +14,7 @@ * @author Alex Cunningham */ -#include +#include #include diff --git a/base/tests/testLieScalar.cpp b/gtsam/base/tests/testLieScalar.cpp similarity index 96% rename from base/tests/testLieScalar.cpp rename to gtsam/base/tests/testLieScalar.cpp index 05ca2e8c7..87560780a 100644 --- a/base/tests/testLieScalar.cpp +++ b/gtsam/base/tests/testLieScalar.cpp @@ -14,7 +14,7 @@ * @author Kai Ni */ -#include +#include #include diff --git a/base/tests/testLieVector.cpp b/gtsam/base/tests/testLieVector.cpp similarity index 97% rename from base/tests/testLieVector.cpp rename to gtsam/base/tests/testLieVector.cpp index 6d5ad344a..02d0c2f07 100644 --- a/base/tests/testLieVector.cpp +++ b/gtsam/base/tests/testLieVector.cpp @@ -14,7 +14,7 @@ * @author Alex Cunningham */ -#include +#include #include diff --git a/base/tests/testMatrix.cpp b/gtsam/base/tests/testMatrix.cpp similarity index 99% rename from base/tests/testMatrix.cpp rename to gtsam/base/tests/testMatrix.cpp index e41956b28..60e61781a 100644 --- a/base/tests/testMatrix.cpp +++ b/gtsam/base/tests/testMatrix.cpp @@ -17,7 +17,7 @@ **/ #include -#include +#include #include #include #include diff --git a/base/tests/testVector.cpp b/gtsam/base/tests/testVector.cpp similarity index 99% rename from base/tests/testVector.cpp rename to gtsam/base/tests/testVector.cpp index 6fbbefc51..13339378f 100644 --- a/base/tests/testVector.cpp +++ b/gtsam/base/tests/testVector.cpp @@ -16,7 +16,7 @@ **/ #include -#include +#include #include #include diff --git a/base/tests/timeMatrix.cpp b/gtsam/base/tests/timeMatrix.cpp similarity index 100% rename from base/tests/timeMatrix.cpp rename to gtsam/base/tests/timeMatrix.cpp diff --git a/base/tests/timeublas.cpp b/gtsam/base/tests/timeublas.cpp similarity index 100% rename from base/tests/timeublas.cpp rename to gtsam/base/tests/timeublas.cpp diff --git a/base/timing.cpp b/gtsam/base/timing.cpp similarity index 100% rename from base/timing.cpp rename to gtsam/base/timing.cpp diff --git a/base/timing.h b/gtsam/base/timing.h similarity index 100% rename from base/timing.h rename to gtsam/base/timing.h diff --git a/base/types.h b/gtsam/base/types.h similarity index 100% rename from base/types.h rename to gtsam/base/types.h diff --git a/geometry/Cal3_S2.cpp b/gtsam/geometry/Cal3_S2.cpp similarity index 100% rename from geometry/Cal3_S2.cpp rename to gtsam/geometry/Cal3_S2.cpp diff --git a/geometry/Cal3_S2.h b/gtsam/geometry/Cal3_S2.h similarity index 100% rename from geometry/Cal3_S2.h rename to gtsam/geometry/Cal3_S2.h diff --git a/geometry/CalibratedCamera.cpp b/gtsam/geometry/CalibratedCamera.cpp similarity index 100% rename from geometry/CalibratedCamera.cpp rename to gtsam/geometry/CalibratedCamera.cpp diff --git a/geometry/CalibratedCamera.h b/gtsam/geometry/CalibratedCamera.h similarity index 100% rename from geometry/CalibratedCamera.h rename to gtsam/geometry/CalibratedCamera.h diff --git a/geometry/Makefile.am b/gtsam/geometry/Makefile.am similarity index 95% rename from geometry/Makefile.am rename to gtsam/geometry/Makefile.am index b58b92132..265200d6c 100644 --- a/geometry/Makefile.am +++ b/gtsam/geometry/Makefile.am @@ -41,7 +41,7 @@ geometrydir = $(pkgincludedir)/geometry geometry_HEADERS = $(headers) noinst_LTLIBRARIES = libgeometry.la libgeometry_la_SOURCES = $(sources) -AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/.. +AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir) AM_LDFLAGS = $(BOOST_LDFLAGS) #---------------------------------------------------------------------------------------------------- @@ -49,7 +49,7 @@ AM_LDFLAGS = $(BOOST_LDFLAGS) #---------------------------------------------------------------------------------------------------- TESTS = $(check_PROGRAMS) AM_LDFLAGS += $(boost_serialization) -LDADD = libgeometry.la ../base/libbase.la ../CppUnitLite/libCppUnitLite.a +LDADD = libgeometry.la ../base/libbase.la ../../CppUnitLite/libCppUnitLite.a AM_DEFAULT_SOURCE_EXT = .cpp if USE_ACCELERATE_MACOS diff --git a/geometry/Point2.cpp b/gtsam/geometry/Point2.cpp similarity index 100% rename from geometry/Point2.cpp rename to gtsam/geometry/Point2.cpp diff --git a/geometry/Point2.h b/gtsam/geometry/Point2.h similarity index 100% rename from geometry/Point2.h rename to gtsam/geometry/Point2.h diff --git a/geometry/Point3.cpp b/gtsam/geometry/Point3.cpp similarity index 100% rename from geometry/Point3.cpp rename to gtsam/geometry/Point3.cpp diff --git a/geometry/Point3.h b/gtsam/geometry/Point3.h similarity index 100% rename from geometry/Point3.h rename to gtsam/geometry/Point3.h diff --git a/geometry/Pose2.cpp b/gtsam/geometry/Pose2.cpp similarity index 100% rename from geometry/Pose2.cpp rename to gtsam/geometry/Pose2.cpp diff --git a/geometry/Pose2.h b/gtsam/geometry/Pose2.h similarity index 100% rename from geometry/Pose2.h rename to gtsam/geometry/Pose2.h diff --git a/geometry/Pose3.cpp b/gtsam/geometry/Pose3.cpp similarity index 100% rename from geometry/Pose3.cpp rename to gtsam/geometry/Pose3.cpp diff --git a/geometry/Pose3.h b/gtsam/geometry/Pose3.h similarity index 100% rename from geometry/Pose3.h rename to gtsam/geometry/Pose3.h diff --git a/geometry/Rot2.cpp b/gtsam/geometry/Rot2.cpp similarity index 100% rename from geometry/Rot2.cpp rename to gtsam/geometry/Rot2.cpp diff --git a/geometry/Rot2.h b/gtsam/geometry/Rot2.h similarity index 100% rename from geometry/Rot2.h rename to gtsam/geometry/Rot2.h diff --git a/geometry/Rot3.cpp b/gtsam/geometry/Rot3.cpp similarity index 100% rename from geometry/Rot3.cpp rename to gtsam/geometry/Rot3.cpp diff --git a/geometry/Rot3.h b/gtsam/geometry/Rot3.h similarity index 100% rename from geometry/Rot3.h rename to gtsam/geometry/Rot3.h diff --git a/geometry/SimpleCamera.cpp b/gtsam/geometry/SimpleCamera.cpp similarity index 100% rename from geometry/SimpleCamera.cpp rename to gtsam/geometry/SimpleCamera.cpp diff --git a/geometry/SimpleCamera.h b/gtsam/geometry/SimpleCamera.h similarity index 100% rename from geometry/SimpleCamera.h rename to gtsam/geometry/SimpleCamera.h diff --git a/geometry/StereoCamera.cpp b/gtsam/geometry/StereoCamera.cpp similarity index 100% rename from geometry/StereoCamera.cpp rename to gtsam/geometry/StereoCamera.cpp diff --git a/geometry/StereoCamera.h b/gtsam/geometry/StereoCamera.h similarity index 100% rename from geometry/StereoCamera.h rename to gtsam/geometry/StereoCamera.h diff --git a/geometry/StereoPoint2.cpp b/gtsam/geometry/StereoPoint2.cpp similarity index 100% rename from geometry/StereoPoint2.cpp rename to gtsam/geometry/StereoPoint2.cpp diff --git a/geometry/StereoPoint2.h b/gtsam/geometry/StereoPoint2.h similarity index 100% rename from geometry/StereoPoint2.h rename to gtsam/geometry/StereoPoint2.h diff --git a/geometry/Tensor1.h b/gtsam/geometry/Tensor1.h similarity index 100% rename from geometry/Tensor1.h rename to gtsam/geometry/Tensor1.h diff --git a/geometry/Tensor1Expression.h b/gtsam/geometry/Tensor1Expression.h similarity index 100% rename from geometry/Tensor1Expression.h rename to gtsam/geometry/Tensor1Expression.h diff --git a/geometry/Tensor2.h b/gtsam/geometry/Tensor2.h similarity index 100% rename from geometry/Tensor2.h rename to gtsam/geometry/Tensor2.h diff --git a/geometry/Tensor2Expression.h b/gtsam/geometry/Tensor2Expression.h similarity index 100% rename from geometry/Tensor2Expression.h rename to gtsam/geometry/Tensor2Expression.h diff --git a/geometry/Tensor3.h b/gtsam/geometry/Tensor3.h similarity index 100% rename from geometry/Tensor3.h rename to gtsam/geometry/Tensor3.h diff --git a/geometry/Tensor3Expression.h b/gtsam/geometry/Tensor3Expression.h similarity index 100% rename from geometry/Tensor3Expression.h rename to gtsam/geometry/Tensor3Expression.h diff --git a/geometry/Tensor4.h b/gtsam/geometry/Tensor4.h similarity index 100% rename from geometry/Tensor4.h rename to gtsam/geometry/Tensor4.h diff --git a/geometry/Tensor5.h b/gtsam/geometry/Tensor5.h similarity index 100% rename from geometry/Tensor5.h rename to gtsam/geometry/Tensor5.h diff --git a/geometry/Tensor5Expression.h b/gtsam/geometry/Tensor5Expression.h similarity index 100% rename from geometry/Tensor5Expression.h rename to gtsam/geometry/Tensor5Expression.h diff --git a/geometry/projectiveGeometry.cpp b/gtsam/geometry/projectiveGeometry.cpp similarity index 100% rename from geometry/projectiveGeometry.cpp rename to gtsam/geometry/projectiveGeometry.cpp diff --git a/geometry/projectiveGeometry.h b/gtsam/geometry/projectiveGeometry.h similarity index 100% rename from geometry/projectiveGeometry.h rename to gtsam/geometry/projectiveGeometry.h diff --git a/geometry/tensorInterface.cpp b/gtsam/geometry/tensorInterface.cpp similarity index 100% rename from geometry/tensorInterface.cpp rename to gtsam/geometry/tensorInterface.cpp diff --git a/geometry/tensorInterface.h b/gtsam/geometry/tensorInterface.h similarity index 100% rename from geometry/tensorInterface.h rename to gtsam/geometry/tensorInterface.h diff --git a/geometry/tensors.h b/gtsam/geometry/tensors.h similarity index 100% rename from geometry/tensors.h rename to gtsam/geometry/tensors.h diff --git a/geometry/tests/testCal3_S2.cpp b/gtsam/geometry/tests/testCal3_S2.cpp similarity index 98% rename from geometry/tests/testCal3_S2.cpp rename to gtsam/geometry/tests/testCal3_S2.cpp index 8c65418b6..d8a3ab33c 100644 --- a/geometry/tests/testCal3_S2.cpp +++ b/gtsam/geometry/tests/testCal3_S2.cpp @@ -14,7 +14,7 @@ * @brief Unit tests for transform derivatives */ -#include +#include #include #include diff --git a/geometry/tests/testCalibratedCamera.cpp b/gtsam/geometry/tests/testCalibratedCamera.cpp similarity index 98% rename from geometry/tests/testCalibratedCamera.cpp rename to gtsam/geometry/tests/testCalibratedCamera.cpp index 91d1095c8..e9821029c 100644 --- a/geometry/tests/testCalibratedCamera.cpp +++ b/gtsam/geometry/tests/testCalibratedCamera.cpp @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/geometry/tests/testFundamental.cpp b/gtsam/geometry/tests/testFundamental.cpp similarity index 97% rename from geometry/tests/testFundamental.cpp rename to gtsam/geometry/tests/testFundamental.cpp index 16078dd81..f5dd88409 100644 --- a/geometry/tests/testFundamental.cpp +++ b/gtsam/geometry/tests/testFundamental.cpp @@ -21,7 +21,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #include #include diff --git a/geometry/tests/testHomography2.cpp b/gtsam/geometry/tests/testHomography2.cpp similarity index 99% rename from geometry/tests/testHomography2.cpp rename to gtsam/geometry/tests/testHomography2.cpp index a23c92456..bb5a70b51 100644 --- a/geometry/tests/testHomography2.cpp +++ b/gtsam/geometry/tests/testHomography2.cpp @@ -21,7 +21,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #include #include diff --git a/geometry/tests/testPoint2.cpp b/gtsam/geometry/tests/testPoint2.cpp similarity index 97% rename from geometry/tests/testPoint2.cpp rename to gtsam/geometry/tests/testPoint2.cpp index 432e73489..30e2cf83e 100644 --- a/geometry/tests/testPoint2.cpp +++ b/gtsam/geometry/tests/testPoint2.cpp @@ -15,7 +15,7 @@ * @author Frank Dellaert **/ -#include +#include #include using namespace std; diff --git a/geometry/tests/testPoint3.cpp b/gtsam/geometry/tests/testPoint3.cpp similarity index 97% rename from geometry/tests/testPoint3.cpp rename to gtsam/geometry/tests/testPoint3.cpp index a7644beee..e59b4e93a 100644 --- a/geometry/tests/testPoint3.cpp +++ b/gtsam/geometry/tests/testPoint3.cpp @@ -14,7 +14,7 @@ * @brief Unit tests for Point3 class */ -#include +#include #include using namespace gtsam; diff --git a/geometry/tests/testPose2.cpp b/gtsam/geometry/tests/testPose2.cpp similarity index 99% rename from geometry/tests/testPose2.cpp rename to gtsam/geometry/tests/testPose2.cpp index be0c00ad2..1283859ee 100644 --- a/geometry/tests/testPose2.cpp +++ b/gtsam/geometry/tests/testPose2.cpp @@ -22,7 +22,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #include #include #include diff --git a/geometry/tests/testPose3.cpp b/gtsam/geometry/tests/testPose3.cpp similarity index 99% rename from geometry/tests/testPose3.cpp rename to gtsam/geometry/tests/testPose3.cpp index 627b156f8..a4933d6c9 100644 --- a/geometry/tests/testPose3.cpp +++ b/gtsam/geometry/tests/testPose3.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include #include diff --git a/geometry/tests/testRot2.cpp b/gtsam/geometry/tests/testRot2.cpp similarity index 98% rename from geometry/tests/testRot2.cpp rename to gtsam/geometry/tests/testRot2.cpp index 68a49d542..512afb620 100644 --- a/geometry/tests/testRot2.cpp +++ b/gtsam/geometry/tests/testRot2.cpp @@ -15,7 +15,7 @@ * @author Frank Dellaert */ -#include +#include #include #include diff --git a/geometry/tests/testRot3.cpp b/gtsam/geometry/tests/testRot3.cpp similarity index 99% rename from geometry/tests/testRot3.cpp rename to gtsam/geometry/tests/testRot3.cpp index e65ab1b2f..ab51034a6 100644 --- a/geometry/tests/testRot3.cpp +++ b/gtsam/geometry/tests/testRot3.cpp @@ -15,7 +15,7 @@ * @author Alireza Fathi */ -#include +#include #include #include #include diff --git a/geometry/tests/testSimpleCamera.cpp b/gtsam/geometry/tests/testSimpleCamera.cpp similarity index 98% rename from geometry/tests/testSimpleCamera.cpp rename to gtsam/geometry/tests/testSimpleCamera.cpp index 6602460e8..bed501691 100644 --- a/geometry/tests/testSimpleCamera.cpp +++ b/gtsam/geometry/tests/testSimpleCamera.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/geometry/tests/testStereoCamera.cpp b/gtsam/geometry/tests/testStereoCamera.cpp similarity index 98% rename from geometry/tests/testStereoCamera.cpp rename to gtsam/geometry/tests/testStereoCamera.cpp index 128b450ae..0e57131e6 100644 --- a/geometry/tests/testStereoCamera.cpp +++ b/gtsam/geometry/tests/testStereoCamera.cpp @@ -16,7 +16,7 @@ * @author Chris Beall */ -#include +#include #include #include diff --git a/geometry/tests/testTensors.cpp b/gtsam/geometry/tests/testTensors.cpp similarity index 99% rename from geometry/tests/testTensors.cpp rename to gtsam/geometry/tests/testTensors.cpp index 45153aa44..dc96534ad 100644 --- a/geometry/tests/testTensors.cpp +++ b/gtsam/geometry/tests/testTensors.cpp @@ -21,7 +21,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #include #include diff --git a/geometry/tests/timeCalibratedCamera.cpp b/gtsam/geometry/tests/timeCalibratedCamera.cpp similarity index 100% rename from geometry/tests/timeCalibratedCamera.cpp rename to gtsam/geometry/tests/timeCalibratedCamera.cpp diff --git a/geometry/tests/timeRot3.cpp b/gtsam/geometry/tests/timeRot3.cpp similarity index 100% rename from geometry/tests/timeRot3.cpp rename to gtsam/geometry/tests/timeRot3.cpp diff --git a/inference/.cvsignore b/gtsam/inference/.cvsignore similarity index 100% rename from inference/.cvsignore rename to gtsam/inference/.cvsignore diff --git a/inference/BayesNet-inl.h b/gtsam/inference/BayesNet-inl.h similarity index 100% rename from inference/BayesNet-inl.h rename to gtsam/inference/BayesNet-inl.h diff --git a/inference/BayesNet.h b/gtsam/inference/BayesNet.h similarity index 100% rename from inference/BayesNet.h rename to gtsam/inference/BayesNet.h diff --git a/inference/BayesTree-inl.h b/gtsam/inference/BayesTree-inl.h similarity index 100% rename from inference/BayesTree-inl.h rename to gtsam/inference/BayesTree-inl.h diff --git a/inference/BayesTree.h b/gtsam/inference/BayesTree.h similarity index 100% rename from inference/BayesTree.h rename to gtsam/inference/BayesTree.h diff --git a/inference/ClusterTree-inl.h b/gtsam/inference/ClusterTree-inl.h similarity index 100% rename from inference/ClusterTree-inl.h rename to gtsam/inference/ClusterTree-inl.h diff --git a/inference/ClusterTree.h b/gtsam/inference/ClusterTree.h similarity index 100% rename from inference/ClusterTree.h rename to gtsam/inference/ClusterTree.h diff --git a/inference/ConditionalBase.h b/gtsam/inference/ConditionalBase.h similarity index 100% rename from inference/ConditionalBase.h rename to gtsam/inference/ConditionalBase.h diff --git a/inference/Doxyfile b/gtsam/inference/Doxyfile similarity index 100% rename from inference/Doxyfile rename to gtsam/inference/Doxyfile diff --git a/inference/EliminationTree-inl.h b/gtsam/inference/EliminationTree-inl.h similarity index 100% rename from inference/EliminationTree-inl.h rename to gtsam/inference/EliminationTree-inl.h diff --git a/inference/EliminationTree.h b/gtsam/inference/EliminationTree.h similarity index 100% rename from inference/EliminationTree.h rename to gtsam/inference/EliminationTree.h diff --git a/inference/FactorBase-inl.h b/gtsam/inference/FactorBase-inl.h similarity index 100% rename from inference/FactorBase-inl.h rename to gtsam/inference/FactorBase-inl.h diff --git a/inference/FactorBase.h b/gtsam/inference/FactorBase.h similarity index 100% rename from inference/FactorBase.h rename to gtsam/inference/FactorBase.h diff --git a/inference/FactorGraph-inl.h b/gtsam/inference/FactorGraph-inl.h similarity index 100% rename from inference/FactorGraph-inl.h rename to gtsam/inference/FactorGraph-inl.h diff --git a/inference/FactorGraph.h b/gtsam/inference/FactorGraph.h similarity index 100% rename from inference/FactorGraph.h rename to gtsam/inference/FactorGraph.h diff --git a/inference/GenericMultifrontalSolver-inl.h b/gtsam/inference/GenericMultifrontalSolver-inl.h similarity index 100% rename from inference/GenericMultifrontalSolver-inl.h rename to gtsam/inference/GenericMultifrontalSolver-inl.h diff --git a/inference/GenericMultifrontalSolver.h b/gtsam/inference/GenericMultifrontalSolver.h similarity index 100% rename from inference/GenericMultifrontalSolver.h rename to gtsam/inference/GenericMultifrontalSolver.h diff --git a/inference/GenericSequentialSolver-inl.h b/gtsam/inference/GenericSequentialSolver-inl.h similarity index 100% rename from inference/GenericSequentialSolver-inl.h rename to gtsam/inference/GenericSequentialSolver-inl.h diff --git a/inference/GenericSequentialSolver.h b/gtsam/inference/GenericSequentialSolver.h similarity index 100% rename from inference/GenericSequentialSolver.h rename to gtsam/inference/GenericSequentialSolver.h diff --git a/inference/ISAM-inl.h b/gtsam/inference/ISAM-inl.h similarity index 100% rename from inference/ISAM-inl.h rename to gtsam/inference/ISAM-inl.h diff --git a/inference/ISAM.h b/gtsam/inference/ISAM.h similarity index 100% rename from inference/ISAM.h rename to gtsam/inference/ISAM.h diff --git a/inference/IndexConditional.cpp b/gtsam/inference/IndexConditional.cpp similarity index 100% rename from inference/IndexConditional.cpp rename to gtsam/inference/IndexConditional.cpp diff --git a/inference/IndexConditional.h b/gtsam/inference/IndexConditional.h similarity index 100% rename from inference/IndexConditional.h rename to gtsam/inference/IndexConditional.h diff --git a/inference/IndexFactor.cpp b/gtsam/inference/IndexFactor.cpp similarity index 100% rename from inference/IndexFactor.cpp rename to gtsam/inference/IndexFactor.cpp diff --git a/inference/IndexFactor.h b/gtsam/inference/IndexFactor.h similarity index 100% rename from inference/IndexFactor.h rename to gtsam/inference/IndexFactor.h diff --git a/inference/JunctionTree-inl.h b/gtsam/inference/JunctionTree-inl.h similarity index 100% rename from inference/JunctionTree-inl.h rename to gtsam/inference/JunctionTree-inl.h diff --git a/inference/JunctionTree.h b/gtsam/inference/JunctionTree.h similarity index 100% rename from inference/JunctionTree.h rename to gtsam/inference/JunctionTree.h diff --git a/inference/Makefile.am b/gtsam/inference/Makefile.am similarity index 97% rename from inference/Makefile.am rename to gtsam/inference/Makefile.am index 99ae80a74..6e4f0abf9 100644 --- a/inference/Makefile.am +++ b/gtsam/inference/Makefile.am @@ -64,7 +64,7 @@ inferencedir = $(pkgincludedir)/inference inference_HEADERS = $(headers) noinst_LTLIBRARIES = libinference.la libinference_la_SOURCES = $(sources) -AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/.. +AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir) AM_LDFLAGS = $(BOOST_LDFLAGS) AM_CXXFLAGS = @@ -74,7 +74,7 @@ AM_CXXFLAGS = TESTS = $(check_PROGRAMS) AM_LDFLAGS += $(boost_serialization) LDADD = libinference.la ../base/libbase.la -LDADD += ../CppUnitLite/libCppUnitLite.a +LDADD += ../../CppUnitLite/libCppUnitLite.a AM_DEFAULT_SOURCE_EXT = .cpp if USE_ACCELERATE_MACOS diff --git a/inference/Permutation.cpp b/gtsam/inference/Permutation.cpp similarity index 100% rename from inference/Permutation.cpp rename to gtsam/inference/Permutation.cpp diff --git a/inference/Permutation.h b/gtsam/inference/Permutation.h similarity index 100% rename from inference/Permutation.h rename to gtsam/inference/Permutation.h diff --git a/inference/SymbolicFactorGraph.cpp b/gtsam/inference/SymbolicFactorGraph.cpp similarity index 100% rename from inference/SymbolicFactorGraph.cpp rename to gtsam/inference/SymbolicFactorGraph.cpp diff --git a/inference/SymbolicFactorGraph.h b/gtsam/inference/SymbolicFactorGraph.h similarity index 100% rename from inference/SymbolicFactorGraph.h rename to gtsam/inference/SymbolicFactorGraph.h diff --git a/inference/SymbolicMultifrontalSolver.cpp b/gtsam/inference/SymbolicMultifrontalSolver.cpp similarity index 100% rename from inference/SymbolicMultifrontalSolver.cpp rename to gtsam/inference/SymbolicMultifrontalSolver.cpp diff --git a/inference/SymbolicMultifrontalSolver.h b/gtsam/inference/SymbolicMultifrontalSolver.h similarity index 100% rename from inference/SymbolicMultifrontalSolver.h rename to gtsam/inference/SymbolicMultifrontalSolver.h diff --git a/inference/SymbolicSequentialSolver.cpp b/gtsam/inference/SymbolicSequentialSolver.cpp similarity index 100% rename from inference/SymbolicSequentialSolver.cpp rename to gtsam/inference/SymbolicSequentialSolver.cpp diff --git a/inference/SymbolicSequentialSolver.h b/gtsam/inference/SymbolicSequentialSolver.h similarity index 100% rename from inference/SymbolicSequentialSolver.h rename to gtsam/inference/SymbolicSequentialSolver.h diff --git a/inference/VariableIndex.cpp b/gtsam/inference/VariableIndex.cpp similarity index 100% rename from inference/VariableIndex.cpp rename to gtsam/inference/VariableIndex.cpp diff --git a/inference/VariableIndex.h b/gtsam/inference/VariableIndex.h similarity index 100% rename from inference/VariableIndex.h rename to gtsam/inference/VariableIndex.h diff --git a/inference/VariableSlots-inl.h b/gtsam/inference/VariableSlots-inl.h similarity index 100% rename from inference/VariableSlots-inl.h rename to gtsam/inference/VariableSlots-inl.h diff --git a/inference/VariableSlots.cpp b/gtsam/inference/VariableSlots.cpp similarity index 100% rename from inference/VariableSlots.cpp rename to gtsam/inference/VariableSlots.cpp diff --git a/inference/VariableSlots.h b/gtsam/inference/VariableSlots.h similarity index 100% rename from inference/VariableSlots.h rename to gtsam/inference/VariableSlots.h diff --git a/inference/graph-inl.h b/gtsam/inference/graph-inl.h similarity index 100% rename from inference/graph-inl.h rename to gtsam/inference/graph-inl.h diff --git a/inference/graph.h b/gtsam/inference/graph.h similarity index 100% rename from inference/graph.h rename to gtsam/inference/graph.h diff --git a/inference/inference-inl.h b/gtsam/inference/inference-inl.h similarity index 100% rename from inference/inference-inl.h rename to gtsam/inference/inference-inl.h diff --git a/inference/inference.cpp b/gtsam/inference/inference.cpp similarity index 100% rename from inference/inference.cpp rename to gtsam/inference/inference.cpp diff --git a/inference/inference.h b/gtsam/inference/inference.h similarity index 100% rename from inference/inference.h rename to gtsam/inference/inference.h diff --git a/inference/tests/testBayesTree.cpp b/gtsam/inference/tests/testBayesTree.cpp similarity index 99% rename from inference/tests/testBayesTree.cpp rename to gtsam/inference/tests/testBayesTree.cpp index fc3186247..727d5bfcd 100644 --- a/inference/tests/testBayesTree.cpp +++ b/gtsam/inference/tests/testBayesTree.cpp @@ -20,7 +20,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #include #include diff --git a/inference/tests/testBinaryBayesNet.cpp b/gtsam/inference/tests/testBinaryBayesNet.cpp similarity index 98% rename from inference/tests/testBinaryBayesNet.cpp rename to gtsam/inference/tests/testBinaryBayesNet.cpp index 8f499169c..26a48b4f4 100644 --- a/inference/tests/testBinaryBayesNet.cpp +++ b/gtsam/inference/tests/testBinaryBayesNet.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference/tests/testClusterTree.cpp b/gtsam/inference/tests/testClusterTree.cpp similarity index 96% rename from inference/tests/testClusterTree.cpp rename to gtsam/inference/tests/testClusterTree.cpp index c68ca70f2..7b47e23ae 100644 --- a/inference/tests/testClusterTree.cpp +++ b/gtsam/inference/tests/testClusterTree.cpp @@ -19,7 +19,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #include #include diff --git a/inference/tests/testConditional.cpp b/gtsam/inference/tests/testConditional.cpp similarity index 98% rename from inference/tests/testConditional.cpp rename to gtsam/inference/tests/testConditional.cpp index e0c232eec..4b1c39d8b 100644 --- a/inference/tests/testConditional.cpp +++ b/gtsam/inference/tests/testConditional.cpp @@ -19,7 +19,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #include #include diff --git a/inference/tests/testEliminationTree.cpp b/gtsam/inference/tests/testEliminationTree.cpp similarity index 98% rename from inference/tests/testEliminationTree.cpp rename to gtsam/inference/tests/testEliminationTree.cpp index c4c26d289..0a4d84fd7 100644 --- a/inference/tests/testEliminationTree.cpp +++ b/gtsam/inference/tests/testEliminationTree.cpp @@ -5,7 +5,7 @@ * @created Oct 14, 2010 */ -#include +#include #include #include diff --git a/inference/tests/testFactorGraph.cpp b/gtsam/inference/tests/testFactorGraph.cpp similarity index 98% rename from inference/tests/testFactorGraph.cpp rename to gtsam/inference/tests/testFactorGraph.cpp index e9d88df96..452c5cd53 100644 --- a/inference/tests/testFactorGraph.cpp +++ b/gtsam/inference/tests/testFactorGraph.cpp @@ -23,7 +23,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #define GTSAM_MAGIC_KEY #include diff --git a/inference/tests/testISAM.cpp b/gtsam/inference/tests/testISAM.cpp similarity index 99% rename from inference/tests/testISAM.cpp rename to gtsam/inference/tests/testISAM.cpp index 38b0d9e25..128d2871b 100644 --- a/inference/tests/testISAM.cpp +++ b/gtsam/inference/tests/testISAM.cpp @@ -19,7 +19,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #define GTSAM_MAGIC_KEY diff --git a/inference/tests/testJunctionTree.cpp b/gtsam/inference/tests/testJunctionTree.cpp similarity index 98% rename from inference/tests/testJunctionTree.cpp rename to gtsam/inference/tests/testJunctionTree.cpp index c3ec4dff7..5c0de817f 100644 --- a/inference/tests/testJunctionTree.cpp +++ b/gtsam/inference/tests/testJunctionTree.cpp @@ -20,7 +20,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #include #define GTSAM_MAGIC_KEY diff --git a/inference/tests/testOrdering.cpp b/gtsam/inference/tests/testOrdering.cpp similarity index 97% rename from inference/tests/testOrdering.cpp rename to gtsam/inference/tests/testOrdering.cpp index a01bf3060..b25593aa1 100644 --- a/inference/tests/testOrdering.cpp +++ b/gtsam/inference/tests/testOrdering.cpp @@ -17,7 +17,7 @@ #include // for operator += using namespace boost::assign; -#include +#include // Magically turn strings into Symbols #define GTSAM_MAGIC_KEY diff --git a/inference/tests/testSymbolicBayesNet.cpp b/gtsam/inference/tests/testSymbolicBayesNet.cpp similarity index 98% rename from inference/tests/testSymbolicBayesNet.cpp rename to gtsam/inference/tests/testSymbolicBayesNet.cpp index 3f1e42cba..ee365fc8d 100644 --- a/inference/tests/testSymbolicBayesNet.cpp +++ b/gtsam/inference/tests/testSymbolicBayesNet.cpp @@ -19,7 +19,7 @@ #include // for operator += using namespace boost::assign; -#include +#include //#define GTSAM_MAGIC_KEY diff --git a/inference/tests/testSymbolicFactor.cpp b/gtsam/inference/tests/testSymbolicFactor.cpp similarity index 97% rename from inference/tests/testSymbolicFactor.cpp rename to gtsam/inference/tests/testSymbolicFactor.cpp index 01090c3da..0c25a6179 100644 --- a/inference/tests/testSymbolicFactor.cpp +++ b/gtsam/inference/tests/testSymbolicFactor.cpp @@ -15,7 +15,7 @@ * @author Frank Dellaert */ -#include +#include #include #include #include diff --git a/inference/tests/testSymbolicFactorGraph.cpp b/gtsam/inference/tests/testSymbolicFactorGraph.cpp similarity index 99% rename from inference/tests/testSymbolicFactorGraph.cpp rename to gtsam/inference/tests/testSymbolicFactorGraph.cpp index 8450db72a..8c6ef44ce 100644 --- a/inference/tests/testSymbolicFactorGraph.cpp +++ b/gtsam/inference/tests/testSymbolicFactorGraph.cpp @@ -18,7 +18,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #include #include diff --git a/inference/tests/testVariableIndex.cpp b/gtsam/inference/tests/testVariableIndex.cpp similarity index 97% rename from inference/tests/testVariableIndex.cpp rename to gtsam/inference/tests/testVariableIndex.cpp index 58ea05a63..f5a6f03ef 100644 --- a/inference/tests/testVariableIndex.cpp +++ b/gtsam/inference/tests/testVariableIndex.cpp @@ -16,7 +16,7 @@ * @created Sep 26, 2010 */ -#include +#include #include #include diff --git a/inference/tests/testVariableSlots.cpp b/gtsam/inference/tests/testVariableSlots.cpp similarity index 97% rename from inference/tests/testVariableSlots.cpp rename to gtsam/inference/tests/testVariableSlots.cpp index 8c4f36b58..4d27587a5 100644 --- a/inference/tests/testVariableSlots.cpp +++ b/gtsam/inference/tests/testVariableSlots.cpp @@ -16,7 +16,7 @@ * @created Oct 5, 2010 */ -#include +#include #include #include diff --git a/inference/tests/timeSymbolMaps.cpp b/gtsam/inference/tests/timeSymbolMaps.cpp similarity index 100% rename from inference/tests/timeSymbolMaps.cpp rename to gtsam/inference/tests/timeSymbolMaps.cpp diff --git a/linear/BayesNetPreconditioner.cpp b/gtsam/linear/BayesNetPreconditioner.cpp similarity index 100% rename from linear/BayesNetPreconditioner.cpp rename to gtsam/linear/BayesNetPreconditioner.cpp diff --git a/linear/BayesNetPreconditioner.h b/gtsam/linear/BayesNetPreconditioner.h similarity index 100% rename from linear/BayesNetPreconditioner.h rename to gtsam/linear/BayesNetPreconditioner.h diff --git a/linear/ConjugateGradientSolver-inl.h b/gtsam/linear/ConjugateGradientSolver-inl.h similarity index 100% rename from linear/ConjugateGradientSolver-inl.h rename to gtsam/linear/ConjugateGradientSolver-inl.h diff --git a/linear/ConjugateGradientSolver.h b/gtsam/linear/ConjugateGradientSolver.h similarity index 100% rename from linear/ConjugateGradientSolver.h rename to gtsam/linear/ConjugateGradientSolver.h diff --git a/linear/Errors.cpp b/gtsam/linear/Errors.cpp similarity index 100% rename from linear/Errors.cpp rename to gtsam/linear/Errors.cpp diff --git a/linear/Errors.h b/gtsam/linear/Errors.h similarity index 100% rename from linear/Errors.h rename to gtsam/linear/Errors.h diff --git a/linear/GaussianBayesNet.cpp b/gtsam/linear/GaussianBayesNet.cpp similarity index 100% rename from linear/GaussianBayesNet.cpp rename to gtsam/linear/GaussianBayesNet.cpp diff --git a/linear/GaussianBayesNet.h b/gtsam/linear/GaussianBayesNet.h similarity index 100% rename from linear/GaussianBayesNet.h rename to gtsam/linear/GaussianBayesNet.h diff --git a/linear/GaussianConditional.cpp b/gtsam/linear/GaussianConditional.cpp similarity index 100% rename from linear/GaussianConditional.cpp rename to gtsam/linear/GaussianConditional.cpp diff --git a/linear/GaussianConditional.h b/gtsam/linear/GaussianConditional.h similarity index 100% rename from linear/GaussianConditional.h rename to gtsam/linear/GaussianConditional.h diff --git a/linear/GaussianFactor.cpp b/gtsam/linear/GaussianFactor.cpp similarity index 100% rename from linear/GaussianFactor.cpp rename to gtsam/linear/GaussianFactor.cpp diff --git a/linear/GaussianFactor.h b/gtsam/linear/GaussianFactor.h similarity index 100% rename from linear/GaussianFactor.h rename to gtsam/linear/GaussianFactor.h diff --git a/linear/GaussianFactorGraph.cpp b/gtsam/linear/GaussianFactorGraph.cpp similarity index 100% rename from linear/GaussianFactorGraph.cpp rename to gtsam/linear/GaussianFactorGraph.cpp diff --git a/linear/GaussianFactorGraph.h b/gtsam/linear/GaussianFactorGraph.h similarity index 100% rename from linear/GaussianFactorGraph.h rename to gtsam/linear/GaussianFactorGraph.h diff --git a/linear/GaussianFactorSet.h b/gtsam/linear/GaussianFactorSet.h similarity index 100% rename from linear/GaussianFactorSet.h rename to gtsam/linear/GaussianFactorSet.h diff --git a/linear/GaussianISAM.cpp b/gtsam/linear/GaussianISAM.cpp similarity index 100% rename from linear/GaussianISAM.cpp rename to gtsam/linear/GaussianISAM.cpp diff --git a/linear/GaussianISAM.h b/gtsam/linear/GaussianISAM.h similarity index 100% rename from linear/GaussianISAM.h rename to gtsam/linear/GaussianISAM.h diff --git a/linear/GaussianJunctionTree.cpp b/gtsam/linear/GaussianJunctionTree.cpp similarity index 100% rename from linear/GaussianJunctionTree.cpp rename to gtsam/linear/GaussianJunctionTree.cpp diff --git a/linear/GaussianJunctionTree.h b/gtsam/linear/GaussianJunctionTree.h similarity index 100% rename from linear/GaussianJunctionTree.h rename to gtsam/linear/GaussianJunctionTree.h diff --git a/linear/GaussianMultifrontalSolver.cpp b/gtsam/linear/GaussianMultifrontalSolver.cpp similarity index 100% rename from linear/GaussianMultifrontalSolver.cpp rename to gtsam/linear/GaussianMultifrontalSolver.cpp diff --git a/linear/GaussianMultifrontalSolver.h b/gtsam/linear/GaussianMultifrontalSolver.h similarity index 100% rename from linear/GaussianMultifrontalSolver.h rename to gtsam/linear/GaussianMultifrontalSolver.h diff --git a/linear/GaussianSequentialSolver.cpp b/gtsam/linear/GaussianSequentialSolver.cpp similarity index 100% rename from linear/GaussianSequentialSolver.cpp rename to gtsam/linear/GaussianSequentialSolver.cpp diff --git a/linear/GaussianSequentialSolver.h b/gtsam/linear/GaussianSequentialSolver.h similarity index 100% rename from linear/GaussianSequentialSolver.h rename to gtsam/linear/GaussianSequentialSolver.h diff --git a/linear/IterativeOptimizationParameters.h b/gtsam/linear/IterativeOptimizationParameters.h similarity index 100% rename from linear/IterativeOptimizationParameters.h rename to gtsam/linear/IterativeOptimizationParameters.h diff --git a/linear/IterativeSolver.h b/gtsam/linear/IterativeSolver.h similarity index 100% rename from linear/IterativeSolver.h rename to gtsam/linear/IterativeSolver.h diff --git a/linear/Makefile.am b/gtsam/linear/Makefile.am similarity index 96% rename from linear/Makefile.am rename to gtsam/linear/Makefile.am index 666c735b8..26299ba1b 100644 --- a/linear/Makefile.am +++ b/gtsam/linear/Makefile.am @@ -54,7 +54,7 @@ lineardir = $(pkgincludedir)/linear linear_HEADERS = $(headers) noinst_LTLIBRARIES = liblinear.la liblinear_la_SOURCES = $(sources) -AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/.. +AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir) AM_LDFLAGS = $(BOOST_LDFLAGS) AM_CXXFLAGS = @@ -64,7 +64,7 @@ AM_CXXFLAGS = TESTS = $(check_PROGRAMS) AM_LDFLAGS += $(boost_serialization) LDADD = liblinear.la ../inference/libinference.la ../base/libbase.la -LDADD += ../CppUnitLite/libCppUnitLite.a +LDADD += ../../CppUnitLite/libCppUnitLite.a AM_DEFAULT_SOURCE_EXT = .cpp if USE_ACCELERATE_MACOS diff --git a/linear/NoiseModel.cpp b/gtsam/linear/NoiseModel.cpp similarity index 100% rename from linear/NoiseModel.cpp rename to gtsam/linear/NoiseModel.cpp diff --git a/linear/NoiseModel.h b/gtsam/linear/NoiseModel.h similarity index 100% rename from linear/NoiseModel.h rename to gtsam/linear/NoiseModel.h diff --git a/linear/SharedDiagonal.h b/gtsam/linear/SharedDiagonal.h similarity index 100% rename from linear/SharedDiagonal.h rename to gtsam/linear/SharedDiagonal.h diff --git a/linear/SharedGaussian.h b/gtsam/linear/SharedGaussian.h similarity index 100% rename from linear/SharedGaussian.h rename to gtsam/linear/SharedGaussian.h diff --git a/linear/SubgraphPreconditioner.cpp b/gtsam/linear/SubgraphPreconditioner.cpp similarity index 100% rename from linear/SubgraphPreconditioner.cpp rename to gtsam/linear/SubgraphPreconditioner.cpp diff --git a/linear/SubgraphPreconditioner.h b/gtsam/linear/SubgraphPreconditioner.h similarity index 100% rename from linear/SubgraphPreconditioner.h rename to gtsam/linear/SubgraphPreconditioner.h diff --git a/linear/SubgraphSolver-inl.h b/gtsam/linear/SubgraphSolver-inl.h similarity index 100% rename from linear/SubgraphSolver-inl.h rename to gtsam/linear/SubgraphSolver-inl.h diff --git a/linear/SubgraphSolver.h b/gtsam/linear/SubgraphSolver.h similarity index 100% rename from linear/SubgraphSolver.h rename to gtsam/linear/SubgraphSolver.h diff --git a/linear/VectorBTree.cpp b/gtsam/linear/VectorBTree.cpp similarity index 100% rename from linear/VectorBTree.cpp rename to gtsam/linear/VectorBTree.cpp diff --git a/linear/VectorBTree.h b/gtsam/linear/VectorBTree.h similarity index 100% rename from linear/VectorBTree.h rename to gtsam/linear/VectorBTree.h diff --git a/linear/VectorMap.cpp b/gtsam/linear/VectorMap.cpp similarity index 100% rename from linear/VectorMap.cpp rename to gtsam/linear/VectorMap.cpp diff --git a/linear/VectorMap.h b/gtsam/linear/VectorMap.h similarity index 100% rename from linear/VectorMap.h rename to gtsam/linear/VectorMap.h diff --git a/linear/VectorValues.h b/gtsam/linear/VectorValues.h similarity index 100% rename from linear/VectorValues.h rename to gtsam/linear/VectorValues.h diff --git a/linear/iterative-inl.h b/gtsam/linear/iterative-inl.h similarity index 100% rename from linear/iterative-inl.h rename to gtsam/linear/iterative-inl.h diff --git a/linear/iterative.cpp b/gtsam/linear/iterative.cpp similarity index 100% rename from linear/iterative.cpp rename to gtsam/linear/iterative.cpp diff --git a/linear/iterative.h b/gtsam/linear/iterative.h similarity index 100% rename from linear/iterative.h rename to gtsam/linear/iterative.h diff --git a/linear/tests/testBayesNetPreconditioner.cpp b/gtsam/linear/tests/testBayesNetPreconditioner.cpp similarity index 98% rename from linear/tests/testBayesNetPreconditioner.cpp rename to gtsam/linear/tests/testBayesNetPreconditioner.cpp index 559268067..2621ad1f3 100644 --- a/linear/tests/testBayesNetPreconditioner.cpp +++ b/gtsam/linear/tests/testBayesNetPreconditioner.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #define GTSAM_MAGIC_KEY diff --git a/linear/tests/testErrors.cpp b/gtsam/linear/tests/testErrors.cpp similarity index 96% rename from linear/tests/testErrors.cpp rename to gtsam/linear/tests/testErrors.cpp index 85ecec110..6fbb5bcbf 100644 --- a/linear/tests/testErrors.cpp +++ b/gtsam/linear/tests/testErrors.cpp @@ -19,7 +19,7 @@ #include // for += using namespace boost::assign; -#include +#include #include using namespace std; diff --git a/linear/tests/testGaussianConditional.cpp b/gtsam/linear/tests/testGaussianConditional.cpp similarity index 99% rename from linear/tests/testGaussianConditional.cpp rename to gtsam/linear/tests/testGaussianConditional.cpp index da628ec8e..0c0185669 100644 --- a/linear/tests/testGaussianConditional.cpp +++ b/gtsam/linear/tests/testGaussianConditional.cpp @@ -15,7 +15,7 @@ * @author Christian Potthast **/ -#include +#include #include #ifdef HAVE_BOOST_SERIALIZATION diff --git a/linear/tests/testGaussianFactor.cpp b/gtsam/linear/tests/testGaussianFactor.cpp similarity index 99% rename from linear/tests/testGaussianFactor.cpp rename to gtsam/linear/tests/testGaussianFactor.cpp index e4d35b8ee..3344206d3 100644 --- a/linear/tests/testGaussianFactor.cpp +++ b/gtsam/linear/tests/testGaussianFactor.cpp @@ -26,7 +26,7 @@ using namespace boost::assign; #include -#include +#include //#define GTSAM_MAGIC_KEY diff --git a/linear/tests/testGaussianJunctionTree.cpp b/gtsam/linear/tests/testGaussianJunctionTree.cpp similarity index 98% rename from linear/tests/testGaussianJunctionTree.cpp rename to gtsam/linear/tests/testGaussianJunctionTree.cpp index 5e5b23f05..4f983f900 100644 --- a/linear/tests/testGaussianJunctionTree.cpp +++ b/gtsam/linear/tests/testGaussianJunctionTree.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include // for operator += diff --git a/linear/tests/testNoiseModel.cpp b/gtsam/linear/tests/testNoiseModel.cpp similarity index 99% rename from linear/tests/testNoiseModel.cpp rename to gtsam/linear/tests/testNoiseModel.cpp index 3d28f8a87..104c82e95 100644 --- a/linear/tests/testNoiseModel.cpp +++ b/gtsam/linear/tests/testNoiseModel.cpp @@ -17,7 +17,7 @@ * Author: Frank Dellaert */ -#include +#include #include #include diff --git a/linear/tests/testVectorBTree.cpp b/gtsam/linear/tests/testVectorBTree.cpp similarity index 99% rename from linear/tests/testVectorBTree.cpp rename to gtsam/linear/tests/testVectorBTree.cpp index b5b77f366..842f227c2 100644 --- a/linear/tests/testVectorBTree.cpp +++ b/gtsam/linear/tests/testVectorBTree.cpp @@ -30,7 +30,7 @@ using namespace boost::assign; // bring 'operator+=()' into scope #include #endif //HAVE_BOOST_SERIALIZATION -#include +#include #include #include diff --git a/linear/tests/testVectorMap.cpp b/gtsam/linear/tests/testVectorMap.cpp similarity index 99% rename from linear/tests/testVectorMap.cpp rename to gtsam/linear/tests/testVectorMap.cpp index 6adf9bcc7..e72dfadd5 100644 --- a/linear/tests/testVectorMap.cpp +++ b/gtsam/linear/tests/testVectorMap.cpp @@ -28,7 +28,7 @@ #define GTSAM_MAGIC_KEY -#include +#include #include #include diff --git a/linear/tests/testVectorValues.cpp b/gtsam/linear/tests/testVectorValues.cpp similarity index 99% rename from linear/tests/testVectorValues.cpp rename to gtsam/linear/tests/testVectorValues.cpp index 2a90a58fe..950fcd962 100644 --- a/linear/tests/testVectorValues.cpp +++ b/gtsam/linear/tests/testVectorValues.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include using namespace gtsam; using namespace std; diff --git a/linear/tests/timeFactorOverhead.cpp b/gtsam/linear/tests/timeFactorOverhead.cpp similarity index 100% rename from linear/tests/timeFactorOverhead.cpp rename to gtsam/linear/tests/timeFactorOverhead.cpp diff --git a/linear/tests/timeGaussianFactor.cpp b/gtsam/linear/tests/timeGaussianFactor.cpp similarity index 100% rename from linear/tests/timeGaussianFactor.cpp rename to gtsam/linear/tests/timeGaussianFactor.cpp diff --git a/linear/tests/timeSLAMlike.cpp b/gtsam/linear/tests/timeSLAMlike.cpp similarity index 100% rename from linear/tests/timeSLAMlike.cpp rename to gtsam/linear/tests/timeSLAMlike.cpp diff --git a/linear/tests/timeVectorValues.cpp b/gtsam/linear/tests/timeVectorValues.cpp similarity index 100% rename from linear/tests/timeVectorValues.cpp rename to gtsam/linear/tests/timeVectorValues.cpp diff --git a/nonlinear/Key.h b/gtsam/nonlinear/Key.h similarity index 100% rename from nonlinear/Key.h rename to gtsam/nonlinear/Key.h diff --git a/nonlinear/LieValues-inl.h b/gtsam/nonlinear/LieValues-inl.h similarity index 100% rename from nonlinear/LieValues-inl.h rename to gtsam/nonlinear/LieValues-inl.h diff --git a/nonlinear/LieValues.h b/gtsam/nonlinear/LieValues.h similarity index 100% rename from nonlinear/LieValues.h rename to gtsam/nonlinear/LieValues.h diff --git a/nonlinear/Makefile.am b/gtsam/nonlinear/Makefile.am similarity index 95% rename from nonlinear/Makefile.am rename to gtsam/nonlinear/Makefile.am index 6b871d53d..e07c5e63e 100644 --- a/nonlinear/Makefile.am +++ b/gtsam/nonlinear/Makefile.am @@ -40,7 +40,7 @@ nonlineardir = $(pkgincludedir)/nonlinear nonlinear_HEADERS = $(headers) noinst_LTLIBRARIES = libnonlinear.la libnonlinear_la_SOURCES = $(sources) -AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/.. +AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir) AM_LDFLAGS = $(BOOST_LDFLAGS) AM_CXXFLAGS = @@ -50,7 +50,7 @@ AM_CXXFLAGS = TESTS = $(check_PROGRAMS) AM_LDFLAGS += $(boost_serialization) LDADD = libnonlinear.la ../linear/liblinear.la ../inference/libinference.la ../base/libbase.la -LDADD += ../CppUnitLite/libCppUnitLite.a +LDADD += ../../CppUnitLite/libCppUnitLite.a AM_DEFAULT_SOURCE_EXT = .cpp if USE_ACCELERATE_MACOS diff --git a/nonlinear/NonlinearEquality.h b/gtsam/nonlinear/NonlinearEquality.h similarity index 100% rename from nonlinear/NonlinearEquality.h rename to gtsam/nonlinear/NonlinearEquality.h diff --git a/nonlinear/NonlinearFactor.h b/gtsam/nonlinear/NonlinearFactor.h similarity index 100% rename from nonlinear/NonlinearFactor.h rename to gtsam/nonlinear/NonlinearFactor.h diff --git a/nonlinear/NonlinearFactorGraph-inl.h b/gtsam/nonlinear/NonlinearFactorGraph-inl.h similarity index 100% rename from nonlinear/NonlinearFactorGraph-inl.h rename to gtsam/nonlinear/NonlinearFactorGraph-inl.h diff --git a/nonlinear/NonlinearFactorGraph.h b/gtsam/nonlinear/NonlinearFactorGraph.h similarity index 100% rename from nonlinear/NonlinearFactorGraph.h rename to gtsam/nonlinear/NonlinearFactorGraph.h diff --git a/nonlinear/NonlinearOptimization-inl.h b/gtsam/nonlinear/NonlinearOptimization-inl.h similarity index 100% rename from nonlinear/NonlinearOptimization-inl.h rename to gtsam/nonlinear/NonlinearOptimization-inl.h diff --git a/nonlinear/NonlinearOptimization.h b/gtsam/nonlinear/NonlinearOptimization.h similarity index 100% rename from nonlinear/NonlinearOptimization.h rename to gtsam/nonlinear/NonlinearOptimization.h diff --git a/nonlinear/NonlinearOptimizationParameters.h b/gtsam/nonlinear/NonlinearOptimizationParameters.h similarity index 100% rename from nonlinear/NonlinearOptimizationParameters.h rename to gtsam/nonlinear/NonlinearOptimizationParameters.h diff --git a/nonlinear/NonlinearOptimizer-inl.h b/gtsam/nonlinear/NonlinearOptimizer-inl.h similarity index 100% rename from nonlinear/NonlinearOptimizer-inl.h rename to gtsam/nonlinear/NonlinearOptimizer-inl.h diff --git a/nonlinear/NonlinearOptimizer.cpp b/gtsam/nonlinear/NonlinearOptimizer.cpp similarity index 100% rename from nonlinear/NonlinearOptimizer.cpp rename to gtsam/nonlinear/NonlinearOptimizer.cpp diff --git a/nonlinear/NonlinearOptimizer.h b/gtsam/nonlinear/NonlinearOptimizer.h similarity index 100% rename from nonlinear/NonlinearOptimizer.h rename to gtsam/nonlinear/NonlinearOptimizer.h diff --git a/nonlinear/Ordering.cpp b/gtsam/nonlinear/Ordering.cpp similarity index 100% rename from nonlinear/Ordering.cpp rename to gtsam/nonlinear/Ordering.cpp diff --git a/nonlinear/Ordering.h b/gtsam/nonlinear/Ordering.h similarity index 100% rename from nonlinear/Ordering.h rename to gtsam/nonlinear/Ordering.h diff --git a/nonlinear/TupleValues-inl.h b/gtsam/nonlinear/TupleValues-inl.h similarity index 100% rename from nonlinear/TupleValues-inl.h rename to gtsam/nonlinear/TupleValues-inl.h diff --git a/nonlinear/TupleValues.h b/gtsam/nonlinear/TupleValues.h similarity index 100% rename from nonlinear/TupleValues.h rename to gtsam/nonlinear/TupleValues.h diff --git a/nonlinear/tests/testKey.cpp b/gtsam/nonlinear/tests/testKey.cpp similarity index 98% rename from nonlinear/tests/testKey.cpp rename to gtsam/nonlinear/tests/testKey.cpp index 1c6785db6..1688fb03d 100644 --- a/nonlinear/tests/testKey.cpp +++ b/gtsam/nonlinear/tests/testKey.cpp @@ -17,7 +17,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #include using namespace std; diff --git a/nonlinear/tests/testLieValues.cpp b/gtsam/nonlinear/tests/testLieValues.cpp similarity index 99% rename from nonlinear/tests/testLieValues.cpp rename to gtsam/nonlinear/tests/testLieValues.cpp index 705bb3439..3c7850041 100644 --- a/nonlinear/tests/testLieValues.cpp +++ b/gtsam/nonlinear/tests/testLieValues.cpp @@ -14,7 +14,7 @@ * @author Richard Roberts */ -#include +#include #include #include #include // for operator += diff --git a/slam/BearingFactor.h b/gtsam/slam/BearingFactor.h similarity index 100% rename from slam/BearingFactor.h rename to gtsam/slam/BearingFactor.h diff --git a/slam/BearingRangeFactor.h b/gtsam/slam/BearingRangeFactor.h similarity index 100% rename from slam/BearingRangeFactor.h rename to gtsam/slam/BearingRangeFactor.h diff --git a/slam/BetweenFactor.h b/gtsam/slam/BetweenFactor.h similarity index 100% rename from slam/BetweenFactor.h rename to gtsam/slam/BetweenFactor.h diff --git a/slam/Makefile.am b/gtsam/slam/Makefile.am similarity index 96% rename from slam/Makefile.am rename to gtsam/slam/Makefile.am index 7de50db6c..7bca039cd 100644 --- a/slam/Makefile.am +++ b/gtsam/slam/Makefile.am @@ -59,7 +59,7 @@ slamdir = $(pkgincludedir)/slam slam_HEADERS = $(headers) noinst_LTLIBRARIES = libslam.la libslam_la_SOURCES = $(sources) -AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/.. +AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir) AM_LDFLAGS = $(BOOST_LDFLAGS) #---------------------------------------------------------------------------------------------------- @@ -69,7 +69,7 @@ TESTS = $(check_PROGRAMS) AM_DEFAULT_SOURCE_EXT = .cpp AM_LDFLAGS += $(boost_serialization) -L$(CCOLAMDLib) -lccolamd LDADD = libslam.la ../geometry/libgeometry.la ../nonlinear/libnonlinear.la ../linear/liblinear.la ../inference/libinference.la ../base/libbase.la -LDADD += ../CppUnitLite/libCppUnitLite.a +LDADD += ../../CppUnitLite/libCppUnitLite.a if USE_ACCELERATE_MACOS AM_LDFLAGS += -Wl,/System/Library/Frameworks/Accelerate.framework/Accelerate diff --git a/slam/Pose2SLAMOptimizer.cpp b/gtsam/slam/Pose2SLAMOptimizer.cpp similarity index 100% rename from slam/Pose2SLAMOptimizer.cpp rename to gtsam/slam/Pose2SLAMOptimizer.cpp diff --git a/slam/Pose2SLAMOptimizer.h b/gtsam/slam/Pose2SLAMOptimizer.h similarity index 100% rename from slam/Pose2SLAMOptimizer.h rename to gtsam/slam/Pose2SLAMOptimizer.h diff --git a/slam/PriorFactor.h b/gtsam/slam/PriorFactor.h similarity index 100% rename from slam/PriorFactor.h rename to gtsam/slam/PriorFactor.h diff --git a/slam/RangeFactor.h b/gtsam/slam/RangeFactor.h similarity index 100% rename from slam/RangeFactor.h rename to gtsam/slam/RangeFactor.h diff --git a/slam/Simulated2DMeasurement.h b/gtsam/slam/Simulated2DMeasurement.h similarity index 100% rename from slam/Simulated2DMeasurement.h rename to gtsam/slam/Simulated2DMeasurement.h diff --git a/slam/Simulated2DOdometry.h b/gtsam/slam/Simulated2DOdometry.h similarity index 100% rename from slam/Simulated2DOdometry.h rename to gtsam/slam/Simulated2DOdometry.h diff --git a/slam/Simulated2DOrientedOdometry.h b/gtsam/slam/Simulated2DOrientedOdometry.h similarity index 100% rename from slam/Simulated2DOrientedOdometry.h rename to gtsam/slam/Simulated2DOrientedOdometry.h diff --git a/slam/Simulated2DOrientedPosePrior.h b/gtsam/slam/Simulated2DOrientedPosePrior.h similarity index 100% rename from slam/Simulated2DOrientedPosePrior.h rename to gtsam/slam/Simulated2DOrientedPosePrior.h diff --git a/slam/Simulated2DOrientedValues.h b/gtsam/slam/Simulated2DOrientedValues.h similarity index 100% rename from slam/Simulated2DOrientedValues.h rename to gtsam/slam/Simulated2DOrientedValues.h diff --git a/slam/Simulated2DPointPrior.h b/gtsam/slam/Simulated2DPointPrior.h similarity index 100% rename from slam/Simulated2DPointPrior.h rename to gtsam/slam/Simulated2DPointPrior.h diff --git a/slam/Simulated2DPosePrior.h b/gtsam/slam/Simulated2DPosePrior.h similarity index 100% rename from slam/Simulated2DPosePrior.h rename to gtsam/slam/Simulated2DPosePrior.h diff --git a/slam/Simulated2DValues.h b/gtsam/slam/Simulated2DValues.h similarity index 100% rename from slam/Simulated2DValues.h rename to gtsam/slam/Simulated2DValues.h diff --git a/slam/Simulated3D.cpp b/gtsam/slam/Simulated3D.cpp similarity index 100% rename from slam/Simulated3D.cpp rename to gtsam/slam/Simulated3D.cpp diff --git a/slam/Simulated3D.h b/gtsam/slam/Simulated3D.h similarity index 100% rename from slam/Simulated3D.h rename to gtsam/slam/Simulated3D.h diff --git a/slam/dataset.cpp b/gtsam/slam/dataset.cpp similarity index 100% rename from slam/dataset.cpp rename to gtsam/slam/dataset.cpp diff --git a/slam/dataset.h b/gtsam/slam/dataset.h similarity index 100% rename from slam/dataset.h rename to gtsam/slam/dataset.h diff --git a/slam/planarSLAM.cpp b/gtsam/slam/planarSLAM.cpp similarity index 100% rename from slam/planarSLAM.cpp rename to gtsam/slam/planarSLAM.cpp diff --git a/slam/planarSLAM.h b/gtsam/slam/planarSLAM.h similarity index 100% rename from slam/planarSLAM.h rename to gtsam/slam/planarSLAM.h diff --git a/slam/pose2SLAM.cpp b/gtsam/slam/pose2SLAM.cpp similarity index 100% rename from slam/pose2SLAM.cpp rename to gtsam/slam/pose2SLAM.cpp diff --git a/slam/pose2SLAM.h b/gtsam/slam/pose2SLAM.h similarity index 100% rename from slam/pose2SLAM.h rename to gtsam/slam/pose2SLAM.h diff --git a/slam/pose3SLAM.cpp b/gtsam/slam/pose3SLAM.cpp similarity index 100% rename from slam/pose3SLAM.cpp rename to gtsam/slam/pose3SLAM.cpp diff --git a/slam/pose3SLAM.h b/gtsam/slam/pose3SLAM.h similarity index 100% rename from slam/pose3SLAM.h rename to gtsam/slam/pose3SLAM.h diff --git a/slam/saveGraph.cpp b/gtsam/slam/saveGraph.cpp similarity index 100% rename from slam/saveGraph.cpp rename to gtsam/slam/saveGraph.cpp diff --git a/slam/saveGraph.h b/gtsam/slam/saveGraph.h similarity index 100% rename from slam/saveGraph.h rename to gtsam/slam/saveGraph.h diff --git a/slam/simulated2D.cpp b/gtsam/slam/simulated2D.cpp similarity index 100% rename from slam/simulated2D.cpp rename to gtsam/slam/simulated2D.cpp diff --git a/slam/simulated2D.h b/gtsam/slam/simulated2D.h similarity index 100% rename from slam/simulated2D.h rename to gtsam/slam/simulated2D.h diff --git a/slam/simulated2DConstraints.h b/gtsam/slam/simulated2DConstraints.h similarity index 100% rename from slam/simulated2DConstraints.h rename to gtsam/slam/simulated2DConstraints.h diff --git a/slam/simulated2DOriented.cpp b/gtsam/slam/simulated2DOriented.cpp similarity index 100% rename from slam/simulated2DOriented.cpp rename to gtsam/slam/simulated2DOriented.cpp diff --git a/slam/simulated2DOriented.h b/gtsam/slam/simulated2DOriented.h similarity index 100% rename from slam/simulated2DOriented.h rename to gtsam/slam/simulated2DOriented.h diff --git a/slam/smallExample.cpp b/gtsam/slam/smallExample.cpp similarity index 100% rename from slam/smallExample.cpp rename to gtsam/slam/smallExample.cpp diff --git a/slam/smallExample.h b/gtsam/slam/smallExample.h similarity index 100% rename from slam/smallExample.h rename to gtsam/slam/smallExample.h diff --git a/slam/tests/testPlanarSLAM.cpp b/gtsam/slam/tests/testPlanarSLAM.cpp similarity index 98% rename from slam/tests/testPlanarSLAM.cpp rename to gtsam/slam/tests/testPlanarSLAM.cpp index c94f8991d..18b3abd85 100644 --- a/slam/tests/testPlanarSLAM.cpp +++ b/gtsam/slam/tests/testPlanarSLAM.cpp @@ -15,7 +15,7 @@ **/ #include -#include +#include #include #include diff --git a/slam/tests/testPose2Factor.cpp b/gtsam/slam/tests/testPose2Factor.cpp similarity index 99% rename from slam/tests/testPose2Factor.cpp rename to gtsam/slam/tests/testPose2Factor.cpp index bb976ccda..fd76e5485 100644 --- a/slam/tests/testPose2Factor.cpp +++ b/gtsam/slam/tests/testPose2Factor.cpp @@ -15,7 +15,7 @@ * @authors Frank Dellaert, Viorela Ila **/ -#include +#include #define GTSAM_MAGIC_KEY diff --git a/slam/tests/testPose2Prior.cpp b/gtsam/slam/tests/testPose2Prior.cpp similarity index 98% rename from slam/tests/testPose2Prior.cpp rename to gtsam/slam/tests/testPose2Prior.cpp index 6c2783cb2..50b7aee90 100644 --- a/slam/tests/testPose2Prior.cpp +++ b/gtsam/slam/tests/testPose2Prior.cpp @@ -15,7 +15,7 @@ * @authors Frank Dellaert, Viorela Ila **/ -#include +#include #define GTSAM_MAGIC_KEY diff --git a/slam/tests/testPose2SLAM.cpp b/gtsam/slam/tests/testPose2SLAM.cpp similarity index 99% rename from slam/tests/testPose2SLAM.cpp rename to gtsam/slam/tests/testPose2SLAM.cpp index eb7bde567..c6d984fd6 100644 --- a/slam/tests/testPose2SLAM.cpp +++ b/gtsam/slam/tests/testPose2SLAM.cpp @@ -20,7 +20,7 @@ using namespace boost; using namespace boost::assign; -#include +#include #define GTSAM_MAGIC_KEY diff --git a/slam/tests/testPose2Values.cpp b/gtsam/slam/tests/testPose2Values.cpp similarity index 98% rename from slam/tests/testPose2Values.cpp rename to gtsam/slam/tests/testPose2Values.cpp index 47f0b084f..5701eeb02 100644 --- a/slam/tests/testPose2Values.cpp +++ b/gtsam/slam/tests/testPose2Values.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include using namespace std; diff --git a/slam/tests/testPose3Factor.cpp b/gtsam/slam/tests/testPose3Factor.cpp similarity index 97% rename from slam/tests/testPose3Factor.cpp rename to gtsam/slam/tests/testPose3Factor.cpp index 59f11517c..c8502f302 100644 --- a/slam/tests/testPose3Factor.cpp +++ b/gtsam/slam/tests/testPose3Factor.cpp @@ -19,7 +19,7 @@ #include using namespace boost::assign; -#include +#include #include using namespace std; diff --git a/slam/tests/testPose3SLAM.cpp b/gtsam/slam/tests/testPose3SLAM.cpp similarity index 98% rename from slam/tests/testPose3SLAM.cpp rename to gtsam/slam/tests/testPose3SLAM.cpp index 6c8aceaff..396e9b119 100644 --- a/slam/tests/testPose3SLAM.cpp +++ b/gtsam/slam/tests/testPose3SLAM.cpp @@ -22,7 +22,7 @@ using namespace boost; using namespace boost::assign; -#include +#include // TODO: DANGEROUS, create shared pointers #define GTSAM_MAGIC_GAUSSIAN 6 diff --git a/slam/tests/testPose3Values.cpp b/gtsam/slam/tests/testPose3Values.cpp similarity index 98% rename from slam/tests/testPose3Values.cpp rename to gtsam/slam/tests/testPose3Values.cpp index d79c74f95..b44d432b0 100644 --- a/slam/tests/testPose3Values.cpp +++ b/gtsam/slam/tests/testPose3Values.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include using namespace std; diff --git a/slam/tests/testSimulated2D.cpp b/gtsam/slam/tests/testSimulated2D.cpp similarity index 97% rename from slam/tests/testSimulated2D.cpp rename to gtsam/slam/tests/testSimulated2D.cpp index d88d26ac2..13cc150c5 100644 --- a/slam/tests/testSimulated2D.cpp +++ b/gtsam/slam/tests/testSimulated2D.cpp @@ -17,7 +17,7 @@ **/ #include -#include +#include #include #include diff --git a/slam/tests/testSimulated2DOriented.cpp b/gtsam/slam/tests/testSimulated2DOriented.cpp similarity index 98% rename from slam/tests/testSimulated2DOriented.cpp rename to gtsam/slam/tests/testSimulated2DOriented.cpp index b13824773..6eabae0ea 100644 --- a/slam/tests/testSimulated2DOriented.cpp +++ b/gtsam/slam/tests/testSimulated2DOriented.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/slam/tests/testSimulated3D.cpp b/gtsam/slam/tests/testSimulated3D.cpp similarity index 97% rename from slam/tests/testSimulated3D.cpp rename to gtsam/slam/tests/testSimulated3D.cpp index 1adec1c05..71f34a8c8 100644 --- a/slam/tests/testSimulated3D.cpp +++ b/gtsam/slam/tests/testSimulated3D.cpp @@ -16,7 +16,7 @@ **/ #include -#include +#include #include #include diff --git a/slam/tests/testVSLAMFactor.cpp b/gtsam/slam/tests/testVSLAMFactor.cpp similarity index 98% rename from slam/tests/testVSLAMFactor.cpp rename to gtsam/slam/tests/testVSLAMFactor.cpp index 4ed0c46d7..82abd4411 100644 --- a/slam/tests/testVSLAMFactor.cpp +++ b/gtsam/slam/tests/testVSLAMFactor.cpp @@ -13,7 +13,7 @@ Written by Frank Dellaert, Nov 2009 **********************************************************/ -#include +#include #define GTSAM_MAGIC_KEY diff --git a/slam/tests/testVSLAMGraph.cpp b/gtsam/slam/tests/testVSLAMGraph.cpp similarity index 99% rename from slam/tests/testVSLAMGraph.cpp rename to gtsam/slam/tests/testVSLAMGraph.cpp index d081deae6..fb1560b04 100644 --- a/slam/tests/testVSLAMGraph.cpp +++ b/gtsam/slam/tests/testVSLAMGraph.cpp @@ -18,7 +18,7 @@ * @author Viorela Ila */ -#include +#include #include using namespace boost; diff --git a/slam/tests/testVSLAMValues.cpp b/gtsam/slam/tests/testVSLAMValues.cpp similarity index 97% rename from slam/tests/testVSLAMValues.cpp rename to gtsam/slam/tests/testVSLAMValues.cpp index 501b62a96..5b75e70ce 100644 --- a/slam/tests/testVSLAMValues.cpp +++ b/gtsam/slam/tests/testVSLAMValues.cpp @@ -15,7 +15,7 @@ * @author Alex Cunningham */ -#include +#include #define GTSAM_MAGIC_KEY diff --git a/slam/visualSLAM.cpp b/gtsam/slam/visualSLAM.cpp similarity index 100% rename from slam/visualSLAM.cpp rename to gtsam/slam/visualSLAM.cpp diff --git a/slam/visualSLAM.h b/gtsam/slam/visualSLAM.h similarity index 100% rename from slam/visualSLAM.h rename to gtsam/slam/visualSLAM.h diff --git a/tests/Makefile.am b/tests/Makefile.am index 1fb67ac46..b1def099a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -33,7 +33,7 @@ noinst_PROGRAMS = timeGaussianFactorGraph timeLinearOnDataset #---------------------------------------------------------------------------------------------------- TESTS = $(check_PROGRAMS) AM_LDFLAGS = $(BOOST_LDFLAGS) -AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/.. +AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir) if USE_ACCELERATE_MACOS AM_LDFLAGS += -Wl,/System/Library/Frameworks/Accelerate.framework/Accelerate @@ -44,7 +44,7 @@ if ENABLE_SERIALIZATION AM_LDFLAGS += -lboost_serialization endif -LDADD = ../libgtsam.la ../CppUnitLite/libCppUnitLite.a +LDADD = ../gtsam/libgtsam.la ../CppUnitLite/libCppUnitLite.a AM_DEFAULT_SOURCE_EXT = .cpp # rule to run an executable diff --git a/tests/testBayesNetPreconditioner.cpp b/tests/testBayesNetPreconditioner.cpp index 96055a3fa..274a100bd 100644 --- a/tests/testBayesNetPreconditioner.cpp +++ b/tests/testBayesNetPreconditioner.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #define GTSAM_MAGIC_KEY diff --git a/tests/testGaussianBayesNet.cpp b/tests/testGaussianBayesNet.cpp index aee70af30..f772c3aac 100644 --- a/tests/testGaussianBayesNet.cpp +++ b/tests/testGaussianBayesNet.cpp @@ -18,7 +18,7 @@ // STL/C++ #include #include -#include +#include #include #include diff --git a/tests/testGaussianFactor.cpp b/tests/testGaussianFactor.cpp index f1858ab1a..e7761a1e7 100644 --- a/tests/testGaussianFactor.cpp +++ b/tests/testGaussianFactor.cpp @@ -24,7 +24,7 @@ #include // for insert using namespace boost::assign; -#include +#include #define GTSAM_MAGIC_KEY diff --git a/tests/testGaussianFactorGraph.cpp b/tests/testGaussianFactorGraph.cpp index 66d7c1d3e..484fda5d0 100644 --- a/tests/testGaussianFactorGraph.cpp +++ b/tests/testGaussianFactorGraph.cpp @@ -26,7 +26,7 @@ using namespace std; #include // for operator += using namespace boost::assign; -#include +#include #define GTSAM_MAGIC_KEY diff --git a/tests/testGaussianISAM.cpp b/tests/testGaussianISAM.cpp index fb6f0c568..5ee0ab6f0 100644 --- a/tests/testGaussianISAM.cpp +++ b/tests/testGaussianISAM.cpp @@ -19,7 +19,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #define GTSAM_MAGIC_KEY diff --git a/tests/testGaussianJunctionTree.cpp b/tests/testGaussianJunctionTree.cpp index 57aecdf46..11f704779 100644 --- a/tests/testGaussianJunctionTree.cpp +++ b/tests/testGaussianJunctionTree.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/tests/testGraph.cpp b/tests/testGraph.cpp index f9565a500..d32428039 100644 --- a/tests/testGraph.cpp +++ b/tests/testGraph.cpp @@ -22,7 +22,7 @@ #include // for operator += using namespace boost::assign; -#include +#include // TODO: DANGEROUS, create shared pointers #define GTSAM_MAGIC_GAUSSIAN 3 diff --git a/tests/testInference.cpp b/tests/testInference.cpp index 1ba047eec..233049b01 100644 --- a/tests/testInference.cpp +++ b/tests/testInference.cpp @@ -15,7 +15,7 @@ * @author Frank Dellaert */ -#include +#include #define GTSAM_MAGIC_KEY diff --git a/tests/testIterative.cpp b/tests/testIterative.cpp index ebdb5ad31..33c580f06 100644 --- a/tests/testIterative.cpp +++ b/tests/testIterative.cpp @@ -18,7 +18,7 @@ #include // for operator += using namespace boost::assign; -#include +#include // TODO: DANGEROUS, create shared pointers #define GTSAM_MAGIC_GAUSSIAN 3 diff --git a/tests/testNonlinearEquality.cpp b/tests/testNonlinearEquality.cpp index d1acbe244..87668c84e 100644 --- a/tests/testNonlinearEquality.cpp +++ b/tests/testNonlinearEquality.cpp @@ -14,7 +14,7 @@ * @author Alex Cunningham */ -#include +#include #include #include diff --git a/tests/testNonlinearFactor.cpp b/tests/testNonlinearFactor.cpp index f81b3fc30..c1e1e6c6a 100644 --- a/tests/testNonlinearFactor.cpp +++ b/tests/testNonlinearFactor.cpp @@ -20,7 +20,7 @@ /*STL/C++*/ #include -#include +#include // TODO: DANGEROUS, create shared pointers #define GTSAM_MAGIC_GAUSSIAN 2 diff --git a/tests/testNonlinearFactorGraph.cpp b/tests/testNonlinearFactorGraph.cpp index f91689520..9052681df 100644 --- a/tests/testNonlinearFactorGraph.cpp +++ b/tests/testNonlinearFactorGraph.cpp @@ -24,7 +24,7 @@ using namespace std; #include using namespace boost::assign; -#include +#include #define GTSAM_MAGIC_KEY diff --git a/tests/testNonlinearOptimizer.cpp b/tests/testNonlinearOptimizer.cpp index 118f07a9e..ed939929a 100644 --- a/tests/testNonlinearOptimizer.cpp +++ b/tests/testNonlinearOptimizer.cpp @@ -21,7 +21,7 @@ using namespace std; #include // for operator += using namespace boost::assign; -#include +#include #include using namespace boost; diff --git a/tests/testSerialization.cpp b/tests/testSerialization.cpp index 57c4d6e4e..8220b985e 100644 --- a/tests/testSerialization.cpp +++ b/tests/testSerialization.cpp @@ -138,7 +138,7 @@ bool equalsXML(const T& input = T()) { #include -#include +#include using namespace std; using namespace gtsam; diff --git a/tests/testSubgraphPreconditioner.cpp b/tests/testSubgraphPreconditioner.cpp index ceb67b40e..1b79eec93 100644 --- a/tests/testSubgraphPreconditioner.cpp +++ b/tests/testSubgraphPreconditioner.cpp @@ -20,7 +20,7 @@ #include using namespace boost::assign; -#include +#include #define GTSAM_MAGIC_KEY diff --git a/tests/testSymbolicBayesNet.cpp b/tests/testSymbolicBayesNet.cpp index db023713b..123a0de5c 100644 --- a/tests/testSymbolicBayesNet.cpp +++ b/tests/testSymbolicBayesNet.cpp @@ -19,7 +19,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #define GTSAM_MAGIC_KEY diff --git a/tests/testSymbolicFactorGraph.cpp b/tests/testSymbolicFactorGraph.cpp index 804b0c759..153224dc0 100644 --- a/tests/testSymbolicFactorGraph.cpp +++ b/tests/testSymbolicFactorGraph.cpp @@ -18,7 +18,7 @@ #include // for operator += using namespace boost::assign; -#include +#include #define GTSAM_MAGIC_KEY diff --git a/tests/testTupleValues.cpp b/tests/testTupleValues.cpp index 7184ac7d5..4827b7365 100644 --- a/tests/testTupleValues.cpp +++ b/tests/testTupleValues.cpp @@ -15,7 +15,7 @@ * @author Alex Cunningham */ -#include +#include #include #include diff --git a/tests/timeGaussianFactorGraph.cpp b/tests/timeGaussianFactorGraph.cpp index 36a751ee9..984856f3b 100644 --- a/tests/timeGaussianFactorGraph.cpp +++ b/tests/timeGaussianFactorGraph.cpp @@ -20,7 +20,7 @@ #include #include #include // for operator += in Ordering -#include +#include #include #include diff --git a/wrap/Makefile.am b/wrap/Makefile.am index 5d1812627..620dab26e 100644 --- a/wrap/Makefile.am +++ b/wrap/Makefile.am @@ -18,7 +18,7 @@ noinst_HEADERS = geometry.h utilities.h Argument.h Constructor.h Method.h Class. noinst_PROGRAMS = wrap wrap_SOURCES = ${common} wrap.cpp -AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/.. -DTOPSRCDIR="\"$(top_srcdir)\"" +AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir) -DTOPSRCDIR="\"$(top_srcdir)\"" AM_CXXFLAGS = -MMD AM_LDFLAGS = $(BOOST_LDFLAGS) -L../CppUnitLite -lCppUnitLite diff --git a/wrap/testSpirit.cpp b/wrap/testSpirit.cpp index 420a4c0ed..120e5561f 100644 --- a/wrap/testSpirit.cpp +++ b/wrap/testSpirit.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include using namespace std; using namespace BOOST_SPIRIT_CLASSIC_NS; diff --git a/wrap/testWrap.cpp b/wrap/testWrap.cpp index df025ad86..6e9f84d59 100644 --- a/wrap/testWrap.cpp +++ b/wrap/testWrap.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "utilities.h" #include "Module.h"