12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed #ifdef overrides for GaussianFactorGraph and some extraneous GSL code

release/4.3a0
Alex Cunningham 2010-07-09 16:33:52 +00:00
parent 707213a502
commit 1a11998273
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cpp/GaussianFactorGraph.cpp
View File

@ -22,9 +22,6 @@ using namespace std;
using namespace gtsam; using namespace gtsam;
using namespace boost::assign; using namespace boost::assign;
//#define USE_FAST_ELIMINATE
// trick from some reading group // trick from some reading group
#define FOREACH_PAIR( KEY, VAL, COL) BOOST_FOREACH (boost::tie(KEY,VAL),COL) #define FOREACH_PAIR( KEY, VAL, COL) BOOST_FOREACH (boost::tie(KEY,VAL),COL)
@ -125,14 +122,10 @@ set<Symbol> GaussianFactorGraph::find_separator(const Symbol& key) const
/* ************************************************************************* */ /* ************************************************************************* */
GaussianConditional::shared_ptr GaussianConditional::shared_ptr
GaussianFactorGraph::eliminateOne(const Symbol& key, bool old) { GaussianFactorGraph::eliminateOne(const Symbol& key, bool old) {
#ifdef USE_FAST_ELIMINATE
return eliminateOneMatrixJoin(key);
#else
if (old) if (old)
return gtsam::eliminateOne<GaussianFactor,GaussianConditional>(*this, key); return gtsam::eliminateOne<GaussianFactor,GaussianConditional>(*this, key);
else else
return eliminateOneMatrixJoin(key); return eliminateOneMatrixJoin(key);
#endif
} }
/* ************************************************************************* */ /* ************************************************************************* */

5
cpp/Vector.cpp
View File

@ -20,11 +20,6 @@
#include <Windows.h> #include <Windows.h>
#endif #endif
#ifdef GSL
#include <gsl/gsl_blas.h> // needed for gsl blas
#include <gsl/gsl_linalg.h>
#endif
#include <boost/numeric/ublas/io.hpp> #include <boost/numeric/ublas/io.hpp>
#include <boost/numeric/ublas/vector_proxy.hpp> #include <boost/numeric/ublas/vector_proxy.hpp>
#include <boost/random/normal_distribution.hpp> #include <boost/random/normal_distribution.hpp>