diff --git a/cpp/GaussianFactorGraph.cpp b/cpp/GaussianFactorGraph.cpp index 847d32bb6..33dd8c6a3 100644 --- a/cpp/GaussianFactorGraph.cpp +++ b/cpp/GaussianFactorGraph.cpp @@ -22,9 +22,6 @@ using namespace std; using namespace gtsam; using namespace boost::assign; -//#define USE_FAST_ELIMINATE - - // trick from some reading group #define FOREACH_PAIR( KEY, VAL, COL) BOOST_FOREACH (boost::tie(KEY,VAL),COL) @@ -125,14 +122,10 @@ set GaussianFactorGraph::find_separator(const Symbol& key) const /* ************************************************************************* */ GaussianConditional::shared_ptr GaussianFactorGraph::eliminateOne(const Symbol& key, bool old) { -#ifdef USE_FAST_ELIMINATE - return eliminateOneMatrixJoin(key); -#else if (old) return gtsam::eliminateOne(*this, key); else return eliminateOneMatrixJoin(key); -#endif } /* ************************************************************************* */ diff --git a/cpp/Vector.cpp b/cpp/Vector.cpp index c5e072151..c1a593f10 100644 --- a/cpp/Vector.cpp +++ b/cpp/Vector.cpp @@ -20,11 +20,6 @@ #include #endif -#ifdef GSL -#include // needed for gsl blas -#include -#endif - #include #include #include