From 704dc865131ddd630f4eae05af175e4415781018 Mon Sep 17 00:00:00 2001 From: Steve Tonneau <stonneau@laas.fr> Date: Wed, 8 Mar 2017 15:14:19 +0100 Subject: [PATCH] more refactoring in names --- include/centroidal-dynamics-lib/centroidal_dynamics.hh | 4 ++-- include/centroidal-dynamics-lib/logger.hh | 8 ++++---- include/centroidal-dynamics-lib/solver_LP_abstract.hh | 4 ++-- include/centroidal-dynamics-lib/solver_LP_clp.hh | 4 ++-- include/centroidal-dynamics-lib/solver_LP_qpoases.hh | 4 ++-- include/centroidal-dynamics-lib/util.hh | 4 ++-- src/centroidal_dynamics.cpp | 4 ++-- src/logger.cpp | 4 ++-- src/solver_LP_abstract.cpp | 4 ++-- src/solver_LP_clp.cpp | 4 ++-- src/solver_LP_qpoases.cpp | 4 ++-- src/util.cpp | 4 ++-- test/test_LP_solvers.cpp | 2 +- test/test_static_equilibrium.cpp | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/centroidal-dynamics-lib/centroidal_dynamics.hh b/include/centroidal-dynamics-lib/centroidal_dynamics.hh index 7d423b8..5ecf4aa 100644 --- a/include/centroidal-dynamics-lib/centroidal_dynamics.hh +++ b/include/centroidal-dynamics-lib/centroidal_dynamics.hh @@ -11,7 +11,7 @@ #include <centroidal-dynamics-lib/util.hh> #include <centroidal-dynamics-lib/solver_LP_abstract.hh> -namespace robust_equilibrium +namespace centroidal_dynamics { enum CENTROIDAL_DYNAMICS_DLLAPI EquilibriumAlgorithm @@ -299,6 +299,6 @@ public: }; -} // end namespace robust_equilibrium +} // end namespace centroidal_dynamics #endif diff --git a/include/centroidal-dynamics-lib/logger.hh b/include/centroidal-dynamics-lib/logger.hh index 9015d15..7fe616d 100644 --- a/include/centroidal-dynamics-lib/logger.hh +++ b/include/centroidal-dynamics-lib/logger.hh @@ -3,8 +3,8 @@ * Author: Andrea Del Prete */ -#ifndef __robust_equilibrium_lib_logger_H__ -#define __robust_equilibrium_lib_logger_H__ +#ifndef __centroidal_dynamics_lib_logger_H__ +#define __centroidal_dynamics_lib_logger_H__ /* --------------------------------------------------------------------- */ /* --- INCLUDE --------------------------------------------------------- */ @@ -16,7 +16,7 @@ #include <map> #include "boost/assign.hpp" -namespace robust_equilibrium +namespace centroidal_dynamics { //#define LOGGER_VERBOSITY_ERROR @@ -183,6 +183,6 @@ namespace robust_equilibrium /** Method to get the logger (singleton). */ Logger& getLogger(); -} // namespace robust_equilibrium +} // namespace centroidal_dynamics #endif // #ifndef __sot_torque_control_trajectory_generators_H__ diff --git a/include/centroidal-dynamics-lib/solver_LP_abstract.hh b/include/centroidal-dynamics-lib/solver_LP_abstract.hh index 43ccb29..6acb75a 100644 --- a/include/centroidal-dynamics-lib/solver_LP_abstract.hh +++ b/include/centroidal-dynamics-lib/solver_LP_abstract.hh @@ -10,7 +10,7 @@ #include <centroidal-dynamics-lib/config.hh> #include <centroidal-dynamics-lib/util.hh> -namespace robust_equilibrium +namespace centroidal_dynamics { /** @@ -147,6 +147,6 @@ public: }; -} // end namespace robust_equilibrium +} // end namespace centroidal_dynamics #endif //CENTROIDAL_DYNAMICS_LIB_SOLVER_LP_ABSTRACT_HH diff --git a/include/centroidal-dynamics-lib/solver_LP_clp.hh b/include/centroidal-dynamics-lib/solver_LP_clp.hh index 6d0c2ee..b6829d3 100644 --- a/include/centroidal-dynamics-lib/solver_LP_clp.hh +++ b/include/centroidal-dynamics-lib/solver_LP_clp.hh @@ -13,7 +13,7 @@ #include <centroidal-dynamics-lib/solver_LP_abstract.hh> #include "ClpSimplex.hpp" -namespace robust_equilibrium +namespace centroidal_dynamics { class CENTROIDAL_DYNAMICS_DLLAPI Solver_LP_clp: public Solver_LP_abstract @@ -50,7 +50,7 @@ public: virtual bool setMaximumTime(double seconds); }; -} // end namespace robust_equilibrium +} // end namespace centroidal_dynamics #endif //CENTROIDAL_DYNAMICS_LIB_SOLVER_LP_CLP_HH diff --git a/include/centroidal-dynamics-lib/solver_LP_qpoases.hh b/include/centroidal-dynamics-lib/solver_LP_qpoases.hh index 62bd5e9..6c0ab78 100644 --- a/include/centroidal-dynamics-lib/solver_LP_qpoases.hh +++ b/include/centroidal-dynamics-lib/solver_LP_qpoases.hh @@ -11,7 +11,7 @@ #include <centroidal-dynamics-lib/solver_LP_abstract.hh> #include <qpOASES.hpp> -namespace robust_equilibrium +namespace centroidal_dynamics { class CENTROIDAL_DYNAMICS_DLLAPI Solver_LP_qpoases: public Solver_LP_abstract @@ -47,6 +47,6 @@ public: }; -} // end namespace robust_equilibrium +} // end namespace centroidal_dynamics #endif //CENTROIDAL_DYNAMICS_LIB_SOLVER_QPOASES_HH diff --git a/include/centroidal-dynamics-lib/util.hh b/include/centroidal-dynamics-lib/util.hh index 43ea244..22a6dcb 100644 --- a/include/centroidal-dynamics-lib/util.hh +++ b/include/centroidal-dynamics-lib/util.hh @@ -16,7 +16,7 @@ #include "cdd/cddtypes.h" #include "cdd/cdd.h" -namespace robust_equilibrium +namespace centroidal_dynamics { //#define USE_FLOAT 1; @@ -129,6 +129,6 @@ namespace robust_equilibrium std::string getDateAndTimeAsString(); -} //namespace robust_equilibrium +} //namespace centroidal_dynamics #endif //_CENTROIDAL_DYNAMICS_LIB_UTIL_HH diff --git a/src/centroidal_dynamics.cpp b/src/centroidal_dynamics.cpp index 9cc69b2..329b194 100644 --- a/src/centroidal_dynamics.cpp +++ b/src/centroidal_dynamics.cpp @@ -12,7 +12,7 @@ using namespace std; -namespace robust_equilibrium +namespace centroidal_dynamics { bool StaticEquilibrium::m_is_cdd_initialized = false; @@ -638,4 +638,4 @@ bool StaticEquilibrium::checkAdmissibleAcceleration(Cref_matrixXX G, Cref_matrix } -} // end namespace robust_equilibrium +} // end namespace centroidal_dynamics diff --git a/src/logger.cpp b/src/logger.cpp index bd4a491..04f45c8 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -15,7 +15,7 @@ #include <boost/algorithm/string.hpp> #include <centroidal-dynamics-lib/logger.hh> -namespace robust_equilibrium +namespace centroidal_dynamics { using namespace std; @@ -114,5 +114,5 @@ namespace robust_equilibrium return true; } -} // namespace robust_equilibrium +} // namespace centroidal_dynamics diff --git a/src/solver_LP_abstract.cpp b/src/solver_LP_abstract.cpp index 2c80e0a..7e3e761 100644 --- a/src/solver_LP_abstract.cpp +++ b/src/solver_LP_abstract.cpp @@ -15,7 +15,7 @@ using namespace std; -namespace robust_equilibrium +namespace centroidal_dynamics { Solver_LP_abstract* Solver_LP_abstract::getNewSolver(SolverLP solverType) @@ -108,4 +108,4 @@ bool Solver_LP_abstract::setMaximumTime(double seconds) return true; } -} // end namespace robust_equilibrium +} // end namespace centroidal_dynamics diff --git a/src/solver_LP_clp.cpp b/src/solver_LP_clp.cpp index ae7789c..aa1d5d3 100644 --- a/src/solver_LP_clp.cpp +++ b/src/solver_LP_clp.cpp @@ -8,7 +8,7 @@ #include <centroidal-dynamics-lib/solver_LP_clp.hh> #include "CoinBuild.hpp" -namespace robust_equilibrium +namespace centroidal_dynamics { Solver_LP_clp::Solver_LP_clp(): Solver_LP_abstract() @@ -116,6 +116,6 @@ bool Solver_LP_clp::setMaximumTime(double seconds) return true; } -} // end namespace robust_equilibrium +} // end namespace centroidal_dynamics #endif //CLP_FOUND diff --git a/src/solver_LP_qpoases.cpp b/src/solver_LP_qpoases.cpp index 20e85bb..12fb474 100644 --- a/src/solver_LP_qpoases.cpp +++ b/src/solver_LP_qpoases.cpp @@ -8,7 +8,7 @@ USING_NAMESPACE_QPOASES -namespace robust_equilibrium +namespace centroidal_dynamics { Solver_LP_qpoases::Solver_LP_qpoases(): Solver_LP_abstract() @@ -82,4 +82,4 @@ namespace robust_equilibrium return LP_STATUS_ERROR; } -} // end namespace robust_equilibrium +} // end namespace centroidal_dynamics diff --git a/src/util.cpp b/src/util.cpp index 243fd2b..85d069d 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -9,7 +9,7 @@ #include <centroidal-dynamics-lib/util.hh> #include <ctime> -namespace robust_equilibrium +namespace centroidal_dynamics { dd_MatrixPtr cone_span_eigen_to_cdd(Cref_matrixXX input, const bool canonicalize) @@ -166,6 +166,6 @@ std::string getDateAndTimeAsString() return std::string(buffer); } -} //namespace robust_equilibrium +} //namespace centroidal_dynamics #endif //_CENTROIDAL_DYNAMICS_LIB_CONFIG_HH diff --git a/test/test_LP_solvers.cpp b/test/test_LP_solvers.cpp index d5cca37..6a90d8e 100644 --- a/test/test_LP_solvers.cpp +++ b/test/test_LP_solvers.cpp @@ -19,7 +19,7 @@ #include <iomanip> using namespace std; -using namespace robust_equilibrium; +using namespace centroidal_dynamics; USING_NAMESPACE_QPOASES #define EPS 1e-6 diff --git a/test/test_static_equilibrium.cpp b/test/test_static_equilibrium.cpp index a25f65d..f05dd7b 100644 --- a/test/test_static_equilibrium.cpp +++ b/test/test_static_equilibrium.cpp @@ -9,7 +9,7 @@ #include <centroidal-dynamics-lib/logger.hh> #include <centroidal-dynamics-lib/stop-watch.hh> -using namespace robust_equilibrium; +using namespace centroidal_dynamics; using namespace Eigen; using namespace std; -- GitLab