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

Updated gtsam build files for discrete

release/4.3a0
Richard Roberts 2012-04-15 23:12:17 +00:00
parent 444c7fccf1
commit 9ec030dcf3
56 changed files with 120 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtsam/CMakeLists.txt
View File

@ -4,6 +4,7 @@ set (gtsam_subdirs
base base
geometry geometry
inference inference
discrete
linear linear
nonlinear nonlinear
slam slam
@ -25,10 +26,24 @@ if (GTSAM_BUILD_CONVENIENCE_LIBRARIES)
add_library(ccolamd STATIC ${3rdparty_srcs}) add_library(ccolamd STATIC ${3rdparty_srcs})
endif() 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 # assemble core libaries
foreach(subdir ${gtsam_subdirs}) foreach(subdir ${gtsam_subdirs})
# Build convenience libraries # Build convenience libraries
file(GLOB subdir_srcs "${subdir}/*.cpp") file(GLOB subdir_srcs "${subdir}/*.cpp")
list(REMOVE_ITEM subdir_srcs ${excluded_sources})
set(${subdir}_srcs ${subdir_srcs}) set(${subdir}_srcs ${subdir_srcs})
if (GTSAM_BUILD_CONVENIENCE_LIBRARIES) if (GTSAM_BUILD_CONVENIENCE_LIBRARIES)
message(STATUS "Building Convenience Library: ${subdir}") message(STATUS "Building Convenience Library: ${subdir}")
@ -46,6 +61,7 @@ set(gtsam_srcs
${base_srcs} ${base_srcs}
${geometry_srcs} ${geometry_srcs}
${inference_srcs} ${inference_srcs}
${discrete_srcs}
${linear_srcs} ${linear_srcs}
${nonlinear_srcs} ${nonlinear_srcs}
${slam_srcs} ${slam_srcs}

2
gtsam/discrete/AlgebraicDecisionTree.h
View File

@ -7,7 +7,7 @@
#pragma once #pragma once
#include <gtsam2/discrete/DecisionTree-inl.h> #include <gtsam/discrete/DecisionTree-inl.h>
namespace gtsam { namespace gtsam {

4
gtsam/discrete/AllDiff.cpp
View File

@ -5,8 +5,8 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/Domain.h> #include <gtsam/discrete/Domain.h>
#include <gtsam2/discrete/AllDiff.h> #include <gtsam/discrete/AllDiff.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>

4
gtsam/discrete/AllDiff.h
View File

@ -7,8 +7,8 @@
#pragma once #pragma once
#include <gtsam2/discrete/DiscreteKey.h> #include <gtsam/discrete/DiscreteKey.h>
#include <gtsam2/discrete/BinaryAllDiff.h> #include <gtsam/discrete/BinaryAllDiff.h>
namespace gtsam { namespace gtsam {

2
gtsam/discrete/BinaryAllDiff.h
View File

@ -7,7 +7,7 @@
#pragma once #pragma once
#include <gtsam2/discrete/DecisionTreeFactor.h> #include <gtsam/discrete/DecisionTreeFactor.h>
namespace gtsam { namespace gtsam {

16
gtsam/discrete/CMakeLists.txt
View File

@ -2,14 +2,10 @@
set(subdir discrete) set(subdir discrete)
file(GLOB discrete_headers "*.h") file(GLOB discrete_headers "*.h")
# FIXME: exclude headers # FIXME: exclude headers
install(FILES ${discrete_headers} DESTINATION include/gtsam2/discrete) install(FILES ${discrete_headers} DESTINATION include/gtsam/discrete)
# Set up library dependencies # Set up library dependencies
set (discrete_local_libs set (discrete_local_libs ccolamd base inference discrete)
discrete)
set (discrete_full_libs
gtsam2-static)
# Exclude tests that don't work # Exclude tests that don't work
set (discrete_excluded_tests set (discrete_excluded_tests
@ -18,13 +14,15 @@ set (discrete_excluded_tests
"${CMAKE_CURRENT_SOURCE_DIR}/tests/testPotentialTable.cpp") "${CMAKE_CURRENT_SOURCE_DIR}/tests/testPotentialTable.cpp")
# Add all tests # 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 # add examples
foreach(example schedulingExample schedulingQuals12) foreach(example schedulingExample schedulingQuals12)
add_executable(${example} "examples/${example}.cpp") add_executable(${example} "examples/${example}.cpp")
add_dependencies(${example} gtsam2-static) add_dependencies(${example} gtsam-static)
target_link_libraries(${example} ${Boost_LIBRARIES} gtsam2-static) target_link_libraries(${example} gtsam-static)
add_custom_target(${example}.run ${EXECUTABLE_OUTPUT_PATH}${example} ${ARGN}) add_custom_target(${example}.run ${EXECUTABLE_OUTPUT_PATH}${example} ${ARGN})
endforeach(example) endforeach(example)

6
gtsam/discrete/CSP.cpp
View File

@ -5,9 +5,9 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/Domain.h> #include <gtsam/discrete/Domain.h>
#include <gtsam2/discrete/CSP.h> #include <gtsam/discrete/CSP.h>
#include <gtsam2/discrete/DiscreteSequentialSolver.h> #include <gtsam/discrete/DiscreteSequentialSolver.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>

6
gtsam/discrete/CSP.h
View File

@ -7,9 +7,9 @@
#pragma once #pragma once
#include <gtsam2/discrete/AllDiff.h> #include <gtsam/discrete/AllDiff.h>
#include <gtsam2/discrete/SingleValue.h> #include <gtsam/discrete/SingleValue.h>
#include <gtsam2/discrete/DiscreteFactorGraph.h> #include <gtsam/discrete/DiscreteFactorGraph.h>
namespace gtsam { namespace gtsam {

2
gtsam/discrete/DecisionTree-inl.h
View File

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <gtsam2/discrete/DecisionTree.h> #include <gtsam/discrete/DecisionTree.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <boost/format.hpp> #include <boost/format.hpp>

2
gtsam/discrete/DecisionTree.h
View File

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <gtsam2/discrete/Assignment.h> #include <gtsam/discrete/Assignment.h>
#include <boost/function.hpp> #include <boost/function.hpp>
#include <iostream> #include <iostream>
#include <vector> #include <vector>

4
gtsam/discrete/DecisionTreeFactor.cpp
View File

@ -6,8 +6,8 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/DecisionTreeFactor.h> #include <gtsam/discrete/DecisionTreeFactor.h>
#include <gtsam2/discrete/DiscreteConditional.h> #include <gtsam/discrete/DiscreteConditional.h>
#include <gtsam/base/FastSet.h> #include <gtsam/base/FastSet.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>

4
gtsam/discrete/DecisionTreeFactor.h
View File

@ -7,8 +7,8 @@
#pragma once #pragma once
#include <gtsam2/discrete/DiscreteFactor.h> #include <gtsam/discrete/DiscreteFactor.h>
#include <gtsam2/discrete/Potentials.h> #include <gtsam/discrete/Potentials.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>

4
gtsam/discrete/DiscreteBayesNet.cpp
View File

@ -6,8 +6,8 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/DiscreteBayesNet.h> #include <gtsam/discrete/DiscreteBayesNet.h>
#include <gtsam2/discrete/DiscreteConditional.h> #include <gtsam/discrete/DiscreteConditional.h>
#include <gtsam/inference/BayesNet-inl.h> #include <gtsam/inference/BayesNet-inl.h>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>

2
gtsam/discrete/DiscreteBayesNet.h
View File

@ -11,7 +11,7 @@
#include <map> #include <map>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <gtsam/inference/BayesNet.h> #include <gtsam/inference/BayesNet.h>
#include <gtsam2/discrete/DiscreteConditional.h> #include <gtsam/discrete/DiscreteConditional.h>
namespace gtsam { namespace gtsam {

4
gtsam/discrete/DiscreteConditional.cpp
View File

@ -6,8 +6,8 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/DiscreteConditional.h> #include <gtsam/discrete/DiscreteConditional.h>
#include <gtsam2/discrete/Signature.h> #include <gtsam/discrete/Signature.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <gtsam/base/debug.h> #include <gtsam/base/debug.h>

4
gtsam/discrete/DiscreteConditional.h
View File

@ -8,8 +8,8 @@
#pragma once #pragma once
#include <gtsam2/discrete/DecisionTreeFactor.h> #include <gtsam/discrete/DecisionTreeFactor.h>
#include <gtsam2/discrete/Signature.h> #include <gtsam/discrete/Signature.h>
#include <gtsam/inference/IndexConditional.h> #include <gtsam/inference/IndexConditional.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>

2
gtsam/discrete/DiscreteFactor.cpp
View File

@ -6,7 +6,7 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/DiscreteFactor.h> #include <gtsam/discrete/DiscreteFactor.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
using namespace std; using namespace std;

2
gtsam/discrete/DiscreteFactor.h
View File

@ -7,7 +7,7 @@
#pragma once #pragma once
#include <gtsam2/discrete/Assignment.h> #include <gtsam/discrete/Assignment.h>
#include <gtsam/inference/IndexFactor.h> #include <gtsam/inference/IndexFactor.h>
namespace gtsam { namespace gtsam {

4
gtsam/discrete/DiscreteFactorGraph.cpp
View File

@ -6,8 +6,8 @@
*/ */
//#define ENABLE_TIMING //#define ENABLE_TIMING
#include <gtsam2/discrete/DiscreteFactorGraph.h> #include <gtsam/discrete/DiscreteFactorGraph.h>
#include <gtsam2/discrete/DiscreteConditional.h> #include <gtsam/discrete/DiscreteConditional.h>
#include <gtsam/inference/EliminationTree-inl.h> #include <gtsam/inference/EliminationTree-inl.h>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>

4
gtsam/discrete/DiscreteFactorGraph.h
View File

@ -7,8 +7,8 @@
#pragma once #pragma once
#include <gtsam2/discrete/DecisionTreeFactor.h> #include <gtsam/discrete/DecisionTreeFactor.h>
#include <gtsam2/discrete/DiscreteBayesNet.h> #include <gtsam/discrete/DiscreteBayesNet.h>
#include <gtsam/inference/FactorGraph.h> #include <gtsam/inference/FactorGraph.h>
#include <gtsam/base/FastSet.h> #include <gtsam/base/FastSet.h>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>

2
gtsam/discrete/DiscreteKey.h
View File

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <gtsam/base/types.h> #include <gtsam/base/types.h>
#include <gtsam2/discrete/label_traits.h> #include <gtsam/discrete/label_traits.h>
#include <map> #include <map>
#include <string> #include <string>

4
gtsam/discrete/DiscreteSequentialSolver.cpp
View File

@ -6,8 +6,8 @@
*/ */
//#define ENABLE_TIMING //#define ENABLE_TIMING
#include <gtsam2/discrete/DiscreteSequentialSolver.h> #include <gtsam/discrete/DiscreteSequentialSolver.h>
#include <gtsam2/discrete/PotentialTable.h> #include <gtsam/discrete/PotentialTable.h>
#include <gtsam/inference/GenericSequentialSolver-inl.h> #include <gtsam/inference/GenericSequentialSolver-inl.h>
#include <gtsam/base/timing.h> #include <gtsam/base/timing.h>

2
gtsam/discrete/DiscreteSequentialSolver.h
View File

@ -7,7 +7,7 @@
#pragma once #pragma once
#include <gtsam2/discrete/DiscreteFactorGraph.h> #include <gtsam/discrete/DiscreteFactorGraph.h>
#include <gtsam/inference/GenericSequentialSolver.h> #include <gtsam/inference/GenericSequentialSolver.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>

4
gtsam/discrete/Domain.cpp
View File

@ -5,8 +5,8 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/Domain.h> #include <gtsam/discrete/Domain.h>
#include <gtsam2/discrete/DecisionTreeFactor.h> #include <gtsam/discrete/DecisionTreeFactor.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>

4
gtsam/discrete/Domain.h
View File

@ -7,8 +7,8 @@
#pragma once #pragma once
#include <gtsam2/discrete/DiscreteKey.h> #include <gtsam/discrete/DiscreteKey.h>
#include <gtsam2/discrete/DiscreteFactor.h> #include <gtsam/discrete/DiscreteFactor.h>
namespace gtsam { namespace gtsam {

2
gtsam/discrete/PotentialTable.cpp
View File

@ -11,7 +11,7 @@
#include <algorithm> #include <algorithm>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <gtsam2/discrete/PotentialTable.h> #include <gtsam/discrete/PotentialTable.h>
using namespace std; using namespace std;

4
gtsam/discrete/Potentials.cpp
View File

@ -4,8 +4,8 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/Potentials.h> #include <gtsam/discrete/Potentials.h>
#include <gtsam2/discrete/DecisionTree-inl.h> #include <gtsam/discrete/DecisionTree-inl.h>
#include <boost/format.hpp> #include <boost/format.hpp>
using namespace std; using namespace std;

4
gtsam/discrete/Potentials.h
View File

@ -6,8 +6,8 @@
#pragma once #pragma once
#include <gtsam2/discrete/AlgebraicDecisionTree.h> #include <gtsam/discrete/AlgebraicDecisionTree.h>
#include <gtsam2/discrete/DiscreteKey.h> #include <gtsam/discrete/DiscreteKey.h>
#include <gtsam/base/types.h> #include <gtsam/base/types.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>

2
gtsam/discrete/RefCounted.cpp
View File

@ -5,5 +5,5 @@
* @date Mar 29, 2011 * @date Mar 29, 2011
*/ */
#include <gtsam2/discrete/RefCounted.h> #include <gtsam/discrete/RefCounted.h>

6
gtsam/discrete/Scheduler.cpp
View File

@ -5,9 +5,9 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/Scheduler.h> #include <gtsam/discrete/Scheduler.h>
#include <gtsam2/discrete/DiscreteFactorGraph.h> #include <gtsam/discrete/DiscreteFactorGraph.h>
#include <gtsam2/discrete/DiscreteSequentialSolver.h> #include <gtsam/discrete/DiscreteSequentialSolver.h>
#include <gtsam/base/debug.h> #include <gtsam/base/debug.h>
#include <gtsam/base/timing.h> #include <gtsam/base/timing.h>

2
gtsam/discrete/Scheduler.h
View File

@ -7,7 +7,7 @@
#pragma once #pragma once
#include <gtsam2/discrete/CSP.h> #include <gtsam/discrete/CSP.h>
namespace gtsam { namespace gtsam {

2
gtsam/discrete/Signature.h
View File

@ -9,7 +9,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <gtsam2/discrete/DiscreteKey.h> #include <gtsam/discrete/DiscreteKey.h>
#include <boost/version.hpp> // for checking whether we are using boost 1.40 #include <boost/version.hpp> // for checking whether we are using boost 1.40
#if BOOST_VERSION >= 104200 #if BOOST_VERSION >= 104200

6
gtsam/discrete/SingleValue.cpp
View File

@ -5,9 +5,9 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/SingleValue.h> #include <gtsam/discrete/SingleValue.h>
#include <gtsam2/discrete/Domain.h> #include <gtsam/discrete/Domain.h>
#include <gtsam2/discrete/DecisionTreeFactor.h> #include <gtsam/discrete/DecisionTreeFactor.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>

4
gtsam/discrete/SingleValue.h
View File

@ -7,8 +7,8 @@
#pragma once #pragma once
#include <gtsam2/discrete/DiscreteKey.h> #include <gtsam/discrete/DiscreteKey.h>
#include <gtsam2/discrete/DiscreteFactor.h> #include <gtsam/discrete/DiscreteFactor.h>
namespace gtsam { namespace gtsam {

4
gtsam/discrete/TypedDiscreteFactor.cpp
View File

@ -6,9 +6,9 @@
*/ */
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <gtsam2/discrete/TypedDiscreteFactor.h> #include <gtsam/discrete/TypedDiscreteFactor.h>
#include <gtsam/inference/Factor-inl.h> #include <gtsam/inference/Factor-inl.h>
#include <gtsam2/discrete/DecisionDiagram-inl.h> #include <gtsam/discrete/DecisionDiagram-inl.h>
using namespace std; using namespace std;

4
gtsam/discrete/TypedDiscreteFactor.h
View File

@ -9,8 +9,8 @@
#include <map> #include <map>
#include <gtsam/inference/Factor.h> #include <gtsam/inference/Factor.h>
#include <gtsam2/discrete/DiscreteFactor.h> #include <gtsam/discrete/DiscreteFactor.h>
#include <gtsam2/discrete/AlgebraicDecisionDiagram.h> #include <gtsam/discrete/AlgebraicDecisionDiagram.h>
namespace gtsam { namespace gtsam {

6
gtsam/discrete/TypedDiscreteFactorGraph.cpp
View File

@ -10,9 +10,9 @@
#include <stdexcept> #include <stdexcept>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <gtsam2/discrete/DiscreteFactor.h> #include <gtsam/discrete/DiscreteFactor.h>
#include <gtsam2/discrete/TypedDiscreteFactorGraph.h> #include <gtsam/discrete/TypedDiscreteFactorGraph.h>
#include <gtsam2/discrete/parseUAI.h> #include <gtsam/discrete/parseUAI.h>
#include <gtsam/inference/FactorGraph.h> #include <gtsam/inference/FactorGraph.h>

2
gtsam/discrete/TypedDiscreteFactorGraph.h
View File

@ -11,7 +11,7 @@
#include <vector> #include <vector>
#include <set> #include <set>
#include <gtsam/inference/FactorGraph.h> #include <gtsam/inference/FactorGraph.h>
#include <gtsam2/discrete/TypedDiscreteFactor.h> #include <gtsam/discrete/TypedDiscreteFactor.h>
namespace gtsam { namespace gtsam {

4
gtsam/discrete/examples/schedulingExample.cpp
View File

@ -8,7 +8,7 @@
//#define ENABLE_TIMING //#define ENABLE_TIMING
#define ADD_NO_CACHING #define ADD_NO_CACHING
#define ADD_NO_PRUNING #define ADD_NO_PRUNING
#include <gtsam2/discrete/Scheduler.h> #include <gtsam/discrete/Scheduler.h>
#include <gtsam/base/debug.h> #include <gtsam/base/debug.h>
#include <gtsam/base/timing.h> #include <gtsam/base/timing.h>
@ -53,7 +53,7 @@ void addStudent(Scheduler& s, size_t i) {
} }
/* ************************************************************************* */ /* ************************************************************************* */
Scheduler largeExample(size_t nrStudents = 7) { 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"); Scheduler s(nrStudents, path + "Doodle.csv");
s.addArea("Harvey Lipkin", "Mechanics"); s.addArea("Harvey Lipkin", "Mechanics");

4
gtsam/discrete/examples/schedulingQuals12.cpp
View File

@ -8,7 +8,7 @@
#define ENABLE_TIMING #define ENABLE_TIMING
#define ADD_NO_CACHING #define ADD_NO_CACHING
#define ADD_NO_PRUNING #define ADD_NO_PRUNING
#include <gtsam2/discrete/Scheduler.h> #include <gtsam/discrete/Scheduler.h>
#include <gtsam/base/debug.h> #include <gtsam/base/debug.h>
#include <gtsam/base/timing.h> #include <gtsam/base/timing.h>
@ -65,7 +65,7 @@ void addStudent(Scheduler& s, size_t i) {
/* ************************************************************************* */ /* ************************************************************************* */
Scheduler largeExample(size_t nrStudents = NRSTUDENTS) { 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"); Scheduler s(nrStudents, path + "Doodle2012.csv");
s.addArea("Harvey Lipkin", "Mechanics"); s.addArea("Harvey Lipkin", "Mechanics");

4
gtsam/discrete/parseUAI.cpp
View File

@ -16,7 +16,7 @@
#include <boost/spirit/home/phoenix/operator.hpp> #include <boost/spirit/home/phoenix/operator.hpp>
#include <boost/spirit/include/support_istream_iterator.hpp> #include <boost/spirit/include/support_istream_iterator.hpp>
#include <gtsam2/discrete/parseUAI.h> #include <gtsam/discrete/parseUAI.h>
using namespace std; using namespace std;
namespace qi = boost::spirit::qi; namespace qi = boost::spirit::qi;
@ -144,7 +144,7 @@ namespace gtsam {
}// gtsam }// gtsam
#else #else
#include <gtsam2/discrete/parseUAI.h> #include <gtsam/discrete/parseUAI.h>
namespace gtsam { namespace gtsam {

2
gtsam/discrete/parseUAI.h
View File

@ -7,7 +7,7 @@
*/ */
#include <string> #include <string>
#include <gtsam2/discrete/TypedDiscreteFactorGraph.h> #include <gtsam/discrete/TypedDiscreteFactorGraph.h>
namespace gtsam { namespace gtsam {

8
gtsam/discrete/tests/testAlgebraicDecisionTree.cpp
View File

@ -6,11 +6,11 @@
*/ */
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <gtsam2/discrete/DiscreteKey.h> // make sure we have traits #include <gtsam/discrete/DiscreteKey.h> // make sure we have traits
// headers first to make sure no missing headers // headers first to make sure no missing headers
//#define DT_NO_PRUNING //#define DT_NO_PRUNING
#include <gtsam2/discrete/AlgebraicDecisionTree.h> #include <gtsam/discrete/AlgebraicDecisionTree.h>
#include <gtsam2/discrete/DecisionTree-inl.h> // for convert only #include <gtsam/discrete/DecisionTree-inl.h> // for convert only
#define DISABLE_TIMING #define DISABLE_TIMING
#include <boost/version.hpp> // for checking whether we are using boost 1.40 #include <boost/version.hpp> // for checking whether we are using boost 1.40
#if BOOST_VERSION >= 104200 #if BOOST_VERSION >= 104200
@ -25,7 +25,7 @@
using namespace boost::assign; using namespace boost::assign;
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <gtsam2/discrete/Signature.h> #include <gtsam/discrete/Signature.h>
using namespace std; using namespace std;
using namespace gtsam; using namespace gtsam;

4
gtsam/discrete/tests/testCSP.cpp
View File

@ -5,8 +5,8 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/CSP.h> #include <gtsam/discrete/CSP.h>
#include <gtsam2/discrete/Domain.h> #include <gtsam/discrete/Domain.h>
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>

4
gtsam/discrete/tests/testDecisionTree.cpp
View File

@ -12,12 +12,12 @@ using namespace boost::assign;
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <gtsam2/discrete/Signature.h> #include <gtsam/discrete/Signature.h>
//#define DT_DEBUG_MEMORY //#define DT_DEBUG_MEMORY
//#define DT_NO_PRUNING //#define DT_NO_PRUNING
#define DISABLE_DOT #define DISABLE_DOT
#include <gtsam2/discrete/DecisionTree-inl.h> #include <gtsam/discrete/DecisionTree-inl.h>
using namespace std; using namespace std;
using namespace gtsam; using namespace gtsam;

4
gtsam/discrete/tests/testDecisionTreeFactor.cpp
View File

@ -6,8 +6,8 @@
* @author Duy-Nguyen Ta * @author Duy-Nguyen Ta
*/ */
#include <gtsam2/discrete/Signature.h> #include <gtsam/discrete/Signature.h>
#include <gtsam2/discrete/DecisionTreeFactor.h> #include <gtsam/discrete/DecisionTreeFactor.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <boost/assign/std/map.hpp> #include <boost/assign/std/map.hpp>

4
gtsam/discrete/tests/testDiscreteBayesNet.cpp
View File

@ -5,8 +5,8 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/DiscreteBayesNet.h> #include <gtsam/discrete/DiscreteBayesNet.h>
#include <gtsam2/discrete/DiscreteSequentialSolver.h> #include <gtsam/discrete/DiscreteSequentialSolver.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <gtsam/base/debug.h> #include <gtsam/base/debug.h>

4
gtsam/discrete/tests/testDiscreteConditional.cpp
View File

@ -11,8 +11,8 @@
using namespace boost::assign; using namespace boost::assign;
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <gtsam2/discrete/DecisionTreeFactor.h> #include <gtsam/discrete/DecisionTreeFactor.h>
#include <gtsam2/discrete/DiscreteConditional.h> #include <gtsam/discrete/DiscreteConditional.h>
#include <boost/version.hpp> // for checking whether we are using boost 1.40 #include <boost/version.hpp> // for checking whether we are using boost 1.40
#if BOOST_VERSION >= 104200 #if BOOST_VERSION >= 104200
#define BOOST_HAVE_PARSER #define BOOST_HAVE_PARSER

2
gtsam/discrete/tests/testDiscreteFactor.cpp
View File

@ -6,7 +6,7 @@
*/ */
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <gtsam2/discrete/DiscreteFactor.h> #include <gtsam/discrete/DiscreteFactor.h>
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <boost/assign/std/map.hpp> #include <boost/assign/std/map.hpp>
using namespace boost::assign; using namespace boost::assign;

6
gtsam/discrete/tests/testDiscreteFactorGraph.cpp
View File

@ -5,9 +5,9 @@
* @author Duy-Nguyen Ta * @author Duy-Nguyen Ta
*/ */
#include <gtsam2/discrete/DiscreteFactor.h> #include <gtsam/discrete/DiscreteFactor.h>
#include <gtsam2/discrete/DiscreteFactorGraph.h> #include <gtsam/discrete/DiscreteFactorGraph.h>
#include <gtsam2/discrete/DiscreteSequentialSolver.h> #include <gtsam/discrete/DiscreteSequentialSolver.h>
#include <gtsam/inference/GenericMultifrontalSolver.h> #include <gtsam/inference/GenericMultifrontalSolver.h>
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>

2
gtsam/discrete/tests/testPotentialTable.cpp
View File

@ -10,7 +10,7 @@
using namespace boost::assign; using namespace boost::assign;
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <gtsam2/discrete/PotentialTable.h> #include <gtsam/discrete/PotentialTable.h>
using namespace std; using namespace std;
using namespace gtsam; using namespace gtsam;

4
gtsam/discrete/tests/testScheduler.cpp
View File

@ -5,7 +5,7 @@
*/ */
//#define ENABLE_TIMING //#define ENABLE_TIMING
#include <gtsam2/discrete/Scheduler.h> #include <gtsam/discrete/Scheduler.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <gtsam/base/timing.h> #include <gtsam/base/timing.h>
@ -149,7 +149,7 @@ TEST( schedulingExample, test)
/* ************************************************************************* */ /* ************************************************************************* */
TEST( schedulingExample, smallFromFile) TEST( schedulingExample, smallFromFile)
{ {
string path("../../../gtsam2/discrete/examples/"); string path("../../../gtsam/discrete/examples/");
Scheduler s(2, path + "small.csv"); Scheduler s(2, path + "small.csv");
// add areas // add areas

2
gtsam/discrete/tests/testSignature.cpp
View File

@ -9,7 +9,7 @@
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <gtsam2/discrete/Signature.h> #include <gtsam/discrete/Signature.h>
using namespace std; using namespace std;
using namespace gtsam; using namespace gtsam;

2
gtsam/discrete/tests/testSudoku.cpp
View File

@ -5,7 +5,7 @@
* @author Frank Dellaert * @author Frank Dellaert
*/ */
#include <gtsam2/discrete/CSP.h> #include <gtsam/discrete/CSP.h>
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

2
gtsam/discrete/tests/testTypedDiscreteFactor.cpp
View File

@ -10,7 +10,7 @@ using namespace boost::assign;
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <gtsam2/discrete/TypedDiscreteFactor.h> #include <gtsam/discrete/TypedDiscreteFactor.h>
using namespace std; using namespace std;
using namespace gtsam; using namespace gtsam;

6
gtsam/discrete/tests/testTypedDiscreteFactorGraph.cpp
View File

@ -14,8 +14,8 @@
//#include <gtsam/inference/JunctionTree.h> //#include <gtsam/inference/JunctionTree.h>
//#include <gtsam/inference/JunctionTree-inl.h> //#include <gtsam/inference/JunctionTree-inl.h>
#include <gtsam2/discrete/TypedDiscreteFactorGraph.h> #include <gtsam/discrete/TypedDiscreteFactorGraph.h>
//#include <gtsam2/discrete/DiscreteSequentialSolver.h> //#include <gtsam/discrete/DiscreteSequentialSolver.h>
using namespace std; using namespace std;
using namespace gtsam; using namespace gtsam;
@ -31,7 +31,7 @@ void init() {
values[v2] = 1; values[v2] = 1;
} }
string path("../../../gtsam2/discrete/tests/data/"); string path("../../../gtsam/discrete/tests/data/");
/* ************************************************************************* */ /* ************************************************************************* */
TEST( TypedDiscreteFactorGraph, parseUAI) TEST( TypedDiscreteFactorGraph, parseUAI)