From b9820550e242b6785863f401b69cd4e6e78b389b Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Fri, 5 Apr 2013 19:06:28 +0000 Subject: [PATCH] Added DLL export tags to new code --- gtsam_unstable/linear/bayesTreeOperations.h | 19 ++++++++++--------- gtsam_unstable/linear/conditioning.h | 5 +++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gtsam_unstable/linear/bayesTreeOperations.h b/gtsam_unstable/linear/bayesTreeOperations.h index 0cf0cdf84..471b38376 100644 --- a/gtsam_unstable/linear/bayesTreeOperations.h +++ b/gtsam_unstable/linear/bayesTreeOperations.h @@ -9,6 +9,7 @@ #pragma once +#include #include #include #include @@ -18,7 +19,7 @@ namespace gtsam { // Managing orderings /** Converts sets of keys to indices by way of orderings */ -std::set keysToIndices(const KeySet& keys, const Ordering& ordering); +GTSAM_UNSTABLE_EXPORT std::set keysToIndices(const KeySet& keys, const Ordering& ordering); // Linear Graph Operations @@ -26,16 +27,16 @@ std::set keysToIndices(const KeySet& keys, const Ordering& ordering); * Given a graph, splits each factor into factors where the dimension is * that of the first variable. */ -GaussianFactorGraph splitFactors(const GaussianFactorGraph& fullgraph); +GTSAM_UNSTABLE_EXPORT GaussianFactorGraph splitFactors(const GaussianFactorGraph& fullgraph); /** * Splits a factor into factors where the dimension is * that of the first variable. */ -GaussianFactorGraph splitFactor(const GaussianFactor::shared_ptr& factor); +GTSAM_UNSTABLE_EXPORT GaussianFactorGraph splitFactor(const GaussianFactor::shared_ptr& factor); /** Removes prior jacobian factors from the graph */ -GaussianFactorGraph removePriors(const GaussianFactorGraph& fullgraph); +GTSAM_UNSTABLE_EXPORT GaussianFactorGraph removePriors(const GaussianFactorGraph& fullgraph); // Bayes Tree / Conditional operations @@ -45,7 +46,7 @@ GaussianFactorGraph removePriors(const GaussianFactorGraph& fullgraph); * * @return the set of conditionals extracted from cliques. */ -std::set findAffectedCliqueConditionals( +GTSAM_UNSTABLE_EXPORT std::set findAffectedCliqueConditionals( const GaussianBayesTree& bayesTree, const std::set& savedIndices); /** @@ -55,14 +56,14 @@ std::set findAffectedCliqueConditionals( * Note the use of a set of shared_ptr: this will sort/filter on unique *pointer* locations, * which ensures unique cliques, but the order of the cliques is meaningless */ -void findCliqueConditionals(const GaussianBayesTree::sharedClique& current_clique, +GTSAM_UNSTABLE_EXPORT void findCliqueConditionals(const GaussianBayesTree::sharedClique& current_clique, std::set& result); /** * Given a clique, returns a sequence of clique parents to the root, not including the * given clique. */ -std::deque +GTSAM_UNSTABLE_EXPORT std::deque findPathCliques(const GaussianBayesTree::sharedClique& initial); /** @@ -71,8 +72,8 @@ findPathCliques(const GaussianBayesTree::sharedClique& initial); * * @param splitConditionals flag enables spliting multi-frontal conditionals into separate factors */ -GaussianFactorGraph liquefy(const GaussianBayesTree::sharedClique& root, bool splitConditionals = false); -GaussianFactorGraph liquefy(const GaussianBayesTree& bayesTree, bool splitConditionals = false); +GTSAM_UNSTABLE_EXPORT GaussianFactorGraph liquefy(const GaussianBayesTree::sharedClique& root, bool splitConditionals = false); +GTSAM_UNSTABLE_EXPORT GaussianFactorGraph liquefy(const GaussianBayesTree& bayesTree, bool splitConditionals = false); } // \namespace gtsam diff --git a/gtsam_unstable/linear/conditioning.h b/gtsam_unstable/linear/conditioning.h index 2c6c7ddb6..fbd5d6918 100644 --- a/gtsam_unstable/linear/conditioning.h +++ b/gtsam_unstable/linear/conditioning.h @@ -9,6 +9,7 @@ #pragma once +#include #include #include #include @@ -26,7 +27,7 @@ namespace gtsam { * @param saved_indices is the set of indices that should appear in the result * @param solution is a full solution for the system */ -gtsam::GaussianConditional::shared_ptr conditionDensity(const gtsam::GaussianConditional::shared_ptr& initConditional, +GTSAM_UNSTABLE_EXPORT gtsam::GaussianConditional::shared_ptr conditionDensity(const gtsam::GaussianConditional::shared_ptr& initConditional, const std::set& saved_indices, const gtsam::VectorValues& solution); /** @@ -34,7 +35,7 @@ gtsam::GaussianConditional::shared_ptr conditionDensity(const gtsam::GaussianCon * conditionals by solving out variables to eliminate. Traverses the tree to * add the correct dummy factors whenever a separator is eliminated. */ -gtsam::GaussianFactorGraph conditionDensity(const gtsam::GaussianBayesTree& bayesTree, +GTSAM_UNSTABLE_EXPORT gtsam::GaussianFactorGraph conditionDensity(const gtsam::GaussianBayesTree& bayesTree, const std::set& saved_indices);