diff --git a/gtsam/nonlinear/NonlinearFactorGraph-inl.h b/gtsam/nonlinear/NonlinearFactorGraph-inl.h index 621f3b91b..473107429 100644 --- a/gtsam/nonlinear/NonlinearFactorGraph-inl.h +++ b/gtsam/nonlinear/NonlinearFactorGraph-inl.h @@ -92,8 +92,7 @@ namespace gtsam { /* ************************************************************************* */ template - SymbolicFactorGraph::shared_ptr NonlinearFactorGraph::symbolic( - const VALUES& config, const Ordering& ordering) const { + SymbolicFactorGraph::shared_ptr NonlinearFactorGraph::symbolic(const Ordering& ordering) const { // Generate the symbolic factor graph SymbolicFactorGraph::shared_ptr symbolicfg(new SymbolicFactorGraph); symbolicfg->reserve(this->size()); @@ -114,7 +113,7 @@ namespace gtsam { VALUES>::symbolic(const VALUES& config) const { // Generate an initial key ordering in iterator order Ordering::shared_ptr ordering(config.orderingArbitrary()); - return make_pair(symbolic(config, *ordering), ordering); + return make_pair(symbolic(*ordering), ordering); } /* ************************************************************************* */ diff --git a/gtsam/nonlinear/NonlinearFactorGraph.h b/gtsam/nonlinear/NonlinearFactorGraph.h index e17083f60..605842179 100644 --- a/gtsam/nonlinear/NonlinearFactorGraph.h +++ b/gtsam/nonlinear/NonlinearFactorGraph.h @@ -64,7 +64,7 @@ namespace gtsam { /** * Create a symbolic factor graph using an existing ordering */ - SymbolicFactorGraph::shared_ptr symbolic(const VALUES& config, const Ordering& ordering) const; + SymbolicFactorGraph::shared_ptr symbolic(const Ordering& ordering) const; /** * Create a symbolic factor graph and initial variable ordering that can diff --git a/gtsam/nonlinear/NonlinearOptimizer-inl.h b/gtsam/nonlinear/NonlinearOptimizer-inl.h index 3a731e588..02ead8b0d 100644 --- a/gtsam/nonlinear/NonlinearOptimizer-inl.h +++ b/gtsam/nonlinear/NonlinearOptimizer-inl.h @@ -36,7 +36,7 @@ namespace gtsam { graph_(graph), values_(values), error_(graph->error(*values)), ordering_(ordering), parameters_(parameters), iterations_(0), dimensions_(new vector(values->dims(*ordering))), - structure_(new VariableIndex(*graph->symbolic(*values, *ordering))) { + structure_(new VariableIndex(*graph->symbolic(*ordering))) { if (!graph) throw std::invalid_argument( "NonlinearOptimizer constructor: graph = NULL"); if (!values) throw std::invalid_argument(