Commit f36543db authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

fixes for CLP

parent b7d0ca2f
......@@ -12,7 +12,7 @@
#include <hpp/centroidal-dynamics/solver_LP_abstract.hh>
#include <hpp/centroidal-dynamics/util.hh>
#include "ClpSimplex.hpp"
#include "coin/ClpSimplex.hpp"
namespace centroidal_dynamics {
......
......@@ -13,10 +13,9 @@
#include <fstream>
#include <iostream>
#include "cdd.h"
#include "cddmp.h"
#include "cddtypes.h"
#include "setoper.h"
// cdd.h needs to be included after setoper.h
#include "cdd.h"
namespace centroidal_dynamics {
......
......@@ -7,7 +7,7 @@
#include <hpp/centroidal-dynamics/solver_LP_clp.hh>
#include "CoinBuild.hpp"
#include "coin/CoinBuild.hpp"
namespace centroidal_dynamics {
......
......@@ -6,10 +6,10 @@
#ifdef CLP_FOUND
#include <hpp/centroidal-dynamics/solver_LP_clp.hh>
#include "ClpSimplex.hpp"
#include "CoinBuild.hpp"
#include "CoinModel.hpp"
#include "CoinTime.hpp"
#include "coin/ClpSimplex.hpp"
#include "coin/CoinBuild.hpp"
#include "coin/CoinModel.hpp"
#include "coin/CoinTime.hpp"
#endif
#include <hpp/centroidal-dynamics/logger.hh>
......@@ -348,7 +348,7 @@ void test_small_LP() {
double row2Value[] = {1.0, -5.0, 1.0};
model.addRow(3, row2Index, row2Value, 1.0, 1.0);
int n = model.getdimVarXs();
int n = model.getNumCols();
int m = model.getNumRows();
cout << "Problem has " << n << " variables and " << m << " constraints.\n";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment