Remove obsolete definitions
parent
a07f1497c7
commit
62b188473b
|
@ -205,23 +205,5 @@ namespace gtsam {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
void GaussianBayesNet::saveGraph(const std::string& s,
|
|
||||||
const KeyFormatter& keyFormatter) const {
|
|
||||||
std::ofstream of(s.c_str());
|
|
||||||
of << "digraph G{\n";
|
|
||||||
|
|
||||||
for (auto conditional : boost::adaptors::reverse(*this)) {
|
|
||||||
typename GaussianConditional::Frontals frontals = conditional->frontals();
|
|
||||||
Key me = frontals.front();
|
|
||||||
typename GaussianConditional::Parents parents = conditional->parents();
|
|
||||||
for (Key p : parents)
|
|
||||||
of << keyFormatter(p) << "->" << keyFormatter(me) << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
of << "}";
|
|
||||||
of.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ************************************************************************* */
|
|
||||||
|
|
||||||
} // namespace gtsam
|
} // namespace gtsam
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include <gtsam/inference/FactorGraph.h>
|
#include <gtsam/inference/FactorGraph.h>
|
||||||
#include <gtsam/global_includes.h>
|
#include <gtsam/global_includes.h>
|
||||||
|
|
||||||
|
#include <utility>
|
||||||
namespace gtsam {
|
namespace gtsam {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -75,6 +76,13 @@ namespace gtsam {
|
||||||
/** Check equality */
|
/** Check equality */
|
||||||
bool equals(const This& bn, double tol = 1e-9) const;
|
bool equals(const This& bn, double tol = 1e-9) const;
|
||||||
|
|
||||||
|
/// print graph
|
||||||
|
void print(
|
||||||
|
const std::string& s = "",
|
||||||
|
const KeyFormatter& formatter = DefaultKeyFormatter) const override {
|
||||||
|
Base::print(s, formatter);
|
||||||
|
}
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
|
|
||||||
/// @name Standard Interface
|
/// @name Standard Interface
|
||||||
|
@ -189,23 +197,6 @@ namespace gtsam {
|
||||||
*/
|
*/
|
||||||
VectorValues backSubstituteTranspose(const VectorValues& gx) const;
|
VectorValues backSubstituteTranspose(const VectorValues& gx) const;
|
||||||
|
|
||||||
/// print graph
|
|
||||||
void print(
|
|
||||||
const std::string& s = "",
|
|
||||||
const KeyFormatter& formatter = DefaultKeyFormatter) const override {
|
|
||||||
Base::print(s, formatter);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Save the GaussianBayesNet as an image. Requires `dot` to be
|
|
||||||
* installed.
|
|
||||||
*
|
|
||||||
* @param s The name of the figure.
|
|
||||||
* @param keyFormatter Formatter to use for styling keys in the graph.
|
|
||||||
*/
|
|
||||||
void saveGraph(const std::string& s, const KeyFormatter& keyFormatter =
|
|
||||||
DefaultKeyFormatter) const;
|
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -16,41 +16,16 @@
|
||||||
* @author Richard Roberts
|
* @author Richard Roberts
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <gtsam/symbolic/SymbolicBayesNet.h>
|
|
||||||
#include <gtsam/symbolic/SymbolicConditional.h>
|
|
||||||
#include <gtsam/inference/FactorGraph-inst.h>
|
#include <gtsam/inference/FactorGraph-inst.h>
|
||||||
|
#include <gtsam/symbolic/SymbolicBayesNet.h>
|
||||||
#include <boost/range/adaptor/reversed.hpp>
|
|
||||||
#include <fstream>
|
|
||||||
|
|
||||||
namespace gtsam {
|
namespace gtsam {
|
||||||
|
|
||||||
// Instantiate base class
|
// Instantiate base class
|
||||||
template class FactorGraph<SymbolicConditional>;
|
template class FactorGraph<SymbolicConditional>;
|
||||||
|
|
||||||
/* ************************************************************************* */
|
|
||||||
bool SymbolicBayesNet::equals(const This& bn, double tol) const
|
|
||||||
{
|
|
||||||
return Base::equals(bn, tol);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ************************************************************************* */
|
|
||||||
void SymbolicBayesNet::saveGraph(const std::string &s, const KeyFormatter& keyFormatter) const
|
|
||||||
{
|
|
||||||
std::ofstream of(s.c_str());
|
|
||||||
of << "digraph G{\n";
|
|
||||||
|
|
||||||
for (auto conditional: boost::adaptors::reverse(*this)) {
|
|
||||||
SymbolicConditional::Frontals frontals = conditional->frontals();
|
|
||||||
Key me = frontals.front();
|
|
||||||
SymbolicConditional::Parents parents = conditional->parents();
|
|
||||||
for(Key p: parents)
|
|
||||||
of << p << "->" << me << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
of << "}";
|
|
||||||
of.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
/* ************************************************************************* */
|
||||||
|
bool SymbolicBayesNet::equals(const This& bn, double tol) const {
|
||||||
|
return Base::equals(bn, tol);
|
||||||
}
|
}
|
||||||
|
} // namespace gtsam
|
||||||
|
|
|
@ -80,13 +80,6 @@ namespace gtsam {
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
|
|
||||||
/// @name Standard Interface
|
|
||||||
/// @{
|
|
||||||
|
|
||||||
GTSAM_EXPORT void saveGraph(const std::string &s, const KeyFormatter& keyFormatter = DefaultKeyFormatter) const;
|
|
||||||
|
|
||||||
/// @}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/** Serialization function */
|
/** Serialization function */
|
||||||
friend class boost::serialization::access;
|
friend class boost::serialization::access;
|
||||||
|
|
Loading…
Reference in New Issue