From f36543db478a12c1bd62f86a9783b370f12ca7e7 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 5 Apr 2022 11:49:40 +0200
Subject: [PATCH] fixes for CLP
---
include/hpp/centroidal-dynamics/solver_LP_clp.hh | 2 +-
include/hpp/centroidal-dynamics/util.hh | 5 ++---
src/solver_LP_clp.cpp | 2 +-
test/test_LP_solvers.cpp | 10 +++++-----
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/include/hpp/centroidal-dynamics/solver_LP_clp.hh b/include/hpp/centroidal-dynamics/solver_LP_clp.hh
index f0e6382..bdc5973 100644
--- a/include/hpp/centroidal-dynamics/solver_LP_clp.hh
+++ b/include/hpp/centroidal-dynamics/solver_LP_clp.hh
@@ -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 {
diff --git a/include/hpp/centroidal-dynamics/util.hh b/include/hpp/centroidal-dynamics/util.hh
index ec14d2a..bde796b 100644
--- a/include/hpp/centroidal-dynamics/util.hh
+++ b/include/hpp/centroidal-dynamics/util.hh
@@ -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 {
diff --git a/src/solver_LP_clp.cpp b/src/solver_LP_clp.cpp
index c8a35c1..4495e7a 100644
--- a/src/solver_LP_clp.cpp
+++ b/src/solver_LP_clp.cpp
@@ -7,7 +7,7 @@
#include <hpp/centroidal-dynamics/solver_LP_clp.hh>
-#include "CoinBuild.hpp"
+#include "coin/CoinBuild.hpp"
namespace centroidal_dynamics {
diff --git a/test/test_LP_solvers.cpp b/test/test_LP_solvers.cpp
index 43aafc2..df86d1c 100644
--- a/test/test_LP_solvers.cpp
+++ b/test/test_LP_solvers.cpp
@@ -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";
--
GitLab