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

Fixed includes

release/4.3a0
krunalchande 2014-12-23 14:44:43 -05:00 committed by thduynguyen
parent 79b69d4489
commit e0e5e72020
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtsam_unstable/nonlinear/NonlinearInequalityFactorGraph.h
View File

@ -18,18 +18,19 @@
*/ */
#pragma once #pragma once
#include <gtsam/nonlinear/NonlinearFactorGraph.h> #include <gtsam/linear/VectorValues.h>
#include <gtsam_unstable/linear/LinearInequalityFactorGraph.h> #include <gtsam_unstable/linear/LinearInequalityFactorGraph.h>
#include <gtsam_unstable/nonlinear/NonlinearConstraint.h>
namespace gtsam { namespace gtsam {
class NonlinearInequalityFactorGraph : public FactorGraph<NonlinearFactor> { class NonlinearInequalityFactorGraph : public FactorGraph<NonlinearFactor> {
public: public:
/// default constructor /// Default constructor
NonlinearInequalityFactorGraph() { NonlinearInequalityFactorGraph() {
} }
/// linearize to a LinearEqualityFactorGraph /// Linearize to a LinearEqualityFactorGraph
LinearInequalityFactorGraph::shared_ptr linearize( LinearInequalityFactorGraph::shared_ptr linearize(
const Values& linearizationPoint) const { const Values& linearizationPoint) const {
LinearInequalityFactorGraph::shared_ptr linearGraph( LinearInequalityFactorGraph::shared_ptr linearGraph(

2
gtsam_unstable/nonlinear/SQPSimple.cpp
View File

@ -18,6 +18,8 @@
*/ */
#include <gtsam_unstable/nonlinear/SQPSimple.h> #include <gtsam_unstable/nonlinear/SQPSimple.h>
#include <gtsam_unstable/linear/QPSolver.h>
namespace gtsam { namespace gtsam {

4
gtsam_unstable/nonlinear/SQPSimple.h
View File

@ -18,13 +18,9 @@
*/ */
#pragma once #pragma once
#include <gtsam/linear/VectorValues.h>
#include <gtsam/nonlinear/NonlinearFactorGraph.h> #include <gtsam/nonlinear/NonlinearFactorGraph.h>
#include <gtsam_unstable/nonlinear/NonlinearEqualityFactorGraph.h> #include <gtsam_unstable/nonlinear/NonlinearEqualityFactorGraph.h>
#include <gtsam_unstable/nonlinear/NonlinearInequalityFactorGraph.h> #include <gtsam_unstable/nonlinear/NonlinearInequalityFactorGraph.h>
#include <gtsam_unstable/linear/LinearInequalityFactorGraph.h>
#include <gtsam_unstable/nonlinear/NonlinearConstraint.h>
#include <gtsam_unstable/linear/QPSolver.h>
namespace gtsam { namespace gtsam {