diff --git a/gtsam/discrete/DecisionTreeFactor.cpp b/gtsam/discrete/DecisionTreeFactor.cpp index ba24b58b9..2607a80ef 100644 --- a/gtsam/discrete/DecisionTreeFactor.cpp +++ b/gtsam/discrete/DecisionTreeFactor.cpp @@ -56,7 +56,6 @@ namespace gtsam { /* ************************************************************************* */ double DecisionTreeFactor::safe_div(const double &a, const double &b) { - // cout << boost::format("%g / %g = %g\n") % a % b % ((a == 0) ? 0 : (a / b)); // The use for safe_div is when we divide the product factor by the sum // factor. If the product or sum is zero, we accord zero probability to the // event. diff --git a/gtsam/discrete/Potentials.h b/gtsam/discrete/Potentials.h deleted file mode 100644 index 93452d8fb..000000000 --- a/gtsam/discrete/Potentials.h +++ /dev/null @@ -1,35 +0,0 @@ -/* ---------------------------------------------------------------------------- - - * GTSAM Copyright 2010, Georgia Tech Research Corporation, - * Atlanta, Georgia 30332-0415 - * All Rights Reserved - * Authors: Frank Dellaert, et al. (see THANKS for the full author list) - - * See LICENSE for the license information - - * -------------------------------------------------------------------------- */ - -/** - * @file Potentials.h - * @date March 24, 2011 - * @author Frank Dellaert - */ - -#pragma once - -#include -#include -#include - -#include -#include - -namespace gtsam { - - /* - * @deprecated - * @brief Deprecated class for storing an ADT with some convenience methods - * */ - typedef GTSAM_DEPRECATED AlgebraicDecisionTree Potentials; - -} // namespace gtsam diff --git a/gtsam/inference/BayesTree.h b/gtsam/inference/BayesTree.h index 132098d0a..d368bd486 100644 --- a/gtsam/inference/BayesTree.h +++ b/gtsam/inference/BayesTree.h @@ -73,8 +73,6 @@ namespace gtsam { typedef CLIQUE Clique; ///< The clique type, normally BayesTreeClique typedef boost::shared_ptr sharedClique; ///< Shared pointer to a clique - typedef GTSAM_DEPRECATED Clique Node; ///< Synonym for Clique (TODO: remove) - typedef GTSAM_DEPRECATED sharedClique sharedNode; ///< Synonym for sharedClique (TODO: remove) typedef typename CLIQUE::ConditionalType ConditionalType; typedef boost::shared_ptr sharedConditional; typedef typename CLIQUE::BayesNetType BayesNetType; @@ -270,6 +268,12 @@ namespace gtsam { /// @} +#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V42 + public: + typedef GTSAM_DEPRECATED Clique Node; ///< Synonym for Clique (TODO: remove) + typedef GTSAM_DEPRECATED sharedClique sharedNode; ///< Synonym for sharedClique (TODO: remove) +#endif + }; // BayesTree /* ************************************************************************* */