From 0c1e6fb50735d4d6cc93e15d3bef202392d47c5b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Wed, 30 Mar 2022 15:31:49 +0200 Subject: [PATCH] pre-commit run -a --- .pre-commit-config.yaml | 2 +- NEWS | 1 - doc/Doxyfile.extra.in | 4 +- doc/pictures/entity.svg | 2 +- include/dynamic-graph/command-bind.h | 69 +++++++++++----------------- js/view_sot_dg.html | 7 ++- 6 files changed, 33 insertions(+), 52 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 810abe5..047193e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v12.0.1 + rev: v13.0.1 hooks: - id: clang-format args: [-i, --style=Google] diff --git a/NEWS b/NEWS index 45e6f13..dcc42e1 100644 --- a/NEWS +++ b/NEWS @@ -129,4 +129,3 @@ stasse (3): Reinforce the dependant->dependent policy. Merge the florent branch. Makes the test_depend.cpp test works. Reinforce the dependant->dependent policy. Adding documentation to cmdPlug. - diff --git a/doc/Doxyfile.extra.in b/doc/Doxyfile.extra.in index bd125c6..f082906 100644 --- a/doc/Doxyfile.extra.in +++ b/doc/Doxyfile.extra.in @@ -293,7 +293,7 @@ WARN_LOGFILE = @CMAKE_BINARY_DIR@/doc/doxygen.log INPUT = @CMAKE_SOURCE_DIR@/include \ @CMAKE_SOURCE_DIR@/doc/additionalDoc - + # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. @@ -672,4 +672,4 @@ MATHJAX_FORMAT = SVG ALIASES += "cheatsheet=\xrefitem cheatsheet \"Remarkable identity\" \"Cheat sheet\"" -CITE_BIB_FILES += @CMAKE_SOURCE_DIR@/doc/sot.bib \ No newline at end of file +CITE_BIB_FILES += @CMAKE_SOURCE_DIR@/doc/sot.bib diff --git a/doc/pictures/entity.svg b/doc/pictures/entity.svg index 7840311..5fc8995 100644 --- a/doc/pictures/entity.svg +++ b/doc/pictures/entity.svg @@ -9,7 +9,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - + id="svg2" version="1.1" inkscape:version="0.47 r22583" diff --git a/include/dynamic-graph/command-bind.h b/include/dynamic-graph/command-bind.h index 629445c..351dc1c 100644 --- a/include/dynamic-graph/command-bind.h +++ b/include/dynamic-graph/command-bind.h @@ -283,8 +283,8 @@ struct CommandVoid4 : public Command { CommandVoid4(E &entity, function_t function, const std::string &docString) : Command(entity, boost::assign::list_of(ValueHelper<T1>::TypeID)( - ValueHelper<T2>::TypeID)( - ValueHelper<T3>::TypeID)(ValueHelper<T4>::TypeID), + ValueHelper<T2>::TypeID)(ValueHelper<T3>::TypeID)( + ValueHelper<T4>::TypeID), docString), fptr(function) {} @@ -357,13 +357,11 @@ struct CommandVoid5 : public Command { const T4 &, const T5 &); CommandVoid5(E &entity, function_t function, const std::string &docString) - : Command( - entity, - boost::assign::list_of(ValueHelper<T1>::TypeID)( - ValueHelper<T2>::TypeID)( - ValueHelper<T3>::TypeID)(ValueHelper<T4>::TypeID)(ValueHelper< - T5>::TypeID), - docString), + : Command(entity, + boost::assign::list_of(ValueHelper<T1>::TypeID)( + ValueHelper<T2>::TypeID)(ValueHelper<T3>::TypeID)( + ValueHelper<T4>::TypeID)(ValueHelper<T5>::TypeID), + docString), fptr(function) {} protected: @@ -444,15 +442,12 @@ struct CommandVoid6 : public Command { const T4 &, const T5 &, const T6 &); CommandVoid6(E &entity, function_t function, const std::string &docString) - : Command( - entity, - boost::assign::list_of(ValueHelper<T1>::TypeID)( - ValueHelper<T2>::TypeID)( - ValueHelper<T3>::TypeID)(ValueHelper< - T4>::TypeID)(ValueHelper<T5>:: - TypeID)(ValueHelper< - T6>::TypeID), - docString), + : Command(entity, + boost::assign::list_of(ValueHelper<T1>::TypeID)( + ValueHelper<T2>::TypeID)(ValueHelper<T3>::TypeID)( + ValueHelper<T4>::TypeID)(ValueHelper<T5>::TypeID)( + ValueHelper<T6>::TypeID), + docString), fptr(function) {} protected: @@ -536,17 +531,12 @@ struct CommandVoid7 : public Command { const T7 &); CommandVoid7(E &entity, function_t function, const std::string &docString) - : Command( - entity, - boost::assign::list_of(ValueHelper<T1>::TypeID)( - ValueHelper<T2>::TypeID)( - ValueHelper<T3>:: - TypeID)(ValueHelper< - T4>::TypeID)(ValueHelper<T5>:: - TypeID)(ValueHelper<T6>:: - TypeID)(ValueHelper< - T7>::TypeID), - docString), + : Command(entity, + boost::assign::list_of(ValueHelper<T1>::TypeID)( + ValueHelper<T2>::TypeID)(ValueHelper<T3>::TypeID)( + ValueHelper<T4>::TypeID)(ValueHelper<T5>::TypeID)( + ValueHelper<T6>::TypeID)(ValueHelper<T7>::TypeID), + docString), fptr(function) {} protected: @@ -633,20 +623,13 @@ struct CommandVoid8 : public Command { const T7 &, const T8 &); CommandVoid8(E &entity, function_t function, const std::string &docString) - : Command( - entity, - boost::assign::list_of(ValueHelper<T1>::TypeID)( - ValueHelper<T2>::TypeID)( - ValueHelper<T3>:: - TypeID)(ValueHelper<T4>:: - TypeID)(ValueHelper<T5>:: - TypeID)(ValueHelper<T6>:: - TypeID)(ValueHelper< - T7>:: - TypeID)(ValueHelper< - T8>:: - TypeID), - docString), + : Command(entity, + boost::assign::list_of(ValueHelper<T1>::TypeID)( + ValueHelper<T2>::TypeID)(ValueHelper<T3>::TypeID)( + ValueHelper<T4>::TypeID)(ValueHelper<T5>::TypeID)( + ValueHelper<T6>::TypeID)(ValueHelper<T7>::TypeID)( + ValueHelper<T8>::TypeID), + docString), fptr(function) {} protected: diff --git a/js/view_sot_dg.html b/js/view_sot_dg.html index 231fcae..d153e95 100644 --- a/js/view_sot_dg.html +++ b/js/view_sot_dg.html @@ -6,7 +6,7 @@ <script> function renderDOTFile() { var fileInputElement = document.getElementById("fileInputElement"); - + var reader = new FileReader(); var graphtextres = "" reader.onloadend = function(e) { @@ -27,7 +27,7 @@ .catch(error => { // Create a new Viz instance (@see Caveats page for more info) viz = new Viz(); - + // Possibly display the error console.error(error); }); @@ -37,7 +37,7 @@ </script> - <input type="file" id="fileInputElement"> + <input type="file" id="fileInputElement"> <input id="Rendering" type="button" value="Rendering" onclick="renderDOTFile();" /> <script> var el = document.getElementById("Rendering"); @@ -49,4 +49,3 @@ </body> </html> - -- GitLab