Remove Exports

release/4.3a0
Fan Jiang 2021-11-22 12:01:09 -05:00
parent 6bf6ebc2c0
commit 05d471cd11
7 changed files with 12 additions and 15 deletions

View File

@ -19,7 +19,6 @@
#pragma once
#include <gtsam/discrete/DecisionTree-inl.h>
#include <gtsam/dllexport.h>
namespace gtsam {
@ -29,7 +28,7 @@ namespace gtsam {
* TODO: consider eliminating this class altogether?
*/
template<typename L>
class GTSAM_EXPORT AlgebraicDecisionTree: public DecisionTree<L, double> {
class AlgebraicDecisionTree: public DecisionTree<L, double> {
public:

View File

@ -49,7 +49,7 @@ namespace gtsam {
// Leaf
/*********************************************************************************/
template<typename L, typename Y>
class GTSAM_EXPORT DecisionTree<L, Y>::Leaf: public DecisionTree<L, Y>::Node {
class DecisionTree<L, Y>::Leaf: public DecisionTree<L, Y>::Node {
/** constant stored in this leaf */
Y constant_;
@ -139,7 +139,7 @@ namespace gtsam {
// Choice
/*********************************************************************************/
template<typename L, typename Y>
class GTSAM_EXPORT DecisionTree<L, Y>::Choice: public DecisionTree<L, Y>::Node {
class DecisionTree<L, Y>::Choice: public DecisionTree<L, Y>::Node {
/** the label of the variable on which we split */
L label_;

View File

@ -20,7 +20,6 @@
#pragma once
#include <gtsam/discrete/Assignment.h>
#include <gtsam/dllexport.h>
#include <boost/function.hpp>
#include <functional>
@ -36,7 +35,7 @@ namespace gtsam {
* Y = function range (any algebra), e.g., bool, int, double
*/
template<typename L, typename Y>
class GTSAM_EXPORT DecisionTree {
class DecisionTree {
public:
@ -48,11 +47,11 @@ namespace gtsam {
typedef std::pair<L,size_t> LabelC;
/** DTs consist of Leaf and Choice nodes, both subclasses of Node */
class GTSAM_EXPORT Leaf;
class GTSAM_EXPORT Choice;
class Leaf;
class Choice;
/** ------------------------ Node base class --------------------------- */
class GTSAM_EXPORT Node {
class Node {
public:
typedef boost::shared_ptr<const Node> Ptr;

View File

@ -91,7 +91,7 @@ bool DiscreteConditional::equals(const DiscreteFactor& other,
return false;
else {
const DecisionTreeFactor& f(
dynamic_cast<const DecisionTreeFactor&>(other));
static_cast<const DecisionTreeFactor&>(other));
return DecisionTreeFactor::equals(f, tol);
}
}

View File

@ -27,8 +27,8 @@ using namespace std;
namespace gtsam {
// explicit instantiation
//template class GTSAM_EXPORT DecisionTree<Key, double>;
//template class GTSAM_EXPORT AlgebraicDecisionTree<Key>;
template class DecisionTree<Key, double>;
template class AlgebraicDecisionTree<Key>;
/* ************************************************************************* */
double Potentials::safe_div(const double& a, const double& b) {

View File

@ -21,7 +21,6 @@
#include <boost/range.hpp>
#include <gtsam/inference/Key.h>
#include <gtsam/dllexport.h>
namespace gtsam {
@ -38,7 +37,7 @@ namespace gtsam {
* \nosubgrouping
*/
template<class FACTOR, class DERIVEDCONDITIONAL>
class GTSAM_EXPORT Conditional
class Conditional
{
protected:
/** The first nrFrontal variables are frontal and the rest are parents. */

View File

@ -90,7 +90,7 @@ class CRefCallAddCopy {
* \nosubgrouping
*/
template <class FACTOR>
class GTSAM_EXPORT FactorGraph {
class FactorGraph {
public:
typedef FACTOR FactorType; ///< factor type
typedef boost::shared_ptr<FACTOR>