From 9ec030dcf35e67c760a4ecf348a04ce24c0da519 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Sun, 15 Apr 2012 23:12:17 +0000 Subject: [PATCH] Updated gtsam build files for discrete --- gtsam/CMakeLists.txt | 16 ++++++++++++++++ gtsam/discrete/AlgebraicDecisionTree.h | 2 +- gtsam/discrete/AllDiff.cpp | 4 ++-- gtsam/discrete/AllDiff.h | 4 ++-- gtsam/discrete/BinaryAllDiff.h | 2 +- gtsam/discrete/CMakeLists.txt | 16 +++++++--------- gtsam/discrete/CSP.cpp | 6 +++--- gtsam/discrete/CSP.h | 6 +++--- gtsam/discrete/DecisionTree-inl.h | 2 +- gtsam/discrete/DecisionTree.h | 2 +- gtsam/discrete/DecisionTreeFactor.cpp | 4 ++-- gtsam/discrete/DecisionTreeFactor.h | 4 ++-- gtsam/discrete/DiscreteBayesNet.cpp | 4 ++-- gtsam/discrete/DiscreteBayesNet.h | 2 +- gtsam/discrete/DiscreteConditional.cpp | 4 ++-- gtsam/discrete/DiscreteConditional.h | 4 ++-- gtsam/discrete/DiscreteFactor.cpp | 2 +- gtsam/discrete/DiscreteFactor.h | 2 +- gtsam/discrete/DiscreteFactorGraph.cpp | 4 ++-- gtsam/discrete/DiscreteFactorGraph.h | 4 ++-- gtsam/discrete/DiscreteKey.h | 2 +- gtsam/discrete/DiscreteSequentialSolver.cpp | 4 ++-- gtsam/discrete/DiscreteSequentialSolver.h | 2 +- gtsam/discrete/Domain.cpp | 4 ++-- gtsam/discrete/Domain.h | 4 ++-- gtsam/discrete/PotentialTable.cpp | 2 +- gtsam/discrete/Potentials.cpp | 4 ++-- gtsam/discrete/Potentials.h | 4 ++-- gtsam/discrete/RefCounted.cpp | 2 +- gtsam/discrete/Scheduler.cpp | 6 +++--- gtsam/discrete/Scheduler.h | 2 +- gtsam/discrete/Signature.h | 2 +- gtsam/discrete/SingleValue.cpp | 6 +++--- gtsam/discrete/SingleValue.h | 4 ++-- gtsam/discrete/TypedDiscreteFactor.cpp | 4 ++-- gtsam/discrete/TypedDiscreteFactor.h | 4 ++-- gtsam/discrete/TypedDiscreteFactorGraph.cpp | 6 +++--- gtsam/discrete/TypedDiscreteFactorGraph.h | 2 +- gtsam/discrete/examples/schedulingExample.cpp | 4 ++-- gtsam/discrete/examples/schedulingQuals12.cpp | 4 ++-- gtsam/discrete/parseUAI.cpp | 4 ++-- gtsam/discrete/parseUAI.h | 2 +- .../discrete/tests/testAlgebraicDecisionTree.cpp | 8 ++++---- gtsam/discrete/tests/testCSP.cpp | 4 ++-- gtsam/discrete/tests/testDecisionTree.cpp | 4 ++-- gtsam/discrete/tests/testDecisionTreeFactor.cpp | 4 ++-- gtsam/discrete/tests/testDiscreteBayesNet.cpp | 4 ++-- gtsam/discrete/tests/testDiscreteConditional.cpp | 4 ++-- gtsam/discrete/tests/testDiscreteFactor.cpp | 2 +- gtsam/discrete/tests/testDiscreteFactorGraph.cpp | 6 +++--- gtsam/discrete/tests/testPotentialTable.cpp | 2 +- gtsam/discrete/tests/testScheduler.cpp | 4 ++-- gtsam/discrete/tests/testSignature.cpp | 2 +- gtsam/discrete/tests/testSudoku.cpp | 2 +- gtsam/discrete/tests/testTypedDiscreteFactor.cpp | 2 +- .../tests/testTypedDiscreteFactorGraph.cpp | 6 +++--- 56 files changed, 120 insertions(+), 106 deletions(-) diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 600ae2006..61bbf5a27 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -4,6 +4,7 @@ set (gtsam_subdirs base geometry inference + discrete linear nonlinear slam @@ -25,10 +26,24 @@ if (GTSAM_BUILD_CONVENIENCE_LIBRARIES) add_library(ccolamd STATIC ${3rdparty_srcs}) endif() +# Sources to remove from builds +set (excluded_sources + "${CMAKE_CURRENT_SOURCE_DIR}/discrete/TypedDiscreteFactor.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/discrete/TypedDiscreteFactorGraph.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/discrete/parseUAI.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/discrete/PotentialTable.cpp") + +if(GSAM_USE_QUATERNIONS) + set(excluded_sources ${excluded_sources} "${CMAKE_CURRENT_SOURCE_DIR}/geometry/Rot3M.cpp") +else() + set(excluded_sources ${excluded_sources} "${CMAKE_CURRENT_SOURCE_DIR}/geometry/Rot3Q.cpp") +endif() + # assemble core libaries foreach(subdir ${gtsam_subdirs}) # Build convenience libraries file(GLOB subdir_srcs "${subdir}/*.cpp") + list(REMOVE_ITEM subdir_srcs ${excluded_sources}) set(${subdir}_srcs ${subdir_srcs}) if (GTSAM_BUILD_CONVENIENCE_LIBRARIES) message(STATUS "Building Convenience Library: ${subdir}") @@ -46,6 +61,7 @@ set(gtsam_srcs ${base_srcs} ${geometry_srcs} ${inference_srcs} + ${discrete_srcs} ${linear_srcs} ${nonlinear_srcs} ${slam_srcs} diff --git a/gtsam/discrete/AlgebraicDecisionTree.h b/gtsam/discrete/AlgebraicDecisionTree.h index 7c182f387..029223ef3 100644 --- a/gtsam/discrete/AlgebraicDecisionTree.h +++ b/gtsam/discrete/AlgebraicDecisionTree.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace gtsam { diff --git a/gtsam/discrete/AllDiff.cpp b/gtsam/discrete/AllDiff.cpp index b06dbae14..064e0d1c8 100644 --- a/gtsam/discrete/AllDiff.cpp +++ b/gtsam/discrete/AllDiff.cpp @@ -5,8 +5,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/AllDiff.h b/gtsam/discrete/AllDiff.h index 57ed3f9d3..846dc335b 100644 --- a/gtsam/discrete/AllDiff.h +++ b/gtsam/discrete/AllDiff.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace gtsam { diff --git a/gtsam/discrete/BinaryAllDiff.h b/gtsam/discrete/BinaryAllDiff.h index a97adb2e3..31fe070c2 100644 --- a/gtsam/discrete/BinaryAllDiff.h +++ b/gtsam/discrete/BinaryAllDiff.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace gtsam { diff --git a/gtsam/discrete/CMakeLists.txt b/gtsam/discrete/CMakeLists.txt index 42917e59b..a8cf7dd00 100644 --- a/gtsam/discrete/CMakeLists.txt +++ b/gtsam/discrete/CMakeLists.txt @@ -2,14 +2,10 @@ set(subdir discrete) file(GLOB discrete_headers "*.h") # FIXME: exclude headers -install(FILES ${discrete_headers} DESTINATION include/gtsam2/discrete) +install(FILES ${discrete_headers} DESTINATION include/gtsam/discrete) # Set up library dependencies -set (discrete_local_libs - discrete) - -set (discrete_full_libs - gtsam2-static) +set (discrete_local_libs ccolamd base inference discrete) # Exclude tests that don't work set (discrete_excluded_tests @@ -18,13 +14,15 @@ set (discrete_excluded_tests "${CMAKE_CURRENT_SOURCE_DIR}/tests/testPotentialTable.cpp") # Add all tests -gtsam_add_subdir_tests(discrete "${discrete_local_libs}" "${discrete_full_libs}" "${discrete_excluded_tests}") +if (GTSAM_BUILD_TESTS) + gtsam_add_subdir_tests(discrete "${discrete_local_libs}" "gtsam-static" "${discrete_excluded_tests}") +endif() # add examples foreach(example schedulingExample schedulingQuals12) add_executable(${example} "examples/${example}.cpp") - add_dependencies(${example} gtsam2-static) - target_link_libraries(${example} ${Boost_LIBRARIES} gtsam2-static) + add_dependencies(${example} gtsam-static) + target_link_libraries(${example} gtsam-static) add_custom_target(${example}.run ${EXECUTABLE_OUTPUT_PATH}${example} ${ARGN}) endforeach(example) diff --git a/gtsam/discrete/CSP.cpp b/gtsam/discrete/CSP.cpp index 903daccf4..c0d57f320 100644 --- a/gtsam/discrete/CSP.cpp +++ b/gtsam/discrete/CSP.cpp @@ -5,9 +5,9 @@ * @author Frank Dellaert */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/gtsam/discrete/CSP.h b/gtsam/discrete/CSP.h index 973d104fa..d423426fd 100644 --- a/gtsam/discrete/CSP.h +++ b/gtsam/discrete/CSP.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace gtsam { diff --git a/gtsam/discrete/DecisionTree-inl.h b/gtsam/discrete/DecisionTree-inl.h index 6a6519d83..867a9c824 100644 --- a/gtsam/discrete/DecisionTree-inl.h +++ b/gtsam/discrete/DecisionTree-inl.h @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/gtsam/discrete/DecisionTree.h b/gtsam/discrete/DecisionTree.h index 75263475d..003656945 100644 --- a/gtsam/discrete/DecisionTree.h +++ b/gtsam/discrete/DecisionTree.h @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include #include diff --git a/gtsam/discrete/DecisionTreeFactor.cpp b/gtsam/discrete/DecisionTreeFactor.cpp index f883a6026..d66d16d99 100644 --- a/gtsam/discrete/DecisionTreeFactor.cpp +++ b/gtsam/discrete/DecisionTreeFactor.cpp @@ -6,8 +6,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/DecisionTreeFactor.h b/gtsam/discrete/DecisionTreeFactor.h index b68730e34..a61f12cf5 100644 --- a/gtsam/discrete/DecisionTreeFactor.h +++ b/gtsam/discrete/DecisionTreeFactor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/DiscreteBayesNet.cpp b/gtsam/discrete/DiscreteBayesNet.cpp index e233743eb..c7f09d3c2 100644 --- a/gtsam/discrete/DiscreteBayesNet.cpp +++ b/gtsam/discrete/DiscreteBayesNet.cpp @@ -6,8 +6,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/DiscreteBayesNet.h b/gtsam/discrete/DiscreteBayesNet.h index c0bba84eb..418a7aa2d 100644 --- a/gtsam/discrete/DiscreteBayesNet.h +++ b/gtsam/discrete/DiscreteBayesNet.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace gtsam { diff --git a/gtsam/discrete/DiscreteConditional.cpp b/gtsam/discrete/DiscreteConditional.cpp index 00e41ce63..4791af6e8 100644 --- a/gtsam/discrete/DiscreteConditional.cpp +++ b/gtsam/discrete/DiscreteConditional.cpp @@ -6,8 +6,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/DiscreteConditional.h b/gtsam/discrete/DiscreteConditional.h index 5a7881dd9..a11a6368f 100644 --- a/gtsam/discrete/DiscreteConditional.h +++ b/gtsam/discrete/DiscreteConditional.h @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/DiscreteFactor.cpp b/gtsam/discrete/DiscreteFactor.cpp index 6ed7b70ce..6112cfea9 100644 --- a/gtsam/discrete/DiscreteFactor.cpp +++ b/gtsam/discrete/DiscreteFactor.cpp @@ -6,7 +6,7 @@ * @author Frank Dellaert */ -#include +#include #include using namespace std; diff --git a/gtsam/discrete/DiscreteFactor.h b/gtsam/discrete/DiscreteFactor.h index 8b20b3f18..a66d5b522 100644 --- a/gtsam/discrete/DiscreteFactor.h +++ b/gtsam/discrete/DiscreteFactor.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include namespace gtsam { diff --git a/gtsam/discrete/DiscreteFactorGraph.cpp b/gtsam/discrete/DiscreteFactorGraph.cpp index 3c9c42689..479bcc45a 100644 --- a/gtsam/discrete/DiscreteFactorGraph.cpp +++ b/gtsam/discrete/DiscreteFactorGraph.cpp @@ -6,8 +6,8 @@ */ //#define ENABLE_TIMING -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/DiscreteFactorGraph.h b/gtsam/discrete/DiscreteFactorGraph.h index 8afacc51b..83a065361 100644 --- a/gtsam/discrete/DiscreteFactorGraph.h +++ b/gtsam/discrete/DiscreteFactorGraph.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/gtsam/discrete/DiscreteKey.h b/gtsam/discrete/DiscreteKey.h index 23deaf9d8..7c2fca817 100644 --- a/gtsam/discrete/DiscreteKey.h +++ b/gtsam/discrete/DiscreteKey.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include diff --git a/gtsam/discrete/DiscreteSequentialSolver.cpp b/gtsam/discrete/DiscreteSequentialSolver.cpp index 86cea7ffb..b4d16a24f 100644 --- a/gtsam/discrete/DiscreteSequentialSolver.cpp +++ b/gtsam/discrete/DiscreteSequentialSolver.cpp @@ -6,8 +6,8 @@ */ //#define ENABLE_TIMING -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/DiscreteSequentialSolver.h b/gtsam/discrete/DiscreteSequentialSolver.h index 0be149646..60512b873 100644 --- a/gtsam/discrete/DiscreteSequentialSolver.h +++ b/gtsam/discrete/DiscreteSequentialSolver.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include diff --git a/gtsam/discrete/Domain.cpp b/gtsam/discrete/Domain.cpp index ff71fa39f..130bd71ff 100644 --- a/gtsam/discrete/Domain.cpp +++ b/gtsam/discrete/Domain.cpp @@ -5,8 +5,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/Domain.h b/gtsam/discrete/Domain.h index f06e9a1da..934f0c306 100644 --- a/gtsam/discrete/Domain.h +++ b/gtsam/discrete/Domain.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace gtsam { diff --git a/gtsam/discrete/PotentialTable.cpp b/gtsam/discrete/PotentialTable.cpp index d0388e052..07d2b2880 100644 --- a/gtsam/discrete/PotentialTable.cpp +++ b/gtsam/discrete/PotentialTable.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/gtsam/discrete/Potentials.cpp b/gtsam/discrete/Potentials.cpp index f2d6760eb..2684e6cce 100644 --- a/gtsam/discrete/Potentials.cpp +++ b/gtsam/discrete/Potentials.cpp @@ -4,8 +4,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include using namespace std; diff --git a/gtsam/discrete/Potentials.h b/gtsam/discrete/Potentials.h index cfcf58400..9468745e1 100644 --- a/gtsam/discrete/Potentials.h +++ b/gtsam/discrete/Potentials.h @@ -6,8 +6,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/RefCounted.cpp b/gtsam/discrete/RefCounted.cpp index 6440b5028..521e58c6a 100644 --- a/gtsam/discrete/RefCounted.cpp +++ b/gtsam/discrete/RefCounted.cpp @@ -5,5 +5,5 @@ * @date Mar 29, 2011 */ -#include +#include diff --git a/gtsam/discrete/Scheduler.cpp b/gtsam/discrete/Scheduler.cpp index 574e276a9..dd578930d 100644 --- a/gtsam/discrete/Scheduler.cpp +++ b/gtsam/discrete/Scheduler.cpp @@ -5,9 +5,9 @@ * @author Frank Dellaert */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/gtsam/discrete/Scheduler.h b/gtsam/discrete/Scheduler.h index 8b91bce61..f01b1591e 100644 --- a/gtsam/discrete/Scheduler.h +++ b/gtsam/discrete/Scheduler.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace gtsam { diff --git a/gtsam/discrete/Signature.h b/gtsam/discrete/Signature.h index 25e66860e..84d34c1fa 100644 --- a/gtsam/discrete/Signature.h +++ b/gtsam/discrete/Signature.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include // for checking whether we are using boost 1.40 #if BOOST_VERSION >= 104200 diff --git a/gtsam/discrete/SingleValue.cpp b/gtsam/discrete/SingleValue.cpp index abd21a1a1..8d5fd0d8d 100644 --- a/gtsam/discrete/SingleValue.cpp +++ b/gtsam/discrete/SingleValue.cpp @@ -5,9 +5,9 @@ * @author Frank Dellaert */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/gtsam/discrete/SingleValue.h b/gtsam/discrete/SingleValue.h index c1757f82d..fc3d166fd 100644 --- a/gtsam/discrete/SingleValue.h +++ b/gtsam/discrete/SingleValue.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace gtsam { diff --git a/gtsam/discrete/TypedDiscreteFactor.cpp b/gtsam/discrete/TypedDiscreteFactor.cpp index daa745037..86f902e89 100644 --- a/gtsam/discrete/TypedDiscreteFactor.cpp +++ b/gtsam/discrete/TypedDiscreteFactor.cpp @@ -6,9 +6,9 @@ */ #include -#include +#include #include -#include +#include using namespace std; diff --git a/gtsam/discrete/TypedDiscreteFactor.h b/gtsam/discrete/TypedDiscreteFactor.h index 95f70898b..3d9fd6ee6 100644 --- a/gtsam/discrete/TypedDiscreteFactor.h +++ b/gtsam/discrete/TypedDiscreteFactor.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include namespace gtsam { diff --git a/gtsam/discrete/TypedDiscreteFactorGraph.cpp b/gtsam/discrete/TypedDiscreteFactorGraph.cpp index e0e18a885..2f8c2d22b 100644 --- a/gtsam/discrete/TypedDiscreteFactorGraph.cpp +++ b/gtsam/discrete/TypedDiscreteFactorGraph.cpp @@ -10,9 +10,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/gtsam/discrete/TypedDiscreteFactorGraph.h b/gtsam/discrete/TypedDiscreteFactorGraph.h index 93e19e9d2..010113bda 100644 --- a/gtsam/discrete/TypedDiscreteFactorGraph.h +++ b/gtsam/discrete/TypedDiscreteFactorGraph.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace gtsam { diff --git a/gtsam/discrete/examples/schedulingExample.cpp b/gtsam/discrete/examples/schedulingExample.cpp index 7bb401d6a..ff3f8a26f 100644 --- a/gtsam/discrete/examples/schedulingExample.cpp +++ b/gtsam/discrete/examples/schedulingExample.cpp @@ -8,7 +8,7 @@ //#define ENABLE_TIMING #define ADD_NO_CACHING #define ADD_NO_PRUNING -#include +#include #include #include @@ -53,7 +53,7 @@ void addStudent(Scheduler& s, size_t i) { } /* ************************************************************************* */ Scheduler largeExample(size_t nrStudents = 7) { - string path("/Users/dellaert/borg/gtsam2/gtsam2/discrete/examples/"); + string path("/Users/dellaert/borg/gtsam/gtsam/discrete/examples/"); Scheduler s(nrStudents, path + "Doodle.csv"); s.addArea("Harvey Lipkin", "Mechanics"); diff --git a/gtsam/discrete/examples/schedulingQuals12.cpp b/gtsam/discrete/examples/schedulingQuals12.cpp index 230218997..7571fbc58 100644 --- a/gtsam/discrete/examples/schedulingQuals12.cpp +++ b/gtsam/discrete/examples/schedulingQuals12.cpp @@ -8,7 +8,7 @@ #define ENABLE_TIMING #define ADD_NO_CACHING #define ADD_NO_PRUNING -#include +#include #include #include @@ -65,7 +65,7 @@ void addStudent(Scheduler& s, size_t i) { /* ************************************************************************* */ Scheduler largeExample(size_t nrStudents = NRSTUDENTS) { - string path("/Users/dellaert/borg/gtsam2/gtsam2/discrete/examples/"); + string path("/Users/dellaert/borg/gtsam/gtsam/discrete/examples/"); Scheduler s(nrStudents, path + "Doodle2012.csv"); s.addArea("Harvey Lipkin", "Mechanics"); diff --git a/gtsam/discrete/parseUAI.cpp b/gtsam/discrete/parseUAI.cpp index 417063da2..91296ab9b 100644 --- a/gtsam/discrete/parseUAI.cpp +++ b/gtsam/discrete/parseUAI.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include using namespace std; namespace qi = boost::spirit::qi; @@ -144,7 +144,7 @@ namespace gtsam { }// gtsam #else -#include +#include namespace gtsam { diff --git a/gtsam/discrete/parseUAI.h b/gtsam/discrete/parseUAI.h index 070c62e08..da9cb0f47 100644 --- a/gtsam/discrete/parseUAI.h +++ b/gtsam/discrete/parseUAI.h @@ -7,7 +7,7 @@ */ #include -#include +#include namespace gtsam { diff --git a/gtsam/discrete/tests/testAlgebraicDecisionTree.cpp b/gtsam/discrete/tests/testAlgebraicDecisionTree.cpp index 2c3d61fe8..0ca98f620 100644 --- a/gtsam/discrete/tests/testAlgebraicDecisionTree.cpp +++ b/gtsam/discrete/tests/testAlgebraicDecisionTree.cpp @@ -6,11 +6,11 @@ */ #include -#include // make sure we have traits +#include // make sure we have traits // headers first to make sure no missing headers //#define DT_NO_PRUNING -#include -#include // for convert only +#include +#include // for convert only #define DISABLE_TIMING #include // for checking whether we are using boost 1.40 #if BOOST_VERSION >= 104200 @@ -25,7 +25,7 @@ using namespace boost::assign; #include -#include +#include using namespace std; using namespace gtsam; diff --git a/gtsam/discrete/tests/testCSP.cpp b/gtsam/discrete/tests/testCSP.cpp index 51ddca098..cce32f09f 100644 --- a/gtsam/discrete/tests/testCSP.cpp +++ b/gtsam/discrete/tests/testCSP.cpp @@ -5,8 +5,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include #include diff --git a/gtsam/discrete/tests/testDecisionTree.cpp b/gtsam/discrete/tests/testDecisionTree.cpp index 216d4b965..fa7336aa6 100644 --- a/gtsam/discrete/tests/testDecisionTree.cpp +++ b/gtsam/discrete/tests/testDecisionTree.cpp @@ -12,12 +12,12 @@ using namespace boost::assign; #include #include -#include +#include //#define DT_DEBUG_MEMORY //#define DT_NO_PRUNING #define DISABLE_DOT -#include +#include using namespace std; using namespace gtsam; diff --git a/gtsam/discrete/tests/testDecisionTreeFactor.cpp b/gtsam/discrete/tests/testDecisionTreeFactor.cpp index fd7d39e91..687e6cde9 100644 --- a/gtsam/discrete/tests/testDecisionTreeFactor.cpp +++ b/gtsam/discrete/tests/testDecisionTreeFactor.cpp @@ -6,8 +6,8 @@ * @author Duy-Nguyen Ta */ -#include -#include +#include +#include #include #include #include diff --git a/gtsam/discrete/tests/testDiscreteBayesNet.cpp b/gtsam/discrete/tests/testDiscreteBayesNet.cpp index 41b4fbd4e..0c25df129 100644 --- a/gtsam/discrete/tests/testDiscreteBayesNet.cpp +++ b/gtsam/discrete/tests/testDiscreteBayesNet.cpp @@ -5,8 +5,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/tests/testDiscreteConditional.cpp b/gtsam/discrete/tests/testDiscreteConditional.cpp index 3d4cbc579..eff1951ba 100644 --- a/gtsam/discrete/tests/testDiscreteConditional.cpp +++ b/gtsam/discrete/tests/testDiscreteConditional.cpp @@ -11,8 +11,8 @@ using namespace boost::assign; #include -#include -#include +#include +#include #include // for checking whether we are using boost 1.40 #if BOOST_VERSION >= 104200 #define BOOST_HAVE_PARSER diff --git a/gtsam/discrete/tests/testDiscreteFactor.cpp b/gtsam/discrete/tests/testDiscreteFactor.cpp index 25e42a3ba..0d62c7805 100644 --- a/gtsam/discrete/tests/testDiscreteFactor.cpp +++ b/gtsam/discrete/tests/testDiscreteFactor.cpp @@ -6,7 +6,7 @@ */ #include -#include +#include #include #include using namespace boost::assign; diff --git a/gtsam/discrete/tests/testDiscreteFactorGraph.cpp b/gtsam/discrete/tests/testDiscreteFactorGraph.cpp index ef2fc7dc2..cf81cc159 100644 --- a/gtsam/discrete/tests/testDiscreteFactorGraph.cpp +++ b/gtsam/discrete/tests/testDiscreteFactorGraph.cpp @@ -5,9 +5,9 @@ * @author Duy-Nguyen Ta */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/gtsam/discrete/tests/testPotentialTable.cpp b/gtsam/discrete/tests/testPotentialTable.cpp index 2765c34eb..38c83a5ea 100644 --- a/gtsam/discrete/tests/testPotentialTable.cpp +++ b/gtsam/discrete/tests/testPotentialTable.cpp @@ -10,7 +10,7 @@ using namespace boost::assign; #include -#include +#include using namespace std; using namespace gtsam; diff --git a/gtsam/discrete/tests/testScheduler.cpp b/gtsam/discrete/tests/testScheduler.cpp index 741b3679c..28e3e16ed 100644 --- a/gtsam/discrete/tests/testScheduler.cpp +++ b/gtsam/discrete/tests/testScheduler.cpp @@ -5,7 +5,7 @@ */ //#define ENABLE_TIMING -#include +#include #include #include @@ -149,7 +149,7 @@ TEST( schedulingExample, test) /* ************************************************************************* */ TEST( schedulingExample, smallFromFile) { - string path("../../../gtsam2/discrete/examples/"); + string path("../../../gtsam/discrete/examples/"); Scheduler s(2, path + "small.csv"); // add areas diff --git a/gtsam/discrete/tests/testSignature.cpp b/gtsam/discrete/tests/testSignature.cpp index 5c61dcd88..4dfbc94e3 100644 --- a/gtsam/discrete/tests/testSignature.cpp +++ b/gtsam/discrete/tests/testSignature.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include using namespace std; using namespace gtsam; diff --git a/gtsam/discrete/tests/testSudoku.cpp b/gtsam/discrete/tests/testSudoku.cpp index 99a284729..7e4139818 100644 --- a/gtsam/discrete/tests/testSudoku.cpp +++ b/gtsam/discrete/tests/testSudoku.cpp @@ -5,7 +5,7 @@ * @author Frank Dellaert */ -#include +#include #include #include #include diff --git a/gtsam/discrete/tests/testTypedDiscreteFactor.cpp b/gtsam/discrete/tests/testTypedDiscreteFactor.cpp index 6e933dce2..af69eab41 100644 --- a/gtsam/discrete/tests/testTypedDiscreteFactor.cpp +++ b/gtsam/discrete/tests/testTypedDiscreteFactor.cpp @@ -10,7 +10,7 @@ using namespace boost::assign; #include #include -#include +#include using namespace std; using namespace gtsam; diff --git a/gtsam/discrete/tests/testTypedDiscreteFactorGraph.cpp b/gtsam/discrete/tests/testTypedDiscreteFactorGraph.cpp index 179853dbf..90c4617ba 100644 --- a/gtsam/discrete/tests/testTypedDiscreteFactorGraph.cpp +++ b/gtsam/discrete/tests/testTypedDiscreteFactorGraph.cpp @@ -14,8 +14,8 @@ //#include //#include -#include -//#include +#include +//#include using namespace std; using namespace gtsam; @@ -31,7 +31,7 @@ void init() { values[v2] = 1; } -string path("../../../gtsam2/discrete/tests/data/"); +string path("../../../gtsam/discrete/tests/data/"); /* ************************************************************************* */ TEST( TypedDiscreteFactorGraph, parseUAI)