Add deprecations

gtsam/base/TestableAssertions.h

@@ -85,7 +85,7 @@ bool assert_equal(const V& expected, const boost::optional<const V&>& actual, do
  * \deprecated: use container equals instead
  */
 template<class V>
-bool assert_equal(const std::vector<V>& expected, const std::vector<V>& actual, double tol = 1e-9) {
+bool GTSAM_DEPRECATED assert_equal(const std::vector<V>& expected, const std::vector<V>& actual, double tol = 1e-9) {
   bool match = true;
   if (expected.size() != actual.size())
     match = false;

gtsam/base/Vector.h

@@ -207,14 +207,14 @@ inline double inner_prod(const V1 &a, const V2& b) {
  * BLAS Level 1 scal: x <- alpha*x
  * \deprecated: use operators instead
  */
-inline void scal(double alpha, Vector& x) { x *= alpha; }
+inline void GTSAM_DEPRECATED scal(double alpha, Vector& x) { x *= alpha; }
 
 /**
  * BLAS Level 1 axpy: y <- alpha*x + y
  * \deprecated: use operators instead
  */
 template<class V1, class V2>
-inline void axpy(double alpha, const V1& x, V2& y) {
+inline void GTSAM_DEPRECATED axpy(double alpha, const V1& x, V2& y) {
   assert (y.size()==x.size());
   y += alpha * x;
 }

gtsam/base/types.h

@@ -34,6 +34,14 @@
 #include <tbb/scalable_allocator.h>
 #endif
 
+#if defined(__GNUC__) || defined(__clang__)
+#define GTSAM_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#define GTSAM_DEPRECATED __declspec(deprecated)
+#else
+#define GTSAM_DEPRECATED
+#endif
+
 #ifdef GTSAM_USE_EIGEN_MKL_OPENMP
 #include <omp.h>
 #endif

gtsam/discrete/AlgebraicDecisionTree.h

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

gtsam/discrete/DecisionTree-inl.h

@@ -49,7 +49,7 @@ namespace gtsam {
   // Leaf
   /*********************************************************************************/
   template<typename L, typename Y>
-  class DecisionTree<L, Y>::Leaf: public DecisionTree<L, Y>::Node {
+  class GTSAM_EXPORT 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 DecisionTree<L, Y>::Choice: public DecisionTree<L, Y>::Node {
+  class GTSAM_EXPORT DecisionTree<L, Y>::Choice: public DecisionTree<L, Y>::Node {
 
     /** the label of the variable on which we split */
     L label_;

gtsam/discrete/DecisionTree.h

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

gtsam/discrete/DiscreteConditional.cpp

@@ -35,7 +35,7 @@ using namespace std;
 namespace gtsam {
 
 // Instantiate base class
-template class Conditional<DecisionTreeFactor, DiscreteConditional> ;
+template class GTSAM_EXPORT Conditional<DecisionTreeFactor, DiscreteConditional> ;
 
 /* ******************************************************************************** */
 DiscreteConditional::DiscreteConditional(const size_t nrFrontals,
@@ -91,7 +91,7 @@ bool DiscreteConditional::equals(const DiscreteFactor& other,
     return false;
   else {
     const DecisionTreeFactor& f(
-        static_cast<const DecisionTreeFactor&>(other));
+        dynamic_cast<const DecisionTreeFactor&>(other));
     return DecisionTreeFactor::equals(f, tol);
   }
 }

gtsam/discrete/Potentials.cpp

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

gtsam/discrete/Potentials.h

@@ -29,7 +29,7 @@ namespace gtsam {
   /**
    * A base class for both DiscreteFactor and DiscreteConditional
    */
-  class Potentials: public AlgebraicDecisionTree<Key> {
+  class GTSAM_EXPORT Potentials: public AlgebraicDecisionTree<Key> {
 
   public:
 

gtsam/inference/Conditional.h

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

gtsam/inference/EliminateableFactorGraph.h

@@ -290,7 +290,7 @@ namespace gtsam {
   public:
   #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V41
     /** \deprecated ordering and orderingType shouldn't both be specified */
-    boost::shared_ptr<BayesNetType> eliminateSequential(
+    boost::shared_ptr<BayesNetType> GTSAM_DEPRECATED eliminateSequential(
       const Ordering& ordering,
       const Eliminate& function,
       OptionalVariableIndex variableIndex,
@@ -299,7 +299,7 @@ namespace gtsam {
       }
     
     /** \deprecated orderingType specified first for consistency */
-    boost::shared_ptr<BayesNetType> eliminateSequential(
+    boost::shared_ptr<BayesNetType> GTSAM_DEPRECATED eliminateSequential(
       const Eliminate& function,
       OptionalVariableIndex variableIndex = boost::none,
       OptionalOrderingType orderingType = boost::none) const {
@@ -307,7 +307,7 @@ namespace gtsam {
       }
 
     /** \deprecated ordering and orderingType shouldn't both be specified */
-    boost::shared_ptr<BayesTreeType> eliminateMultifrontal(
+    boost::shared_ptr<BayesTreeType> GTSAM_DEPRECATED eliminateMultifrontal(
       const Ordering& ordering,
       const Eliminate& function,
       OptionalVariableIndex variableIndex,
@@ -316,7 +316,7 @@ namespace gtsam {
       }
 
     /** \deprecated orderingType specified first for consistency */
-    boost::shared_ptr<BayesTreeType> eliminateMultifrontal(
+    boost::shared_ptr<BayesTreeType> GTSAM_DEPRECATED eliminateMultifrontal(
       const Eliminate& function,
       OptionalVariableIndex variableIndex = boost::none,
       OptionalOrderingType orderingType = boost::none) const {
@@ -324,7 +324,7 @@ namespace gtsam {
       }
 
     /** \deprecated */
-    boost::shared_ptr<BayesNetType> marginalMultifrontalBayesNet(
+    boost::shared_ptr<BayesNetType> GTSAM_DEPRECATED marginalMultifrontalBayesNet(
       boost::variant<const Ordering&, const KeyVector&> variables,
       boost::none_t,
       const Eliminate& function = EliminationTraitsType::DefaultEliminate,
@@ -333,7 +333,7 @@ namespace gtsam {
       }
 
     /** \deprecated */
-    boost::shared_ptr<BayesTreeType> marginalMultifrontalBayesTree(
+    boost::shared_ptr<BayesTreeType> GTSAM_DEPRECATED marginalMultifrontalBayesTree(
       boost::variant<const Ordering&, const KeyVector&> variables,
       boost::none_t,
       const Eliminate& function = EliminationTraitsType::DefaultEliminate,

gtsam/inference/FactorGraph.h

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

gtsam/nonlinear/ExpressionFactor.h

@@ -305,7 +305,7 @@ struct traits<ExpressionFactorN<T, Args...>>
  * \deprecated Prefer the more general ExpressionFactorN<>.
  */
 template <typename T, typename A1, typename A2>
-class ExpressionFactor2 : public ExpressionFactorN<T, A1, A2> {
+class GTSAM_DEPRECATED ExpressionFactor2 : public ExpressionFactorN<T, A1, A2> {
 public:
   /// Destructor
   ~ExpressionFactor2() override {}

gtsam/nonlinear/Marginals.h

@@ -133,15 +133,15 @@ protected:
 public:
 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V41
   /** \deprecated argument order changed due to removing boost::optional<Ordering> */
-  Marginals(const NonlinearFactorGraph& graph, const Values& solution, Factorization factorization,
+  GTSAM_DEPRECATED Marginals(const NonlinearFactorGraph& graph, const Values& solution, Factorization factorization,
             const Ordering& ordering) : Marginals(graph, solution, ordering, factorization) {}
 
   /** \deprecated argument order changed due to removing boost::optional<Ordering> */
-  Marginals(const GaussianFactorGraph& graph, const Values& solution, Factorization factorization,
+  GTSAM_DEPRECATED Marginals(const GaussianFactorGraph& graph, const Values& solution, Factorization factorization,
             const Ordering& ordering) : Marginals(graph, solution, ordering, factorization) {}
 
   /** \deprecated argument order changed due to removing boost::optional<Ordering> */
-  Marginals(const GaussianFactorGraph& graph, const VectorValues& solution, Factorization factorization,
+  GTSAM_DEPRECATED Marginals(const GaussianFactorGraph& graph, const VectorValues& solution, Factorization factorization,
             const Ordering& ordering) : Marginals(graph, solution, ordering, factorization) {}
 #endif
 

gtsam/nonlinear/NonlinearFactorGraph.h

@@ -267,12 +267,12 @@ namespace gtsam {
 
 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V41
     /** \deprecated */
-    boost::shared_ptr<HessianFactor> linearizeToHessianFactor(
+    boost::shared_ptr<HessianFactor> GTSAM_DEPRECATED linearizeToHessianFactor(
         const Values& values, boost::none_t, const Dampen& dampen = nullptr) const
       {return linearizeToHessianFactor(values, dampen);}
 
     /** \deprecated */
-    Values updateCholesky(const Values& values, boost::none_t,
+    Values GTSAM_DEPRECATED updateCholesky(const Values& values, boost::none_t,
                           const Dampen& dampen = nullptr) const
       {return updateCholesky(values, dampen);}
 #endif