diff --git a/CMakeLists.txt b/CMakeLists.txt index ccaeb8f28fdf3a957941da5d6d6702412c9671c9..92487d179924f0ed309c739343e66eee7bd10f0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,4 @@ # Copyright 2010, Olivier Stasse, JRL, CNRS/AIST -# -# This file is part of dynamic-graph. -# dynamic-graph is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License -# as published by the Free Software Foundation, either version 3 of -# the License, or (at your option) any later version. -# -# dynamic-graph is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Lesser Public License for more details. You should have -# received a copy of the GNU Lesser General Public License along with -# dynamic-graph. If not, see <http://www.gnu.org/licenses/>. CMAKE_MINIMUM_REQUIRED(VERSION 2.6) @@ -19,7 +6,6 @@ INCLUDE(cmake/base.cmake) INCLUDE(cmake/boost.cmake) INCLUDE(cmake/eigen.cmake) INCLUDE(cmake/pthread.cmake) -INCLUDE(cmake/cpack.cmake) SET(PROJECT_ORG stack-of-tasks) SET(PROJECT_NAME dynamic-graph) @@ -66,4 +52,3 @@ ADD_SUBDIRECTORY(include/${PROJECT_NAME}) ADD_SUBDIRECTORY(tests) SETUP_PROJECT_FINALIZE() -SETUP_PROJECT_CPACK() diff --git a/cmake b/cmake index d128cc2965a7878dc38acf8f4395e1899aa505cb..1d9aeca25e970d2d967fd5be0fb93fe961db121b 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit d128cc2965a7878dc38acf8f4395e1899aa505cb +Subproject commit 1d9aeca25e970d2d967fd5be0fb93fe961db121b diff --git a/doc/additionalDoc/package.h b/doc/additionalDoc/package.h index 95071b73437608640b0a39034c4727a04abde15d..76dd15c696d752952b878f04da695b3cc7cd4208 100644 --- a/doc/additionalDoc/package.h +++ b/doc/additionalDoc/package.h @@ -6,17 +6,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * dynamic-graph is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. You should - * have received a copy of the GNU Lesser General Public License along - * with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. */ /** @@ -31,7 +20,7 @@ The installation instruction are given at \subpage subp_installation. The software graph structure is detailled in \subpage p_graph -For debugging your entities detailed instructions are given in \subpage debug +For debugging your entities detailed instructions are given in \subpage debug For citing the software in your research work please refer to \subpage subp_references diff --git a/include/dynamic-graph/all-commands.h b/include/dynamic-graph/all-commands.h index 8d537244c2fc5d565c3de43d9ca128b16f19303c..2ace540008be9da1293b7ef8b8e36f52f357075a 100644 --- a/include/dynamic-graph/all-commands.h +++ b/include/dynamic-graph/all-commands.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Olivier Stasse, JRL, CNRS/AIST // Thomas Moulard, Nicolas Mansard LAAS-CNRS // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_ALL_COMMANDS_H # define DYNAMIC_GRAPH_ALL_COMMANDS_H diff --git a/include/dynamic-graph/all-signals.h b/include/dynamic-graph/all-signals.h index 33ba7c2cad36255f36c91b364ce9f1b301575a78..82b9957a53a220ff65295ee45f477df851f8851c 100644 --- a/include/dynamic-graph/all-signals.h +++ b/include/dynamic-graph/all-signals.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_ALL_SIGNALS_H # define DYNAMIC_GRAPH_ALL_SIGNALS_H diff --git a/include/dynamic-graph/command-bind.h b/include/dynamic-graph/command-bind.h index ab39f6d0dc0d2c6c66ff5a95b80aba4919ee7edc..064e7481a15fb7e437e32fc97b150088775682a0 100644 --- a/include/dynamic-graph/command-bind.h +++ b/include/dynamic-graph/command-bind.h @@ -3,17 +3,6 @@ // // Author: Nicolas Mansard // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef __dg_command_bind_h__ #define __dg_command_bind_h__ diff --git a/include/dynamic-graph/command-direct-getter.h b/include/dynamic-graph/command-direct-getter.h index 7f3da90ea2282f1348e00d310556c98eb5eb5401..5424c2c4c13759d7b00943e204813558d5d3fe8e 100644 --- a/include/dynamic-graph/command-direct-getter.h +++ b/include/dynamic-graph/command-direct-getter.h @@ -3,17 +3,6 @@ // // Author: Nicolas Mansard // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef __dg_command_direct_getter_h__ #define __dg_command_direct_getter_h__ diff --git a/include/dynamic-graph/command-direct-setter.h b/include/dynamic-graph/command-direct-setter.h index 2457975a74dd620236de2acd985f203c0ad2de78..dc8b9f466bb95032a17f67d29c98c5699e883b69 100644 --- a/include/dynamic-graph/command-direct-setter.h +++ b/include/dynamic-graph/command-direct-setter.h @@ -3,17 +3,6 @@ // // Author: Nicolas Mansard // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef __dg_command_direct_setter_h__ #define __dg_command_direct_setter_h__ diff --git a/include/dynamic-graph/command-getter.h b/include/dynamic-graph/command-getter.h index 731c9dd674bed95342b9f752e031ed4f2f2f11e7..431972169091e24a6c6a499fc061cf03a405ac44 100644 --- a/include/dynamic-graph/command-getter.h +++ b/include/dynamic-graph/command-getter.h @@ -3,17 +3,6 @@ // // Author: Florent Lamiraux // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_COMMAND_GETTER_H #define DYNAMIC_GRAPH_COMMAND_GETTER_H @@ -72,4 +61,3 @@ namespace dynamicgraph { #include "dynamic-graph/command-getter.t.cpp" #endif //DYNAMIC_GRAPH_COMMAND_GETTER_H - diff --git a/include/dynamic-graph/command-getter.t.cpp b/include/dynamic-graph/command-getter.t.cpp index 63e06bdf01e700e0a31952eb2a5d0508576e570d..032d1c018cbac16c27133255ebbd9900c96eaee1 100644 --- a/include/dynamic-graph/command-getter.t.cpp +++ b/include/dynamic-graph/command-getter.t.cpp @@ -3,17 +3,6 @@ // // Author: Florent Lamiraux // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_COMMAND_GETTER_T_CPP #define DYNAMIC_GRAPH_COMMAND_GETTER_T_CPP diff --git a/include/dynamic-graph/command-setter.h b/include/dynamic-graph/command-setter.h index 45cc9dc98d9f2123254b9ae376f2dba88fabf0ed..4ebfaaf0ff383d30095c5c6813030e7eae86dfc0 100644 --- a/include/dynamic-graph/command-setter.h +++ b/include/dynamic-graph/command-setter.h @@ -3,17 +3,6 @@ // // Author: Florent Lamiraux // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_COMMAND_SETTER_H #define DYNAMIC_GRAPH_COMMAND_SETTER_H @@ -72,4 +61,3 @@ namespace dynamicgraph { #include "dynamic-graph/command-setter.t.cpp" #endif //DYNAMIC_GRAPH_COMMAND_SETTER_H - diff --git a/include/dynamic-graph/command-setter.t.cpp b/include/dynamic-graph/command-setter.t.cpp index 0a26374c7e98620a76df446e83a683c41eac732b..f812159aae852845dd6754737a9140a6731ef4b4 100644 --- a/include/dynamic-graph/command-setter.t.cpp +++ b/include/dynamic-graph/command-setter.t.cpp @@ -3,17 +3,6 @@ // // Author: Florent Lamiraux // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_COMMAND_SETTER_T_CPP #define DYNAMIC_GRAPH_COMMAND_SETTER_T_CPP @@ -26,7 +15,7 @@ namespace dynamicgraph { class Entity; namespace command { - // + // // Template specialization: bool // template <class E> @@ -64,7 +53,7 @@ namespace dynamicgraph { return Value(); } - // + // // Template specialization: unsigned // template <class E> @@ -102,7 +91,7 @@ namespace dynamicgraph { return Value(); } - // + // // Template specialization: int // template <class E> @@ -140,7 +129,7 @@ namespace dynamicgraph { return Value(); } - // + // // Template specialization: float // template <class E> @@ -178,7 +167,7 @@ namespace dynamicgraph { return Value(); } - // + // // Template specialization: double // template <class E> @@ -216,7 +205,7 @@ namespace dynamicgraph { return Value(); } - // + // // Template specialization: std::string // template <class E> @@ -254,7 +243,7 @@ namespace dynamicgraph { return Value(); } - // + // // Template specialization: Vector // template <class E> @@ -292,7 +281,7 @@ namespace dynamicgraph { return Value(); } - // + // // Template specialization: Matrix // template <class E> diff --git a/include/dynamic-graph/command.h b/include/dynamic-graph/command.h index 832bf4aa3a19338a4a20d77c6703298a3d4590c4..b383be5b1f37dfe40e9b809d55a906804382a9d2 100644 --- a/include/dynamic-graph/command.h +++ b/include/dynamic-graph/command.h @@ -3,17 +3,6 @@ // // Author: Florent Lamiraux // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_COMMAND_H #define DYNAMIC_GRAPH_COMMAND_H diff --git a/include/dynamic-graph/debug.h b/include/dynamic-graph/debug.h index 216a35aff2fad0ec694777897c51eedfff876cfa..7bc3627dddca5ff80fa1e42a9953bd5054729edc 100644 --- a/include/dynamic-graph/debug.h +++ b/include/dynamic-graph/debug.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_DEBUG_HH # define DYNAMIC_GRAPH_DEBUG_HH diff --git a/include/dynamic-graph/dynamic-graph-api.h b/include/dynamic-graph/dynamic-graph-api.h index e1125ee588492ff581364b090af72ffe5468619b..69dff1d9be4f30a544a7b93f7f7a54111f424440 100644 --- a/include/dynamic-graph/dynamic-graph-api.h +++ b/include/dynamic-graph/dynamic-graph-api.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_API_H # define DYNAMIC_GRAPH_API_H diff --git a/include/dynamic-graph/eigen-io.h b/include/dynamic-graph/eigen-io.h index f96d7a839be607d99116f360d3213486fe55fa20..4198b52f23a3486f88b81bbf3bb484387495dec4 100644 --- a/include/dynamic-graph/eigen-io.h +++ b/include/dynamic-graph/eigen-io.h @@ -3,17 +3,6 @@ // // Author: Rohan Budhiraja // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_EIGEN_IO_H #define DYNAMIC_GRAPH_EIGEN_IO_H @@ -39,7 +28,7 @@ using dynamicgraph::ExceptionSignal; namespace Eigen { typedef EIGEN_DEFAULT_DENSE_INDEX_TYPE eigen_index; - inline std::istringstream& operator >> (std::istringstream &iss, + inline std::istringstream& operator >> (std::istringstream &iss, dynamicgraph::Vector &inst) { unsigned int _size; double _dbl_val; @@ -82,7 +71,7 @@ namespace Eigen { */ template<typename Derived> - inline std::istringstream& operator >> (std::istringstream &iss, + inline std::istringstream& operator >> (std::istringstream &iss, DenseBase<Derived> &inst) { unsigned int _colsize; unsigned int _rowsize; @@ -133,13 +122,13 @@ namespace Eigen { return iss; } - - inline std::istringstream& operator >> (std::istringstream &iss, + + inline std::istringstream& operator >> (std::istringstream &iss, Transform<double,3,Affine> &inst) { MatrixXd M; iss >> M; inst.matrix() = M; return iss; } - - - + + + /* \brief Eigen Homogeneous Matrix output * @@ -147,27 +136,27 @@ namespace Eigen { * e.g. [2,5]((1 23 32.2 12.12 32),(2 32 23 92.01 19.2)) */ - inline std::ostream& operator << (std::ostream &os, + inline std::ostream& operator << (std::ostream &os, Transform<double,3,Affine> MH) { IOFormat boostFmt(StreamPrecision, DontAlignCols, ",", ",", "(",")", "(",")"); - + os << "[4,4]"<< MH.matrix().format(boostFmt); return os; } - - - inline std::ostream& operator << (std::ostream &os, + + + inline std::ostream& operator << (std::ostream &os, AngleAxisd quat) { VectorXd v(4); v(0) = quat.angle(); v.tail<3>() = quat.axis(); os << v; return os; } - - inline std::istringstream& operator >> (std::istringstream &iss, + + inline std::istringstream& operator >> (std::istringstream &iss, AngleAxisd &inst) { VectorXd v(4); iss >>v; inst.angle() = v(0); inst.axis() = v.tail<3>(); return iss; } - + } diff --git a/include/dynamic-graph/entity-helper.h b/include/dynamic-graph/entity-helper.h index 694910beb8ca30786d584d496c231fc9757f4e23..15fc8d8804a3f946deaaf06a056caab4a9fec6c7 100644 --- a/include/dynamic-graph/entity-helper.h +++ b/include/dynamic-graph/entity-helper.h @@ -1,17 +1,6 @@ /* * Copyright 2011, Nicolas Mansard, LAAS-CNRS * - * This file is part of sot-core. - * sot-core is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * sot-core is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. You should - * have received a copy of the GNU Lesser General Public License along - * with sot-core. If not, see <http://www.gnu.org/licenses/>. */ #ifndef __sot_core_entity_helper_H__ diff --git a/include/dynamic-graph/entity.h b/include/dynamic-graph/entity.h index 015c5d5a18ea510da4e15a0df89053a600cac23b..5c57b5f37cf7a8e8f7530ca960acdc6e687d48fa 100644 --- a/include/dynamic-graph/entity.h +++ b/include/dynamic-graph/entity.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_ENTITY_H # define DYNAMIC_GRAPH_ENTITY_H diff --git a/include/dynamic-graph/exception-abstract.h b/include/dynamic-graph/exception-abstract.h index 2eb40ff96cabc94043b1220490da9e2a465fab30..3e1bf4c1540843575b6549d921fedeeff0948624 100644 --- a/include/dynamic-graph/exception-abstract.h +++ b/include/dynamic-graph/exception-abstract.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_EXCEPTION_ABSTRACT_H # define DYNAMIC_GRAPH_EXCEPTION_ABSTRACT_H diff --git a/include/dynamic-graph/exception-factory.h b/include/dynamic-graph/exception-factory.h index 214c8e28d375e0b9261e08958f6473e2c1bb7da6..836b15a666c1efc6882651a49b3fd8869c454b45 100644 --- a/include/dynamic-graph/exception-factory.h +++ b/include/dynamic-graph/exception-factory.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_EXCEPTION_FACTORY_H # define DYNAMIC_GRAPH_EXCEPTION_FACTORY_H diff --git a/include/dynamic-graph/exception-signal.h b/include/dynamic-graph/exception-signal.h index fcf379cc30db4ce1ac9c785a5753cfe4110ec76e..abadca164561cefbe948a59d6874e2ad63beb807 100644 --- a/include/dynamic-graph/exception-signal.h +++ b/include/dynamic-graph/exception-signal.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_EXCEPTION_SIGNAL_H # define DYNAMIC_GRAPH_EXCEPTION_SIGNAL_H diff --git a/include/dynamic-graph/exception-traces.h b/include/dynamic-graph/exception-traces.h index 81ab6767857bba9012e1670849fd7b40cba99c12..6f5c73f0ee27d76aba2b70cda0ca44639898370d 100644 --- a/include/dynamic-graph/exception-traces.h +++ b/include/dynamic-graph/exception-traces.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_EXCEPTION_TRACES_H # define DYNAMIC_GRAPH_EXCEPTION_TRACES_H diff --git a/include/dynamic-graph/factory.h b/include/dynamic-graph/factory.h index 292f9d9bb72d88ae012bb5e0b613f4baa5f6f08a..1c94fcfaa8b7fea84e9b9a45bf4e5840b8b135d9 100644 --- a/include/dynamic-graph/factory.h +++ b/include/dynamic-graph/factory.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_FACTORY_HH # define DYNAMIC_GRAPH_FACTORY_HH diff --git a/include/dynamic-graph/fwd.hh b/include/dynamic-graph/fwd.hh index 5dcb7a1d20db2234e08de82ad7ff0d0bc5e2155f..29b9b347c62cc6dd18fd934e3c53e237efe8c037 100644 --- a/include/dynamic-graph/fwd.hh +++ b/include/dynamic-graph/fwd.hh @@ -1,7 +1,6 @@ // Copyright 2010-2019, CNRS, JRL, AIST, LAAS // Thomas Moulard, Olivier Stasse // -// See License #ifndef DYNAMIC_GRAPH_FWD_HH # define DYNAMIC_GRAPH_FWD_HH diff --git a/include/dynamic-graph/linear-algebra.h b/include/dynamic-graph/linear-algebra.h index 4b566fb6f881935454e5c019d542b58383cde15e..c0b3d216f4f113897ee72dbe29bfb03426fe4989 100644 --- a/include/dynamic-graph/linear-algebra.h +++ b/include/dynamic-graph/linear-algebra.h @@ -3,17 +3,6 @@ // // Author: Florent Lamiraux // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_LINEAR_ALGEBRA_H #define DYNAMIC_GRAPH_LINEAR_ALGEBRA_H diff --git a/include/dynamic-graph/logger.h b/include/dynamic-graph/logger.h index 98e7e1dc8eaced4e4653480aa6ebfe6e917960c0..46a58ca3380ba5234490c3270a092c849ee14887 100644 --- a/include/dynamic-graph/logger.h +++ b/include/dynamic-graph/logger.h @@ -3,8 +3,6 @@ * LAAS-CNRS * Andrea Del Prete, François Bailly, Olivier Stasse * - * This file is part of dynamic-graph. - * See license file. */ #ifndef __dynamic_graph_logger_H__ @@ -141,7 +139,7 @@ namespace dynamicgraph { /// // Somewhere in the main function of your executable /// int main (int argc, char** argv) { /// std::ofstream of; - /// of.open("/tmp/dg-LOGS.txt",std::ofstream::out|std::ofstream::app); + /// of.open("/tmp/dg-LOGS.txt",std::ofstream::out|std::ofstream::app); /// dgADD_OSTREAM_TO_RTLOG (of); /// } /// @@ -154,7 +152,7 @@ namespace dynamicgraph { /// /// \endcode /// - /// + /// class Logger { public: diff --git a/include/dynamic-graph/null-ptr.hh b/include/dynamic-graph/null-ptr.hh index 2842e61d7c867f65f54b33aa663a4938e6d2d59d..60ea303cb2b862ce93e9cf90a685972b020be03c 100644 --- a/include/dynamic-graph/null-ptr.hh +++ b/include/dynamic-graph/null-ptr.hh @@ -1,17 +1,5 @@ // Copyright 2010, Thomas Moulard, JRL, CNRS/AIST // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_NULL_PTR_HH # define DYNAMIC_GRAPH_NULL_PTR_HH @@ -26,7 +14,7 @@ namespace dynamicgraph { return 0; } - + template<class C, class T> operator T C::*() const { diff --git a/include/dynamic-graph/pool.h b/include/dynamic-graph/pool.h index feaeb092dda6fed753f7963da52be35916e6eb5d..9d380e1a27022098e7018ce546c6b7d101cad435 100644 --- a/include/dynamic-graph/pool.h +++ b/include/dynamic-graph/pool.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_POOL_H # define DYNAMIC_GRAPH_POOL_H diff --git a/include/dynamic-graph/real-time-logger.h b/include/dynamic-graph/real-time-logger.h index f87801101079e236b90d719a58c1964ea00f9057..8049e8848c8ada172d0cb7369a1edf87e04242af 100644 --- a/include/dynamic-graph/real-time-logger.h +++ b/include/dynamic-graph/real-time-logger.h @@ -1,18 +1,6 @@ // -*- mode: c++ -*- // Copyright 2018, Joseph Mirabel LAAS-CNRS // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_LOGGER_REAL_TIME_H # define DYNAMIC_GRAPH_LOGGER_REAL_TIME_H diff --git a/include/dynamic-graph/signal-array.h b/include/dynamic-graph/signal-array.h index 3af85ffd5b3430690921834a54312ab756460083..6900b9b470f5f8fdee47261c1adf891806957d45 100644 --- a/include/dynamic-graph/signal-array.h +++ b/include/dynamic-graph/signal-array.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_SIGNAL_ARRAY_H # define DYNAMIC_GRAPH_SIGNAL_ARRAY_H diff --git a/include/dynamic-graph/signal-base.h b/include/dynamic-graph/signal-base.h index bb8f9ca9bcc0db1612fe01f283d1ed4708d8caf2..df8f1910c9ed27faf9cf87439372436faae99638 100644 --- a/include/dynamic-graph/signal-base.h +++ b/include/dynamic-graph/signal-base.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_SIGNAL_BASE_H # define DYNAMIC_GRAPH_SIGNAL_BASE_H diff --git a/include/dynamic-graph/signal-cast-helper.h b/include/dynamic-graph/signal-cast-helper.h index 4c7148d7441340b0841a84ec5996059386557f7d..ac10a3a93e33d08c93a378acaac409a0c1b45480 100644 --- a/include/dynamic-graph/signal-cast-helper.h +++ b/include/dynamic-graph/signal-cast-helper.h @@ -1,18 +1,6 @@ // -*- c++-mode -*- // Copyright 2010 François Bleibel Thomas Moulard, Olivier Stasse, Nicolas Mansard // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_SIGNAL_CASTER_HELPER_HH # define DYNAMIC_GRAPH_SIGNAL_CASTER_HELPER_HH diff --git a/include/dynamic-graph/signal-caster.h b/include/dynamic-graph/signal-caster.h index 525f906f02e00aaa6ff74f5e50aa30be72137676..9bbf6cb355667872ac02ccafe3e7b486404c53b6 100644 --- a/include/dynamic-graph/signal-caster.h +++ b/include/dynamic-graph/signal-caster.h @@ -1,18 +1,6 @@ // -*- c++-mode -*- // Copyright 2010 François Bleibel Thomas Moulard, Olivier Stasse // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_SIGNAL_CASTER_HH # define DYNAMIC_GRAPH_SIGNAL_CASTER_HH diff --git a/include/dynamic-graph/signal-helper.h b/include/dynamic-graph/signal-helper.h index 5cb88f94ffe0854efaed4b2b2ba836bf9b241b4b..a8d814dce4e399a8a057dd801b589b64cc1cae0e 100644 --- a/include/dynamic-graph/signal-helper.h +++ b/include/dynamic-graph/signal-helper.h @@ -1,19 +1,8 @@ /* - * Copyright 2011, 2019 + * Copyright 2011, 2019 * LAAS-CNRS - * Nicolas Mansard, François Bailly + * Nicolas Mansard, François Bailly * - * This file is part of dynamic-graph. - * dynamic-graph is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * dynamic-graph is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. You should - * have received a copy of the GNU Lesser General Public License along - * with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. */ #ifndef __dynamic_graph_signal_helper_H__ @@ -25,7 +14,7 @@ #include <dynamic-graph/entity.h> #include <dynamic-graph/signal-ptr.h> #include <dynamic-graph/signal-time-dependent.h> -#include <dynamic-graph/linear-algebra.h> +#include <dynamic-graph/linear-algebra.h> /* --- MACROS ---------------------------------------------------------- */ #define SIGNAL_OUT_FUNCTION_NAME(name) name##SOUT_function diff --git a/include/dynamic-graph/signal-ptr.h b/include/dynamic-graph/signal-ptr.h index 3f3a6eeb3fdd89419d807241d32404d07729d141..4acdffed1b433d0c2ec5e46c0a31ed20def7ab5f 100644 --- a/include/dynamic-graph/signal-ptr.h +++ b/include/dynamic-graph/signal-ptr.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_SIGNAL_PTR_H #define DYNAMIC_GRAPH_SIGNAL_PTR_H diff --git a/include/dynamic-graph/signal-ptr.t.cpp b/include/dynamic-graph/signal-ptr.t.cpp index 6862e7ee91a18d888c6634c2409b3f625e16a08d..5df9d637755ffb417d3d798cbf1d62d33ef07906 100644 --- a/include/dynamic-graph/signal-ptr.t.cpp +++ b/include/dynamic-graph/signal-ptr.t.cpp @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_SIGNAL_PTR_T_CPP # define DYNAMIC_GRAPH_SIGNAL_PTR_T_CPP @@ -121,7 +109,7 @@ namespace dynamicgraph transmitAbstract = false; DG_THROW ExceptionSignal( ExceptionSignal::PLUG_IMPOSSIBLE, "Compl. Uncompatible types for plugin.", - "(while trying to plug <%s> on <%s>)" + "(while trying to plug <%s> on <%s>)" " with types <%s> on <%s>.", unknown_ref->getName ().c_str (), this->getName ().c_str (), diff --git a/include/dynamic-graph/signal-time-dependent.h b/include/dynamic-graph/signal-time-dependent.h index f9f4b1d09fa7e1f46899591c9005f79067315beb..0beb6483e8e12c0f8af8c0f9f9aad32bc0d42c46 100644 --- a/include/dynamic-graph/signal-time-dependent.h +++ b/include/dynamic-graph/signal-time-dependent.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_SIGNAL_TIME_DEPENDENT_H # define DYNAMIC_GRAPH_SIGNAL_TIME_DEPENDENT_H diff --git a/include/dynamic-graph/signal.h b/include/dynamic-graph/signal.h index 111bb8cd2144eb080b9ee9ce2386ab28113c5adf..18d25d389b6b887002e867a0d57de7851a3de1ba 100644 --- a/include/dynamic-graph/signal.h +++ b/include/dynamic-graph/signal.h @@ -5,17 +5,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * dynamic-graph is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. You should - * have received a copy of the GNU Lesser General Public License along - * with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. */ #ifndef __SIGNAL_HH @@ -126,7 +115,7 @@ protected: inline operator const T& () const { return accessCopy (); } virtual void getClassName(std::string & aClassName) const { aClassName = typeid(this).name(); } - + public: virtual void checkCompatibility () { throw Tcopy; } @@ -150,4 +139,3 @@ protected: * c-basic-offset: 4 * End: */ - diff --git a/include/dynamic-graph/signal.t.cpp b/include/dynamic-graph/signal.t.cpp index 6aa555e2f24ac903553baf130b86684c0dcf066f..1b0470560a8803a3664f0a1e39cd46a20f8b1a19 100644 --- a/include/dynamic-graph/signal.t.cpp +++ b/include/dynamic-graph/signal.t.cpp @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_SIGNAL_T_CPP # define DYNAMIC_GRAPH_SIGNAL_T_CPP diff --git a/include/dynamic-graph/time-dependency.h b/include/dynamic-graph/time-dependency.h index c79c2b696b94d55d882ba19ec498ef84b1bdcbf9..1505e90e1602bf42a46c49311afd0b2cc20007f2 100644 --- a/include/dynamic-graph/time-dependency.h +++ b/include/dynamic-graph/time-dependency.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_TIME_DEPENDENCY_H # define DYNAMIC_GRAPH_TIME_DEPENDENCY_H diff --git a/include/dynamic-graph/time-dependency.t.cpp b/include/dynamic-graph/time-dependency.t.cpp index 6199bb10d93985f44d0e15a0067bec6ed57cc33e..f9689574baaccb26f7dc2cb23bbc4ebf9725533c 100644 --- a/include/dynamic-graph/time-dependency.t.cpp +++ b/include/dynamic-graph/time-dependency.t.cpp @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_TIME_DEPENDENCY_T_CPP # define DYNAMIC_GRAPH_TIME_DEPENDENCY_T_CPP diff --git a/include/dynamic-graph/tracer-real-time.h b/include/dynamic-graph/tracer-real-time.h index 3db261b69b7a3be14dd7938c4e7d966f0855f7dc..b39b8a79b67ff2e05b1615f97277a7d18fab85fa 100644 --- a/include/dynamic-graph/tracer-real-time.h +++ b/include/dynamic-graph/tracer-real-time.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_TRACER_REAL_TIME_H # define DYNAMIC_GRAPH_TRACER_REAL_TIME_H diff --git a/include/dynamic-graph/tracer.h b/include/dynamic-graph/tracer.h index 386f4b238c303b4cf42da705008755b2745a24af..61a7f06bede65bb0ffe78095251ad3df97d0bc11 100644 --- a/include/dynamic-graph/tracer.h +++ b/include/dynamic-graph/tracer.h @@ -2,18 +2,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Lesser Public License for more details. You should have -// received a copy of the GNU Lesser General Public License along with -// dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_TRACER_H # define DYNAMIC_GRAPH_TRACER_H diff --git a/include/dynamic-graph/value.h b/include/dynamic-graph/value.h index 14b8f472daba21085620f6916890c3b0efdfd604..13898666e3485578cc1c7b469d61675b441808e3 100644 --- a/include/dynamic-graph/value.h +++ b/include/dynamic-graph/value.h @@ -3,17 +3,6 @@ // // Author: Florent Lamiraux // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License -// as published by the Free Software Foundation, either version 3 of -// the License, or (at your option) any later version. -// dynamic-graph is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. You should -// have received a copy of the GNU Lesser General Public License along -// with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #ifndef DYNAMIC_GRAPH_VALUE_H #define DYNAMIC_GRAPH_VALUE_H @@ -112,7 +101,7 @@ namespace dynamicgraph { }; /* ---- HELPER ---------------------------------------------------------- */ - // Note: to ensure the WIN32 compatibility, it is necessary to export + // Note: to ensure the WIN32 compatibility, it is necessary to export // the template specialization. Also, it is forbidden to do the template // specialization declaration in the header file, for the same reason. template< typename T > diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 738a664e76befda6d72cdd6438e744d1c3554e16..00054c99e6935415523dec8fed476bd23fdd785a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,27 +1,5 @@ # Copyright 2010, Olivier Stasse, JRL, CNRS/AIST # -# This file is part of dynamic-graph. -# dynamic-graph is free software: -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #################################### ### Main Library diff --git a/src/command/command.cpp b/src/command/command.cpp index 99fd8b776ad5aef59aa5fab634cfd20f3531b722..d38eddc271b5faed7a2a9f367e29d9b6e22eef7a 100644 --- a/src/command/command.cpp +++ b/src/command/command.cpp @@ -3,28 +3,6 @@ // // Author: Florent Lamiraux // -// This file is part of dynamic-graph. -// dynamic-graph is free software: -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <sstream> #include "dynamic-graph/command.h" diff --git a/src/command/value.cpp b/src/command/value.cpp index bb32599d19a47cfafb33256d6cca641572e1c0ba..2dde1c3224d8c7cfdb4397c62184f517499446d3 100644 --- a/src/command/value.cpp +++ b/src/command/value.cpp @@ -3,28 +3,6 @@ // // Author: Florent Lamiraux // -// This file is part of dynamic-graph. -// dynamic-graph is free software: -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "dynamic-graph/value.h" diff --git a/src/debug/debug.cpp b/src/debug/debug.cpp index 935516f821b9f39ec78e90250aad22f3c5d81c07..4e3828c7bad8bd09a24121b68a5de2f7c48bb5f4 100644 --- a/src/debug/debug.cpp +++ b/src/debug/debug.cpp @@ -5,28 +5,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <dynamic-graph/debug.h> @@ -83,4 +61,3 @@ void DebugTrace::closeFile(const char *) //DebugTrace dgDebugFLOW(std::cout); //DebugTrace dgERRORFLOW(std::cerr); - diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp index 3bb3542f79c2f691e1bd53cdcabb5958008b0331..7aa01ccf7e0e9872013cb6425be0527bf7c95b0a 100644 --- a/src/debug/logger.cpp +++ b/src/debug/logger.cpp @@ -1,10 +1,8 @@ /* - * Copyright 2015, 2019 + * Copyright 2015, 2019 * LAAS-CNRS * Andrea Del Prete, François Bailly, Olivier Stasse - * - * This file is part of dynamic-graph. - * See license file. + * */ #ifndef WIN32 @@ -37,7 +35,7 @@ namespace dynamicgraph Logger::~Logger() { } - + void Logger::setVerbosity(LoggerVerbosity lv) { m_lv=lv; @@ -46,7 +44,7 @@ namespace dynamicgraph LoggerVerbosity Logger::getVerbosity() { return m_lv; - + } void Logger::countdown() { @@ -104,4 +102,3 @@ namespace dynamicgraph return true; } } // namespace dynamicgraph - diff --git a/src/debug/real-time-logger.cpp b/src/debug/real-time-logger.cpp index 97ad576cbf3da2f3098be5291df0a45247f8def2..340738054f903b13fb8104b6569ed8b6c406d35c 100644 --- a/src/debug/real-time-logger.cpp +++ b/src/debug/real-time-logger.cpp @@ -4,17 +4,6 @@ * * LAAS-CNRS * - * This file is part of dynamic-graph. - * dynamic-graph is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * dynamic-graph is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. You should - * have received a copy of the GNU Lesser General Public License along - * with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. */ #include <dynamic-graph/real-time-logger.h> @@ -103,9 +92,9 @@ namespace dynamicgraph threadParam.sched_priority -= 5; if (threadParam.sched_priority < sched_get_priority_min (threadPolicy)) threadParam.sched_priority = sched_get_priority_min (threadPolicy); - + pthread_setschedparam (pthread_self(), threadPolicy, &threadParam); - } + } while (!requestShutdown_ || !logger->empty()) { diff --git a/src/dgraph/entity.cpp b/src/dgraph/entity.cpp index 87f09ade5a790c70256c090817a1add26a902d9f..eb5bf597b060161b49110308e7a3c9ffa4f06941 100644 --- a/src/dgraph/entity.cpp +++ b/src/dgraph/entity.cpp @@ -5,28 +5,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /*! Local framework includes */ @@ -286,4 +264,3 @@ sendMsg(const std::string &msg, { logger_.sendMsg("["+name+"]"+msg,t,file,line); } - diff --git a/src/dgraph/factory.cpp b/src/dgraph/factory.cpp index 0504d1d3100dbca25201961bff3cdd6feb955862..9c10a6c9f77f0f5afd61d7b81fb782cc8849ac99 100644 --- a/src/dgraph/factory.cpp +++ b/src/dgraph/factory.cpp @@ -1,28 +1,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <boost/foreach.hpp> diff --git a/src/dgraph/pool.cpp b/src/dgraph/pool.cpp index de105970890a5ce09fbef854fe36049e3044c95b..0d240cfe0784f564b2b72b607cb62e35f42eed92 100644 --- a/src/dgraph/pool.cpp +++ b/src/dgraph/pool.cpp @@ -5,29 +5,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided that the following - * conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. */ /* --------------------------------------------------------------------- */ @@ -295,4 +272,3 @@ getSignal( std::istringstream& sigpath ) } PoolStorage* PoolStorage::instance_ = 0; - diff --git a/src/exception/exception-abstract.cpp b/src/exception/exception-abstract.cpp index 895d70098cbfb7ed5e3119297dc74bd822974b8c..f1eb90dd0ed428c587d1c09372b4fb6a6503e04f 100644 --- a/src/exception/exception-abstract.cpp +++ b/src/exception/exception-abstract.cpp @@ -1,28 +1,6 @@ // Copyright 2010, François Bleibel, Thomas Moulard, Olivier Stasse, // JRL, CNRS/AIST. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <cstring> #include <dynamic-graph/exception-abstract.h> diff --git a/src/exception/exception-factory.cpp b/src/exception/exception-factory.cpp index 523cea2631df99a8d982253237d67321e16d741b..96e925710c2de866b445eb599746c1c605c3c01c 100644 --- a/src/exception/exception-factory.cpp +++ b/src/exception/exception-factory.cpp @@ -5,28 +5,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <dynamic-graph/exception-factory.h> diff --git a/src/exception/exception-signal.cpp b/src/exception/exception-signal.cpp index 53d35d9ac660c6a0365f8965d45bf36f72a7b710..44ab17d7109e4d8a19485dddd3a49b90d651c27e 100644 --- a/src/exception/exception-signal.cpp +++ b/src/exception/exception-signal.cpp @@ -5,28 +5,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <dynamic-graph/exception-signal.h> diff --git a/src/exception/exception-traces.cpp b/src/exception/exception-traces.cpp index 0d15f8a793983e20e47fc070a90f00cb25ec798a..a02858182e5873c009b241d3e94973960261635f 100644 --- a/src/exception/exception-traces.cpp +++ b/src/exception/exception-traces.cpp @@ -5,28 +5,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <dynamic-graph/exception-traces.h> diff --git a/src/signal/signal-array.cpp b/src/signal/signal-array.cpp index 6dd75c9e2ddb4965ffe95afdf6684140802e6cba..02e8a00cee5631177ed7d504a46044908c3ffd42 100644 --- a/src/signal/signal-array.cpp +++ b/src/signal/signal-array.cpp @@ -5,28 +5,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <dynamic-graph/signal-array.h> diff --git a/src/signal/signal-cast-helper.cpp b/src/signal/signal-cast-helper.cpp index a483fa0d6deb777feabf26a0f787795afc0f6756..dc3d9bca45ea526ede9041599990b96f46b6515f 100644 --- a/src/signal/signal-cast-helper.cpp +++ b/src/signal/signal-cast-helper.cpp @@ -1,28 +1,6 @@ // -*- c++-mode -*- // Copyright 2010 François Bleibel Thomas Moulard, Olivier Stasse, Nicolas Mansard // -// This file is part of dynamic-graph. -// dynamic-graph is free software: -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <boost/date_time/posix_time/posix_time.hpp> #include <dynamic-graph/signal-caster.h> diff --git a/src/signal/signal-caster.cpp b/src/signal/signal-caster.cpp index 410b75e2bbe89c055a536545f060f1087b104489..b8cac844f1e28dd6e64a64f7fbe77951606f3197 100644 --- a/src/signal/signal-caster.cpp +++ b/src/signal/signal-caster.cpp @@ -1,28 +1,6 @@ // -*- c++-mode -*- // Copyright 2010 François Bleibel Thomas Moulard, Olivier Stasse // -// This file is part of dynamic-graph. -// dynamic-graph is free software: -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <dynamic-graph/signal-caster.h> #include <dynamic-graph/dynamic-graph-api.h> diff --git a/src/traces/tracer-real-time.cpp b/src/traces/tracer-real-time.cpp index b70249f4c579bae199f3afcf1587fb88b4b52d0b..cc7abf083ae7c319749fc563a773d4161e7f408c 100644 --- a/src/traces/tracer-real-time.cpp +++ b/src/traces/tracer-real-time.cpp @@ -5,28 +5,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* --------------------------------------------------------------------- */ diff --git a/src/traces/tracer.cpp b/src/traces/tracer.cpp index 9ad0eef5a420a85814c2bab1f8fb91d6bf3d7653..3d2b97825f5cc9ff7dd0714dcdbe4d5c5eb2e4a2 100644 --- a/src/traces/tracer.cpp +++ b/src/traces/tracer.cpp @@ -5,28 +5,6 @@ * * CNRS/AIST * - * This file is part of dynamic-graph. - * dynamic-graph is free software: - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* --------------------------------------------------------------------- */ diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5924b4201e3238259525e59c8dcddb7eae1ffa75..75081de942c483a26ad9879560ab969eedabbefd 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,17 +1,5 @@ # Copyright 2010, Olivier Stasse, JRL, CNRS/AIST # -# This file is part of dynamic-graph. -# dynamic-graph is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License -# as published by the Free Software Foundation, either version 3 of -# the License, or (at your option) any later version. -# -# dynamic-graph is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Lesser Public License for more details. You should have -# received a copy of the GNU Lesser General Public License along with -# dynamic-graph. If not, see <http://www.gnu.org/licenses/>. ADD_DEFINITIONS(-DDEBUG=2) diff --git a/tests/custom-entity.cpp b/tests/custom-entity.cpp index 31b523a00f91bf4e3d64d68f8a4ba788b027a7ef..e7448267f4467397be1c6d148eca8a71d8a7889c 100644 --- a/tests/custom-entity.cpp +++ b/tests/custom-entity.cpp @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include <sstream> #include <dynamic-graph/factory.h> @@ -81,4 +69,3 @@ BOOST_AUTO_TEST_CASE (display) // Deregister entities before destroying them dynamicgraph::PoolStorage::destroy(); } - diff --git a/tests/debug-trace.cpp b/tests/debug-trace.cpp index a15ade2a124de5db4186b154cd15fa2153a98009..a3907849801bd466f5beab6aed3338b61b9dd993 100644 --- a/tests/debug-trace.cpp +++ b/tests/debug-trace.cpp @@ -2,8 +2,6 @@ * * Olivier Stasse * - * See LICENSE file - * */ #include <sstream> #include <iostream> @@ -66,9 +64,9 @@ namespace dynamicgraph BOOST_AUTO_TEST_CASE(testDebugTrace) { - + BOOST_CHECK_EQUAL (dynamicgraph::CustomEntity::CLASS_NAME, "CustomEntity"); - + dynamicgraph::CustomEntity& entity = *(dynamic_cast<dynamicgraph::CustomEntity *>( dynamicgraph::FactoryStorage::getInstance()->newEntity("CustomEntity", "my-entity"))); @@ -79,7 +77,7 @@ BOOST_AUTO_TEST_CASE(testDebugTrace) std::fstream the_debug_file; the_debug_file.open(dynamicgraph::DebugTrace::DEBUG_FILENAME_DEFAULT, std::ios::in ); - + // Extract the filename and this source file from the output std::string astr; std::ostringstream oss_debug_file; @@ -91,7 +89,7 @@ BOOST_AUTO_TEST_CASE(testDebugTrace) std::string asubstr2 = asubstr.substr(found+1,astr.length()); oss_debug_file << asubstr2; } - + the_debug_file.close(); // Compare with the strings put inside this source file @@ -103,9 +101,7 @@ BOOST_AUTO_TEST_CASE(testDebugTrace) // Make comparisons. two_sub_string_identical = str_to_test == oss_debug_file.str(); - - BOOST_CHECK(two_sub_string_identical); - -} + BOOST_CHECK(two_sub_string_identical); +} diff --git a/tests/debug-tracer.cpp b/tests/debug-tracer.cpp index 34a8cfd3e85380bd25a95c27b080186565828997..8bf547d538434172ab0880d1ff025c6941218117 100644 --- a/tests/debug-tracer.cpp +++ b/tests/debug-tracer.cpp @@ -2,8 +2,6 @@ * * Olivier Stasse * - * See LICENSE file - * */ #include <iostream> @@ -26,11 +24,11 @@ namespace dynamicgraph struct MyEntity : public dynamicgraph::Entity { static const std::string CLASS_NAME; - + dynamicgraph::Signal<double, int> m_sigdSIN; dynamicgraph::SignalTimeDependent<double, int> m_sigdTimeDepSOUT; dynamicgraph::SignalTimeDependent<double, int> m_sigdTwoTimeDepSOUT; - + MyEntity (const std::string& name) : Entity (name) ,m_sigdSIN("MyEntity("+name+")::input(double)::in_double") @@ -40,30 +38,30 @@ namespace dynamicgraph ,m_sigdTwoTimeDepSOUT(boost::bind(&MyEntity::update,this,_1,_2), m_sigdSIN, "MyEntity("+name+")::input(double)::out2double") - + { signalRegistration(m_sigdSIN << m_sigdTimeDepSOUT << m_sigdTwoTimeDepSOUT); } - + virtual void display (std::ostream& os) const { os << "Hello! My name is " << getName () << " !" << std::endl; } - + virtual const std::string& getClassName () const { return CLASS_NAME; } - + double & update(double &res, const int &inTime) { const double &aDouble = m_sigdSIN(inTime); res = aDouble; return res; } - + }; DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN (MyEntity,"MyEntity"); } @@ -96,7 +94,7 @@ BOOST_AUTO_TEST_CASE(test_tracer) atracer.addSignalToTrace(aSignal,"output2"); aSignalInt.setConstant(1.5); - + std::string rootdir("/tmp"); std::string basename("my-tracer"); std::string suffix(".dat"); @@ -112,8 +110,8 @@ BOOST_AUTO_TEST_CASE(test_tracer) aSignalInt.setTime(i); atracer.recordTrigger(i,i); } - + atracer.stop(); - + atracer.closeFiles(); } diff --git a/tests/entity.cpp b/tests/entity.cpp index b45a24ea26a9461d99922ee35f3da93e8183e0e5..7e4a5d091496b34e31ef71a2091e3e5713b16dc6 100644 --- a/tests/entity.cpp +++ b/tests/entity.cpp @@ -1,8 +1,6 @@ /* Copyright 2010-2019 LAAS, CNRS * Thomas Moulard. * - * See LICENSE file - * */ #define ENABLE_RT_LOG @@ -63,7 +61,7 @@ namespace dynamicgraph res = aDouble; return res; } - + }; DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN (CustomEntity,"CustomEntity"); } @@ -193,7 +191,7 @@ BOOST_AUTO_TEST_CASE (sendMsg) dynamicgraph::PoolStorage::getInstance()->getEntity("my-entity"); output_test_stream output; - + for(unsigned int i=0; i<4; i++) @@ -205,7 +203,7 @@ BOOST_AUTO_TEST_CASE (sendMsg) entity.setLoggerVerbosityLevel(aLoggerVerbosityLevel); if (entity.getLoggerVerbosityLevel()!=aLoggerVerbosityLevel) output << "Mismatch output"; - + std::string aBaseMsg="Auto Test Case"; std::string aMsg=aBaseMsg+" DEBUG"; entity.sendMsg(aMsg, dynamicgraph::MSG_TYPE_DEBUG, __FILE__, __LINE__); diff --git a/tests/factory.cpp b/tests/factory.cpp index fbc5683be2e9f5e5588a1a7ea669bca2b6650f7a..5fbeb4f6350434d9ecf54aefa75a18ca7c081208 100644 --- a/tests/factory.cpp +++ b/tests/factory.cpp @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include <sstream> #include <dynamic-graph/factory.h> diff --git a/tests/interpreter-tracer.cpp b/tests/interpreter-tracer.cpp index d314fbea0e588b816295600a8bb33ec3ab0c0662..f514b87e984f5bd0e2b3354cd031d8d658152b24 100644 --- a/tests/interpreter-tracer.cpp +++ b/tests/interpreter-tracer.cpp @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include <sstream> #include <dynamic-graph/exception-factory.h> diff --git a/tests/pool.cpp b/tests/pool.cpp index e3821711286ec9c634ff77c19b360e2ede9c2203..9ea3b2da88211e4df5fb7fd1a2ea95f042944f9b 100644 --- a/tests/pool.cpp +++ b/tests/pool.cpp @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include <sstream> #include <iostream> @@ -35,7 +23,7 @@ struct MyEntity : public dynamicgraph::Entity dynamicgraph::SignalPtr<double, int> m_sigdSIN; dynamicgraph::SignalTimeDependent<double, int> m_sigdTimeDepSOUT; - + MyEntity (const std::string& name) : Entity (name) ,m_sigdSIN(NULL,"MyEntity("+name+")::input(double)::in_double") @@ -62,7 +50,7 @@ struct MyEntity : public dynamicgraph::Entity res = aDouble; return res; } - + }; DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN (MyEntity, "MyEntity"); @@ -129,7 +117,7 @@ BOOST_AUTO_TEST_CASE (pool_display) bool testExistence = anEntityMap.find("MyEntityInst")==anEntityMap.end(); BOOST_CHECK(!testExistence); - + /// Testing the existence of an entity testExistence = dg::PoolStorage::getInstance()->existEntity ("MyEntityInst",entity); @@ -149,7 +137,7 @@ BOOST_AUTO_TEST_CASE (pool_display) oss_output_wgph << the_debug_file.rdbuf(); the_debug_file.close(); - /// Use a predefined output + /// Use a predefined output std::string str_to_test="/* This graph has been automatically generated.\n" " 2019 Month: 2 Day: 28 Time: 11:28 */\n" "digraph \"output\" { graph [ label=\"output\" bgcolor = white rankdir=LR ]\n" @@ -160,7 +148,7 @@ BOOST_AUTO_TEST_CASE (pool_display) " fontcolor = black, color = black, fillcolor=cyan, style=filled, shape=box ]\n" "}\n"; - /// Check the two substring (remove the date) - + /// Check the two substring (remove the date) - std::string s_output_wgph = oss_output_wgph.str(); std::string s_crmk="*/"; @@ -171,12 +159,12 @@ BOOST_AUTO_TEST_CASE (pool_display) bool two_sub_string_identical; two_sub_string_identical=sub_str_to_test==sub_s_output_wgph; - + BOOST_CHECK(two_sub_string_identical); /// Test name of a valid signal. std::istringstream an_iss("MyEntityInst.in_double"); - + dg::SignalBase<int> &aSignal= dg::PoolStorage::getInstance()->getSignal(an_iss); @@ -195,8 +183,8 @@ BOOST_AUTO_TEST_CASE (pool_display) res =(aef.getCode()==dg::ExceptionFactory::UNREFERED_SIGNAL); } BOOST_CHECK(res); - - + + /// Deregister the entity. dg::PoolStorage::getInstance()->deregisterEntity (entity->getName()); @@ -204,13 +192,13 @@ BOOST_AUTO_TEST_CASE (pool_display) /// Testing the existance of an entity testExistence = dg::PoolStorage::getInstance()->existEntity ("MyEntityInst",entity); - + BOOST_CHECK(!testExistence); /// Create Entity std::string name_entity("MyEntityInst2"); dg::PoolStorage::getInstance()-> clearPlugin(name_entity); - + dg::PoolStorage::destroy(); } diff --git a/tests/real-time-logger.cpp b/tests/real-time-logger.cpp index c96b15644123b50844eea72b86e95dba8ae74303..eb5b7e1c7bfafa35b06efb3a18f504fe3bf5956b 100644 --- a/tests/real-time-logger.cpp +++ b/tests/real-time-logger.cpp @@ -4,17 +4,6 @@ * * LAAS-CNRS * - * This file is part of dynamic-graph. - * dynamic-graph is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * dynamic-graph is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. You should - * have received a copy of the GNU Lesser General Public License along - * with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. */ #include <iostream> diff --git a/tests/signal-cast-registerer-libA.cpp b/tests/signal-cast-registerer-libA.cpp index b403e89456416b4b1495235e46aa15cfc7a9e6d7..ffd30daca97224f9d9a20a84a419a9ab4d2d55ca 100644 --- a/tests/signal-cast-registerer-libA.cpp +++ b/tests/signal-cast-registerer-libA.cpp @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include "signal-cast-registerer-libA.hh" diff --git a/tests/signal-cast-registerer-libA.hh b/tests/signal-cast-registerer-libA.hh index f0065e224f434fc72190f2ff49efa82a5e8bd37f..d4a940c12f2cb0686730842f5eba35b2e01c56d3 100644 --- a/tests/signal-cast-registerer-libA.hh +++ b/tests/signal-cast-registerer-libA.hh @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include <Eigen/Dense> diff --git a/tests/signal-cast-registerer-libB.cpp b/tests/signal-cast-registerer-libB.cpp index a8ce1b1aa0c165863dd8464a0eeaf15d6dda0bc6..81a8391d68d66de64bdf59cef9ad8056f2ecd9c3 100644 --- a/tests/signal-cast-registerer-libB.cpp +++ b/tests/signal-cast-registerer-libB.cpp @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include "signal-cast-registerer-libB.hh" diff --git a/tests/signal-cast-registerer-libB.hh b/tests/signal-cast-registerer-libB.hh index 1c600a5b6bfdba87e4ce6ad84c0df57eb19e5c93..47f43999f9254eea824ddf8a0c69b7068fab94cb 100644 --- a/tests/signal-cast-registerer-libB.hh +++ b/tests/signal-cast-registerer-libB.hh @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include <Eigen/Core> diff --git a/tests/signal-cast-registerer.cpp b/tests/signal-cast-registerer.cpp index 1982589f3d3d73f0a8092541a2c781a355845441..42b2b3ffb06a1e1ab1ca1e4d97c1c716ceccd39a 100644 --- a/tests/signal-cast-registerer.cpp +++ b/tests/signal-cast-registerer.cpp @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include <string> diff --git a/tests/signal-ptr.cpp b/tests/signal-ptr.cpp index 36638fda9b860f3da51ef1008ab03b089ec75783..9e196ace7c2d1c7820f8a0bbf8ad61f439d2af3f 100644 --- a/tests/signal-ptr.cpp +++ b/tests/signal-ptr.cpp @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include <string> diff --git a/tests/signal-time-dependent.cpp b/tests/signal-time-dependent.cpp index 246a3c6bd690f9665292f45bd15231bee8ee0af5..e186960aa118fda7e644c04f65c463b18829a3be 100644 --- a/tests/signal-time-dependent.cpp +++ b/tests/signal-time-dependent.cpp @@ -1,17 +1,5 @@ // Copyright 2010 Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include <boost/foreach.hpp> diff --git a/tests/value.cpp b/tests/value.cpp index c3f62fb3925936fe11968f4bc3033bdacc7a0e3f..ca4855c9192da292121562c5b0c16771be5d533b 100644 --- a/tests/value.cpp +++ b/tests/value.cpp @@ -1,17 +1,5 @@ // Copyright 2011 Florent Lamiraux, Thomas Moulard. // -// This file is part of dynamic-graph. -// dynamic-graph is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// dynamic-graph is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// You should have received a copy of the GNU Lesser General Public License -// along with dynamic-graph. If not, see <http://www.gnu.org/licenses/>. #include <iostream> #include "dynamic-graph/value.h"