From bad2e7608902d74668be2c3efe1f4685aea814d9 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Fri, 10 Sep 2021 10:39:14 +0200 Subject: [PATCH] format: clang-format-12 --- .../dynamic-graph/python/convert-dg-to-py.hh | 4 +- .../dynamic-graph/python/dynamic-graph-py.hh | 11 +- include/dynamic-graph/python/fwd.hh | 6 +- include/dynamic-graph/python/interpreter.hh | 3 +- include/dynamic-graph/python/module.hh | 6 +- .../dynamic-graph/python/signal-wrapper.hh | 9 +- include/dynamic-graph/python/signal.hh | 7 +- src/dynamic_graph/convert-dg-to-py.cc | 14 +-- src/dynamic_graph/debug-py.cc | 6 +- src/dynamic_graph/dynamic-graph-py.cc | 117 +++++++++--------- src/dynamic_graph/entity-py.cc | 7 +- src/dynamic_graph/factory-py.cc | 3 +- src/dynamic_graph/pool-py.cc | 3 +- src/dynamic_graph/signal-base-py.cc | 72 +++++------ src/dynamic_graph/signal-wrapper.cc | 6 +- src/dynamic_graph/tracer/wrap.cc | 4 +- src/dynamic_graph/tracer_real_time/wrap.cc | 4 +- src/interpreter.cc | 1 + tests/custom_entity.cpp | 3 +- tests/custom_entity.h | 3 +- tests/dynamic-graph-python-test.cc | 3 +- tests/dynamic-graph-python-test.cpp | 3 +- 22 files changed, 153 insertions(+), 142 deletions(-) diff --git a/include/dynamic-graph/python/convert-dg-to-py.hh b/include/dynamic-graph/python/convert-dg-to-py.hh index d849fdc..f312d85 100644 --- a/include/dynamic-graph/python/convert-dg-to-py.hh +++ b/include/dynamic-graph/python/convert-dg-to-py.hh @@ -1,10 +1,10 @@ // Copyright 2010, Florent Lamiraux, Thomas Moulard, LAAS-CNRS. -#include <boost/python.hpp> - #include <dynamic-graph/linear-algebra.h> #include <dynamic-graph/value.h> +#include <boost/python.hpp> + namespace dynamicgraph { namespace python { namespace convert { diff --git a/include/dynamic-graph/python/dynamic-graph-py.hh b/include/dynamic-graph/python/dynamic-graph-py.hh index 0a526b5..9ba21d6 100644 --- a/include/dynamic-graph/python/dynamic-graph-py.hh +++ b/include/dynamic-graph/python/dynamic-graph-py.hh @@ -1,16 +1,15 @@ #ifndef DYNAMIC_GRAPH_PY #define DYNAMIC_GRAPH_PY -#include <iostream> -#include <sstream> - -#include <boost/python.hpp> -#include <boost/python/stl_iterator.hpp> - #include <dynamic-graph/debug.h> #include <dynamic-graph/exception-factory.h> #include <dynamic-graph/signal-base.h> +#include <boost/python.hpp> +#include <boost/python/stl_iterator.hpp> +#include <iostream> +#include <sstream> + #include "dynamic-graph/python/signal-wrapper.hh" namespace bp = boost::python; diff --git a/include/dynamic-graph/python/fwd.hh b/include/dynamic-graph/python/fwd.hh index 137a7d6..511ed21 100644 --- a/include/dynamic-graph/python/fwd.hh +++ b/include/dynamic-graph/python/fwd.hh @@ -15,7 +15,7 @@ namespace dynamicgraph { namespace python { class Interpreter; typedef shared_ptr<Interpreter> InterpreterPtr_t; -} // namespace python -} // namespace dynamicgraph +} // namespace python +} // namespace dynamicgraph -#endif // DYNAMIC_GRAPH_PYTHON_FWD_HH +#endif // DYNAMIC_GRAPH_PYTHON_FWD_HH diff --git a/include/dynamic-graph/python/interpreter.hh b/include/dynamic-graph/python/interpreter.hh index 3e81197..8df6231 100644 --- a/include/dynamic-graph/python/interpreter.hh +++ b/include/dynamic-graph/python/interpreter.hh @@ -7,10 +7,9 @@ #undef _POSIX_C_SOURCE #undef _XOPEN_SOURCE #include <dynamic-graph/python/fwd.hh> -#include "dynamic-graph/python/api.hh" -#include "dynamic-graph/python/python-compat.hh" #include "dynamic-graph/python/api.hh" +#include "dynamic-graph/python/python-compat.hh" namespace dynamicgraph { namespace python { diff --git a/include/dynamic-graph/python/module.hh b/include/dynamic-graph/python/module.hh index 35fe0cf..7d9eb0c 100644 --- a/include/dynamic-graph/python/module.hh +++ b/include/dynamic-graph/python/module.hh @@ -6,11 +6,11 @@ #include <pinocchio/fwd.hpp> #endif -#include <boost/python.hpp> +#include <dynamic-graph/entity.h> + #include <boost/mpl/for_each.hpp> #include <boost/mpl/vector.hpp> - -#include <dynamic-graph/entity.h> +#include <boost/python.hpp> #include <dynamic-graph/python/dynamic-graph-py.hh> namespace dynamicgraph { diff --git a/include/dynamic-graph/python/signal-wrapper.hh b/include/dynamic-graph/python/signal-wrapper.hh index 5b3845d..3a08ed3 100644 --- a/include/dynamic-graph/python/signal-wrapper.hh +++ b/include/dynamic-graph/python/signal-wrapper.hh @@ -4,12 +4,13 @@ #ifndef DGPY_SIGNAL_WRAPPER #define DGPY_SIGNAL_WRAPPER -#include <boost/python.hpp> -#include <boost/bind.hpp> - +#include <dynamic-graph/entity.h> #include <dynamic-graph/linear-algebra.h> #include <dynamic-graph/signal.h> -#include <dynamic-graph/entity.h> + +#include <boost/bind.hpp> +#include <boost/python.hpp> + #include "dynamic-graph/python/python-compat.hh" namespace dynamicgraph { diff --git a/include/dynamic-graph/python/signal.hh b/include/dynamic-graph/python/signal.hh index e439a32..4b7deb7 100644 --- a/include/dynamic-graph/python/signal.hh +++ b/include/dynamic-graph/python/signal.hh @@ -1,14 +1,13 @@ // Copyright 2020, Joseph Mirabel, LAAS-CNRS. -#include <sstream> - -#include <boost/python.hpp> - #include <dynamic-graph/signal-base.h> #include <dynamic-graph/signal-ptr.h> #include <dynamic-graph/signal-time-dependent.h> #include <dynamic-graph/signal.h> +#include <boost/python.hpp> +#include <sstream> + #include "dynamic-graph/python/signal-wrapper.hh" namespace dynamicgraph { diff --git a/src/dynamic_graph/convert-dg-to-py.cc b/src/dynamic_graph/convert-dg-to-py.cc index b9ff9e9..cdc22d3 100644 --- a/src/dynamic_graph/convert-dg-to-py.cc +++ b/src/dynamic_graph/convert-dg-to-py.cc @@ -1,16 +1,16 @@ // Copyright 2010, Florent Lamiraux, Thomas Moulard, LAAS-CNRS. -#include <iostream> -#include <sstream> - -#include <boost/python.hpp> -#include <boost/python/stl_iterator.hpp> +#include "dynamic-graph/python/convert-dg-to-py.hh" #include <dynamic-graph/signal-base.h> -#include <dynamic-graph/signal.h> #include <dynamic-graph/signal-caster.h> +#include <dynamic-graph/signal.h> + +#include <boost/python.hpp> +#include <boost/python/stl_iterator.hpp> +#include <iostream> +#include <sstream> -#include "dynamic-graph/python/convert-dg-to-py.hh" #include "dynamic-graph/python/python-compat.hh" namespace dynamicgraph { diff --git a/src/dynamic_graph/debug-py.cc b/src/dynamic_graph/debug-py.cc index dc72df8..c06ac79 100644 --- a/src/dynamic_graph/debug-py.cc +++ b/src/dynamic_graph/debug-py.cc @@ -5,14 +5,14 @@ #include <iostream> #define ENABLE_RT_LOG +#include <dynamic-graph/entity.h> +#include <dynamic-graph/pool.h> #include <dynamic-graph/real-time-logger.h> +#include <boost/shared_ptr.hpp> #include <map> -#include <dynamic-graph/pool.h> -#include <dynamic-graph/entity.h> #include <vector> -#include <boost/shared_ptr.hpp> #include "dynamic-graph/python/dynamic-graph-py.hh" typedef boost::shared_ptr<std::ofstream> ofstreamShrPtr; diff --git a/src/dynamic_graph/dynamic-graph-py.cc b/src/dynamic_graph/dynamic-graph-py.cc index d5ce2eb..dfdeddc 100644 --- a/src/dynamic_graph/dynamic-graph-py.cc +++ b/src/dynamic_graph/dynamic-graph-py.cc @@ -1,32 +1,30 @@ // Copyright 2010, Florent Lamiraux, Thomas Moulard, LAAS-CNRS. -#include <iostream> -#include <sstream> - -#include <boost/python.hpp> -#include <boost/python/raw_function.hpp> -#include <boost/python/suite/indexing/map_indexing_suite.hpp> - -#include <eigenpy/eigenpy.hpp> -#include <Eigen/Geometry> -#include <eigenpy/geometry.hpp> +#include "dynamic-graph/python/dynamic-graph-py.hh" +#include <dynamic-graph/command.h> #include <dynamic-graph/debug.h> -#include <dynamic-graph/exception-factory.h> -#include <dynamic-graph/signal-base.h> -#include <dynamic-graph/signal.h> -#include <dynamic-graph/signal-time-dependent.h> #include <dynamic-graph/entity.h> -#include <dynamic-graph/command.h> +#include <dynamic-graph/exception-factory.h> #include <dynamic-graph/factory.h> #include <dynamic-graph/pool.h> - +#include <dynamic-graph/signal-base.h> +#include <dynamic-graph/signal-time-dependent.h> +#include <dynamic-graph/signal.h> #include <dynamic-graph/tracer.h> -#include "dynamic-graph/python/dynamic-graph-py.hh" -#include "dynamic-graph/python/signal-wrapper.hh" +#include <Eigen/Geometry> +#include <boost/python.hpp> +#include <boost/python/raw_function.hpp> +#include <boost/python/suite/indexing/map_indexing_suite.hpp> +#include <eigenpy/eigenpy.hpp> +#include <eigenpy/geometry.hpp> +#include <iostream> +#include <sstream> + #include "dynamic-graph/python/convert-dg-to-py.hh" #include "dynamic-graph/python/module.hh" +#include "dynamic-graph/python/signal-wrapper.hh" namespace dynamicgraph { namespace python { @@ -106,35 +104,38 @@ void exposeEntityBase() { .add_property("streamPrintPeriod", &Entity::getStreamPrintPeriod, &Entity::setStreamPrintPeriod, "set the period at which debugging information are printed") - .def("__str__", - +[](const Entity& e) -> std::string { - std::ostringstream os; - e.display(os); - return os.str(); - }) - .def("signals", - +[](const Entity& e) -> bp::list { - bp::list ret; - for (auto& el : e.getSignalMap()) ret.append(bp::ptr(el.second)); - return ret; - }, - "Return the list of signals.") + .def( + "__str__", + +[](const Entity& e) -> std::string { + std::ostringstream os; + e.display(os); + return os.str(); + }) + .def( + "signals", + +[](const Entity& e) -> bp::list { + bp::list ret; + for (auto& el : e.getSignalMap()) ret.append(bp::ptr(el.second)); + return ret; + }, + "Return the list of signals.") //.def("signal", +[](Entity& e, const std::string &name) { return &e.getSignal(name); }, // reference_existing_object()) .def("signal", &getSignal, reference_existing_object(), "get signal by name from an Entity", bp::arg("name")) .def("hasSignal", &Entity::hasSignal, "return True if the entity has a signal with the given name") - .def("displaySignals", - +[](const Entity& e) { - Entity::SignalMap signals(e.getSignalMap()); - std::cout << "--- <" << e.getName(); - if (signals.empty()) - std::cout << "> has no signal\n"; - else - std::cout << "> signal list:\n"; - for (const auto& el : signals) el.second->display(std::cout << " |-- <") << '\n'; - }, - "Print the list of signals into standard output: temporary.") + .def( + "displaySignals", + +[](const Entity& e) { + Entity::SignalMap signals(e.getSignalMap()); + std::cout << "--- <" << e.getName(); + if (signals.empty()) + std::cout << "> has no signal\n"; + else + std::cout << "> signal list:\n"; + for (const auto& el : signals) el.second->display(std::cout << " |-- <") << '\n'; + }, + "Print the list of signals into standard output: temporary.") /* .def("__getattr__", +[](Entity& e, const std::string &name) -> SignalBase<int>* { return &e.getSignal(name); }, @@ -240,22 +241,26 @@ BOOST_PYTHON_MODULE(wrap) { typedef dg::PoolStorage::Entities MapOfEntities; bp::class_<MapOfEntities>("MapOfEntities") .def("__len__", &MapOfEntities::size) - .def("keys", - +[](const MapOfEntities& m) -> bp::tuple { - bp::list res; - for (const auto& el : m) res.append(el.first); - return bp::tuple(res); - }) - .def("values", - +[](const MapOfEntities& m) -> bp::tuple { - bp::list res; - for (const auto& el : m) res.append(bp::ptr(el.second)); - return bp::tuple(res); - }) + .def( + "keys", + +[](const MapOfEntities& m) -> bp::tuple { + bp::list res; + for (const auto& el : m) res.append(el.first); + return bp::tuple(res); + }) + .def( + "values", + +[](const MapOfEntities& m) -> bp::tuple { + bp::list res; + for (const auto& el : m) res.append(bp::ptr(el.second)); + return bp::tuple(res); + }) .def("__getitem__", static_cast<dg::Entity*& (MapOfEntities::*)(const std::string& k)>(&MapOfEntities::at), reference_existing_object()) - .def("__setitem__", +[](MapOfEntities& m, const std::string& n, dg::Entity* e) { m.emplace(n, e); }) + .def( + "__setitem__", +[](MapOfEntities& m, const std::string& n, dg::Entity* e) { m.emplace(n, e); }) .def("__iter__", bp::iterator<MapOfEntities>()) - .def("__contains__", +[](const MapOfEntities& m, const std::string& n) -> bool { return m.count(n); }); + .def( + "__contains__", +[](const MapOfEntities& m, const std::string& n) -> bool { return m.count(n); }); bp::to_python_converter<MapOfEntities::value_type, MapOfEntitiesPairToPythonConverter>(); } diff --git a/src/dynamic_graph/entity-py.cc b/src/dynamic_graph/entity-py.cc index f5993fd..268e587 100644 --- a/src/dynamic_graph/entity-py.cc +++ b/src/dynamic_graph/entity-py.cc @@ -1,15 +1,14 @@ // Copyright 2010, Florent Lamiraux, Thomas Moulard, LAAS-CNRS. -#include <iostream> - +#include <dynamic-graph/command.h> #include <dynamic-graph/entity.h> #include <dynamic-graph/factory.h> - -#include <dynamic-graph/command.h> #include <dynamic-graph/linear-algebra.h> #include <dynamic-graph/pool.h> #include <dynamic-graph/value.h> +#include <iostream> + #include "dynamic-graph/python/convert-dg-to-py.hh" #include "dynamic-graph/python/dynamic-graph-py.hh" diff --git a/src/dynamic_graph/factory-py.cc b/src/dynamic_graph/factory-py.cc index 8fbdbca..194bfcd 100644 --- a/src/dynamic_graph/factory-py.cc +++ b/src/dynamic_graph/factory-py.cc @@ -1,8 +1,9 @@ // Copyright 2010, Florent Lamiraux, Thomas Moulard, LAAS-CNRS. -#include <iostream> #include <dynamic-graph/factory.h> +#include <iostream> + #include "dynamic-graph/python/dynamic-graph-py.hh" using dynamicgraph::Entity; diff --git a/src/dynamic_graph/pool-py.cc b/src/dynamic_graph/pool-py.cc index 2c1659d..338a89f 100644 --- a/src/dynamic_graph/pool-py.cc +++ b/src/dynamic_graph/pool-py.cc @@ -1,7 +1,8 @@ // Copyright 2011, 2012, Florent Lamiraux, LAAS-CNRS. -#include <dynamic-graph/pool.h> #include <dynamic-graph/entity.h> +#include <dynamic-graph/pool.h> + #include <vector> #include "dynamic-graph/python/dynamic-graph-py.hh" diff --git a/src/dynamic_graph/signal-base-py.cc b/src/dynamic_graph/signal-base-py.cc index c839742..d9aadf8 100644 --- a/src/dynamic_graph/signal-base-py.cc +++ b/src/dynamic_graph/signal-base-py.cc @@ -1,21 +1,19 @@ // Copyright 2010, Florent Lamiraux, Thomas Moulard, LAAS-CNRS. -#include <iostream> -#include <sstream> - -#include <boost/python.hpp> - -#include "dynamic-graph/python/signal.hh" - +#include <dynamic-graph/linear-algebra.h> #include <dynamic-graph/signal-base.h> -#include <dynamic-graph/signal.h> #include <dynamic-graph/signal-ptr.h> #include <dynamic-graph/signal-time-dependent.h> -#include <dynamic-graph/linear-algebra.h> +#include <dynamic-graph/signal.h> #include <dynamic-graph/value.h> +#include <boost/python.hpp> +#include <iostream> +#include <sstream> + #include "dynamic-graph/python/dynamic-graph-py.hh" #include "dynamic-graph/python/signal-wrapper.hh" +#include "dynamic-graph/python/signal.hh" using dynamicgraph::SignalBase; @@ -48,12 +46,13 @@ void exposeSignalBase(const char* name) { .add_property("name", bp::make_function(&S_t::getName, bp::return_value_policy<bp::copy_const_reference>())) .def("getName", &S_t::getName, bp::return_value_policy<bp::copy_const_reference>()) - .def("getClassName", - +[](const S_t& s) -> std::string { - std::string ret; - s.getClassName(ret); - return ret; - }) + .def( + "getClassName", + +[](const S_t& s) -> std::string { + std::string ret; + s.getClassName(ret); + return ret; + }) .def("plug", &S_t::plug, "Plug the signal to another signal") .def("unplug", &S_t::unplug, "Unplug the signal") @@ -63,32 +62,35 @@ void exposeSignalBase(const char* name) { .def("recompute", &S_t::recompute, "Recompute the signal at given time") - .def("__str__", - +[](const S_t& s) -> std::string { - std::ostringstream oss; - s.display(oss); - return oss.str(); - }) - .def("displayDependencies", - +[](const S_t& s, int time) -> std::string { - std::ostringstream oss; - s.displayDependencies(oss, time); - return oss.str(); - }, - "Print the signal dependencies in a string"); + .def( + "__str__", + +[](const S_t& s) -> std::string { + std::ostringstream oss; + s.display(oss); + return oss.str(); + }) + .def( + "displayDependencies", + +[](const S_t& s, int time) -> std::string { + std::ostringstream oss; + s.displayDependencies(oss, time); + return oss.str(); + }, + "Print the signal dependencies in a string"); } template <> auto exposeSignal<MatrixHomogeneous, time_type>(const std::string& name) { typedef Signal<MatrixHomogeneous, time_type> S_t; bp::class_<S_t, bp::bases<SignalBase<time_type> >, boost::noncopyable> obj(name.c_str(), bp::init<std::string>()); - obj.add_property("value", +[](const S_t& signal) -> Matrix4 { return signal.accessCopy().matrix(); }, - +[](S_t& signal, const Matrix4& v) { - // TODO it isn't hard to support pinocchio::SE3 type here. - // However, this adds a dependency to pinocchio. - signal.setConstant(MatrixHomogeneous(v)); - }, - "the signal value."); + obj.add_property( + "value", +[](const S_t& signal) -> Matrix4 { return signal.accessCopy().matrix(); }, + +[](S_t& signal, const Matrix4& v) { + // TODO it isn't hard to support pinocchio::SE3 type here. + // However, this adds a dependency to pinocchio. + signal.setConstant(MatrixHomogeneous(v)); + }, + "the signal value."); return obj; } diff --git a/src/dynamic_graph/signal-wrapper.cc b/src/dynamic_graph/signal-wrapper.cc index 731e898..32684db 100644 --- a/src/dynamic_graph/signal-wrapper.cc +++ b/src/dynamic_graph/signal-wrapper.cc @@ -1,11 +1,11 @@ // Copyright (c) 2018, Joseph Mirabel // Authors: Joseph Mirabel (joseph.mirabel@laas.fr) -#include <dynamic-graph/factory.h> -#include <dynamic-graph/command-bind.h> - #include "dynamic-graph/python/signal-wrapper.hh" +#include <dynamic-graph/command-bind.h> +#include <dynamic-graph/factory.h> + namespace dynamicgraph { namespace python { void PythonSignalContainer::signalRegistration(const SignalArray<int>& signals) { diff --git a/src/dynamic_graph/tracer/wrap.cc b/src/dynamic_graph/tracer/wrap.cc index a790c98..fcb6d22 100644 --- a/src/dynamic_graph/tracer/wrap.cc +++ b/src/dynamic_graph/tracer/wrap.cc @@ -1,7 +1,7 @@ -#include "dynamic-graph/python/module.hh" - #include <dynamic-graph/tracer.h> +#include "dynamic-graph/python/module.hh" + BOOST_PYTHON_MODULE(wrap) { using dynamicgraph::Tracer; diff --git a/src/dynamic_graph/tracer_real_time/wrap.cc b/src/dynamic_graph/tracer_real_time/wrap.cc index 9fb24ec..66863d3 100644 --- a/src/dynamic_graph/tracer_real_time/wrap.cc +++ b/src/dynamic_graph/tracer_real_time/wrap.cc @@ -1,7 +1,7 @@ -#include "dynamic-graph/python/module.hh" - #include <dynamic-graph/tracer-real-time.h> +#include "dynamic-graph/python/module.hh" + BOOST_PYTHON_MODULE(wrap) { using dynamicgraph::Tracer; using dynamicgraph::TracerRealTime; diff --git a/src/interpreter.cc b/src/interpreter.cc index a7f7c30..fa75936 100644 --- a/src/interpreter.cc +++ b/src/interpreter.cc @@ -8,6 +8,7 @@ #endif #include <iostream> + #include "dynamic-graph/debug.h" #include "dynamic-graph/python/interpreter.hh" diff --git a/tests/custom_entity.cpp b/tests/custom_entity.cpp index 1ff0b87..b6da822 100644 --- a/tests/custom_entity.cpp +++ b/tests/custom_entity.cpp @@ -6,7 +6,6 @@ #define ENABLE_RT_LOG #include "custom_entity.h" -#include <boost/bind.hpp> #include <dynamic-graph/command-bind.h> #include <dynamic-graph/entity.h> @@ -17,6 +16,8 @@ #include <dynamic-graph/signal-ptr.h> #include <dynamic-graph/signal-time-dependent.h> +#include <boost/bind.hpp> + namespace dynamicgraph { CustomEntity::CustomEntity(const std::string n) diff --git a/tests/custom_entity.h b/tests/custom_entity.h index b382fe4..fd821f0 100644 --- a/tests/custom_entity.h +++ b/tests/custom_entity.h @@ -5,11 +5,12 @@ #define ENABLE_RT_LOG -#include <sstream> #include <dynamic-graph/entity.h> #include <dynamic-graph/signal-ptr.h> #include <dynamic-graph/signal-time-dependent.h> +#include <sstream> + namespace dynamicgraph { class CustomEntity : public Entity { public: diff --git a/tests/dynamic-graph-python-test.cc b/tests/dynamic-graph-python-test.cc index a45ddad..af2b39d 100644 --- a/tests/dynamic-graph-python-test.cc +++ b/tests/dynamic-graph-python-test.cc @@ -2,7 +2,8 @@ * Copyright */ -#include <iostream> #include "dynamic-graph-python-test.hh" +#include <iostream> + GraphTest::GraphTest() { std::cout << "Constructor of unitTesting object of class Graph." << std::endl; } diff --git a/tests/dynamic-graph-python-test.cpp b/tests/dynamic-graph-python-test.cpp index a45ddad..af2b39d 100644 --- a/tests/dynamic-graph-python-test.cpp +++ b/tests/dynamic-graph-python-test.cpp @@ -2,7 +2,8 @@ * Copyright */ -#include <iostream> #include "dynamic-graph-python-test.hh" +#include <iostream> + GraphTest::GraphTest() { std::cout << "Constructor of unitTesting object of class Graph." << std::endl; } -- GitLab