From d80e7eb07661785a0e113536c764971bcb362712 Mon Sep 17 00:00:00 2001 From: Florent Jaillet <florent.jaillet@lif.univ-mrs.fr> Date: Wed, 17 Jan 2018 11:42:50 +0100 Subject: [PATCH] Updating GitLab project URL and copyright information --- CMakeLists.txt | 19 +++++++----- docker/dockerfile | 27 +++++++++-------- license_gpl_v3 => license.txt | 0 readme.md | 33 +++++++++++--------- src/developer_documentation.dox | 47 +++++++++++++++-------------- src/main.cpp | 15 +++++---- src/main.hpp | 15 +++++---- src/marking.cpp | 15 +++++---- src/marking.hpp | 15 +++++---- src/markingscollection.cpp | 15 +++++---- src/markingscollection.hpp | 15 +++++---- src/mincoversetcomputer.cpp | 15 +++++---- src/mincoversetcomputer.hpp | 15 +++++---- src/node.cpp | 15 +++++---- src/node.hpp | 15 +++++---- src/orderedtuples.cpp | 15 +++++---- src/orderedtuples.hpp | 15 +++++---- src/petrinet.cpp | 15 +++++---- src/petrinet.hpp | 15 +++++---- src/pnmlreader.cpp | 15 +++++---- src/pnmlreader.hpp | 15 +++++---- src/src.doxyfile | 19 +++++++----- tests/tests.doxyfile | 19 +++++++----- tests/tests_main.cpp | 15 +++++---- tests/tests_marking.cpp | 15 +++++---- tests/tests_markingscollection.cpp | 15 +++++---- tests/tests_mincoversetcomputer.cpp | 15 +++++---- tests/tests_node.cpp | 15 +++++---- tests/tests_orderedtuples.cpp | 15 +++++---- tests/tests_petrinet.cpp | 15 +++++---- tests/tests_pnmlreader.cpp | 15 +++++---- webpage/generate_webpage.sh | 25 ++++++++------- 32 files changed, 321 insertions(+), 228 deletions(-) rename license_gpl_v3 => license.txt (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bda804..48b23a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,21 +1,24 @@ -# Author: Florent JAILLET -# Date: 2016-2017 -# Copyright: LIF - UMR 7279 - Aix Marseille Univ. / CNRS +# Université d'Aix Marseille (AMU) - +# Centre National de la Recherche Scientifique (CNRS) - +# Université de Toulon (UT). +# Copyright © 2016-2018 AMU, CNRS, UT # -# This file is part of MinCoverpetri. +# This file is part of MinCoverPetri. # -# MinCoverpetri is free software: you can redistribute it and/or modify +# MinCoverPetri is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# -# MinCoverpetri is distributed in the hope that it will be useful, +# +# MinCoverPetri 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 Public License for more details. # # You should have received a copy of the GNU General Public License -# along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. +# along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Florent JAILLET - Laboratoire d'Informatique et Systèmes - UMR 7020 cmake_minimum_required(VERSION 3.5) diff --git a/docker/dockerfile b/docker/dockerfile index 080ab0e..33c965d 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -1,21 +1,24 @@ -# Author: Florent JAILLET -# Date: 2016-2017 -# Copyright: LIF - UMR 7279 - Aix Marseille Univ. / CNRS +# Université d'Aix Marseille (AMU) - +# Centre National de la Recherche Scientifique (CNRS) - +# Université de Toulon (UT). +# Copyright © 2016-2018 AMU, CNRS, UT # -# This file is part of MinCoverpetri. +# This file is part of MinCoverPetri. # -# MinCoverpetri is free software: you can redistribute it and/or modify +# MinCoverPetri is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# -# MinCoverpetri is distributed in the hope that it will be useful, +# +# MinCoverPetri 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 Public License for more details. # # You should have received a copy of the GNU General Public License -# along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. +# along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Florent JAILLET - Laboratoire d'Informatique et Systèmes - UMR 7020 # This Dockerfile is used to generate the Docker image for continuous @@ -23,19 +26,19 @@ # # To use the Docker registry associated with the MinCoverPetri GitLab project, # login with the command: -# docker login registry.gitlab.lif.univ-mrs.fr:5005 +# docker login registry.gitlab.lis-lab.fr:5005 # # To generate the image, make the directory containing this file your current # directory and run: -# docker build -t registry.gitlab.lif.univ-mrs.fr:5005/dev/mincoverpetri/mincoverpetri . +# docker build -t registry.gitlab.lis-lab.fr:5005/dev/mincoverpetri/mincoverpetri . # # To upload the image to the registry, run: -# docker push registry.gitlab.lif.univ-mrs.fr:5005/dev/mincoverpetri/mincoverpetri +# docker push registry.gitlab.lis-lab.fr:5005/dev/mincoverpetri/mincoverpetri # # If needed, you can use the image localy as an environment to build and test # the application and generate the documentation. For example, to run the image # in an interactive session, run: -# docker run -it registry.gitlab.lif.univ-mrs.fr:5005/dev/mincoverpetri/mincoverpetri +# docker run -it registry.gitlab.lis-lab.fr:5005/dev/mincoverpetri/mincoverpetri FROM ubuntu:latest diff --git a/license_gpl_v3 b/license.txt similarity index 100% rename from license_gpl_v3 rename to license.txt diff --git a/readme.md b/readme.md index 959c339..c051698 100644 --- a/readme.md +++ b/readme.md @@ -1,28 +1,31 @@ <!-- -Author: Florent JAILLET -Date: 2016-2017 -Copyright: LIF - UMR 7279 - Aix Marseille Univ. / CNRS +Université d'Aix Marseille (AMU) - +Centre National de la Recherche Scientifique (CNRS) - +Université de Toulon (UT). +Copyright © 2016-2018 AMU, CNRS, UT -This file is part of MinCoverpetri. +This file is part of MinCoverPetri. -MinCoverpetri is free software: you can redistribute it and/or modify +MinCoverPetri is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -MinCoverpetri is distributed in the hope that it will be useful, +MinCoverPetri 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 Public License for more details. You should have received a copy of the GNU General Public License -along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. +along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. + +Author: Florent JAILLET - Laboratoire d'Informatique et Systèmes - UMR 7020 --> MinCoverPetri ==== -[MinCoverPetri](http://dev.pages.lif.univ-mrs.fr/mincoverpetri) is a +[MinCoverPetri](http://dev.pages.lis-lab.fr/mincoverpetri) is a command-line application for the fast computation of the minimal coverability set of place/transition (P/T) Petri nets. @@ -41,7 +44,7 @@ See [pnml.org](http://www.pnml.org) for details about this format. MinCoverPetri is developed in C++ by the [development team](http://developpement.lif.univ-mrs.fr) of the -[LIF](http://www.lif.univ-mrs.fr/). +[LIS](http://www.lis-lab.fr/). License ---- @@ -54,14 +57,14 @@ Download ---- **Precompiled executables** for GNU/Linux and Windows can be downloaded from -the [MinCoverPetri website](http://dev.pages.lif.univ-mrs.fr/mincoverpetri). +the [MinCoverPetri website](http://dev.pages.lis-lab.fr/mincoverpetri). The **source code** can be downloaded from the associated -[GitLab project](https://gitlab.lif.univ-mrs.fr/dev/mincoverpetri). +[GitLab project](https://gitlab.lis-lab.fr/dev/mincoverpetri). The build instructions are given in the [developer -documentation](http://dev.pages.lif.univ-mrs.fr/mincoverpetri/doc/src/html) +documentation](http://dev.pages.lis-lab.fr/mincoverpetri/doc/src/html) and in the file [src/developer_documentation.dox](src/developer_documentation.dox). @@ -76,12 +79,12 @@ option, simply run: mincoverpetri -h This help is also replicated on the -[MinCoverPetri website](http://dev.pages.lif.univ-mrs.fr/mincoverpetri). +[MinCoverPetri website](http://dev.pages.lis-lab.fr/mincoverpetri). ### Developer documentation The [developer -documentation](http://dev.pages.lif.univ-mrs.fr/mincoverpetri/doc/src/html) +documentation](http://dev.pages.lis-lab.fr/mincoverpetri/doc/src/html) is available online. It can also be automatically generated from the source code using @@ -105,6 +108,6 @@ Contact ---- Issues can be reported in the -[GitLab project](https://gitlab.lif.univ-mrs.fr/dev/mincoverpetri) or by email +[GitLab project](https://gitlab.lis-lab.fr/dev/mincoverpetri) or by email to `contact.dev`@`lif.univ-mrs.fr`. diff --git a/src/developer_documentation.dox b/src/developer_documentation.dox index a4d12f2..6b2b19e 100644 --- a/src/developer_documentation.dox +++ b/src/developer_documentation.dox @@ -1,21 +1,24 @@ -/* Author: Florent JAILLET - * Date: 2016-2017 - * Copyright: LIF - UMR 7279 - Aix Marseille Univ. / CNRS. - * - * This file is part of MinCoverpetri. - * - * MinCoverpetri is free software: you can redistribute it and/or modify +/* Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Copyright © 2016-2018 AMU, CNRS, UT + * + * This file is part of MinCoverPetri. + * + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * - * MinCoverpetri is distributed in the hope that it will be useful, + * + * MinCoverPetri 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 Public License for more details. - * + * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. + * + * Author: Florent JAILLET - Laboratoire d'Informatique et Systèmes - UMR 7020 */ /** @@ -26,7 +29,7 @@ * \section introduction Introduction * * Welcome to the developer documentation of - * [**MinCoverPetri**](http://dev.pages.lif.univ-mrs.fr/mincoverpetri), + * [**MinCoverPetri**](http://dev.pages.lis-lab.fr/mincoverpetri), * a command-line application for the fast computation of the minimal * coverability set of place/transition Petri nets. * @@ -47,7 +50,7 @@ * \section development Development * * The development of MinCoverPetri is done in its - * [GitLab project](https://gitlab.lif.univ-mrs.fr/dev/mincoverpetri), + * [GitLab project](https://gitlab.lis-lab.fr/dev/mincoverpetri), * which provides the Git repository managing the source code and where issues * can be reported. * @@ -110,10 +113,10 @@ * To get the source code of MinCoverPetri, clone the Git repository of the * project: * - * git clone https://gitlab.lif.univ-mrs.fr/dev/mincoverpetri.git + * git clone https://gitlab.lis-lab.fr/dev/mincoverpetri.git * * Alternatively, a compressed archive of the latest version of the code can - * be directly downloaded using this [link](https://gitlab.lif.univ-mrs.fr/ + * be directly downloaded using this [link](https://gitlab.lis-lab.fr/ * dev/mincoverpetri/repository/archive.zip?ref=master). * * \section build Build the application and its tests @@ -278,7 +281,7 @@ * * The test coverage report for the current version of MinCoverPetri is * available [here] - * (http://dev.pages.lif.univ-mrs.fr/mincoverpetri/coverage/coverage.html). + * (http://dev.pages.lis-lab.fr/mincoverpetri/coverage/coverage.html). * * If you have installed [Valgrind](http://valgrind.org) (package **valgrind** * in Debian and its derivatives), you can check that no memory leak is @@ -320,11 +323,11 @@ * application, * - run the tests and generate a * [code coverage report] - * (http://dev.pages.lif.univ-mrs.fr/mincoverpetri/coverage/coverage.html), + * (http://dev.pages.lis-lab.fr/mincoverpetri/coverage/coverage.html), * - generate the [developer documentation] - * (http://dev.pages.lif.univ-mrs.fr/mincoverpetri/doc/src/html), + * (http://dev.pages.lis-lab.fr/mincoverpetri/doc/src/html), * - generate the main - * [webpage](http://dev.pages.lif.univ-mrs.fr/mincoverpetri) of the project. + * [webpage](http://dev.pages.lis-lab.fr/mincoverpetri) of the project. * * The continuous integration tasks are configured in the file * `.gitlab-ci.yml`. @@ -335,10 +338,10 @@ * development environment if wanted. For example, to run the image * in an interactive session, run: * - * docker run -it registry.gitlab.lif.univ-mrs.fr:5005/dev/mincoverpetri/mincoverpetri + * docker run -it registry.gitlab.lis-lab.fr:5005/dev/mincoverpetri/mincoverpetri * * Some instructions about this Docker image are available in this - * [page](https://gitlab.lif.univ-mrs.fr/dev/mincoverpetri/container_registry). + * [page](https://gitlab.lis-lab.fr/dev/mincoverpetri/container_registry). * * The Dockerfile used to generate the Docker image is available in the * directory `docker`. @@ -357,5 +360,5 @@ * > DOI: [10.3233/FI-2013-781](https://doi.org/10.3233/FI-2013-781) * * A preprint of this article is available [here] - * (http://pageperso.lif.univ-mrs.fr/~pierre-alain.reynier/publis/fi13.pdf). + * (http://pageperso.lis-lab.fr/~pierre-alain.reynier/publis/fi13.pdf). */ diff --git a/src/main.cpp b/src/main.cpp index 3aaca33..96ada0f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,8 +2,11 @@ * \file * \brief Main functions of the command line application * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file defines the main functions of the command line application @@ -11,20 +14,20 @@ * data. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #include "main.hpp" diff --git a/src/main.hpp b/src/main.hpp index 83dda28..1db829b 100644 --- a/src/main.hpp +++ b/src/main.hpp @@ -2,8 +2,11 @@ * \file * \brief Header for main functions of the command line application * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file declares the main functions of the command line application @@ -11,20 +14,20 @@ * data. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MAIN_HPP_ diff --git a/src/marking.cpp b/src/marking.cpp index 497a34b..5b06892 100644 --- a/src/marking.cpp +++ b/src/marking.cpp @@ -2,28 +2,31 @@ * \file * \brief Tools to represent and manipulate omega-markings * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file defines the elements used to represent and manipulate * omega-markings of Petri nets. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #include "marking.hpp" diff --git a/src/marking.hpp b/src/marking.hpp index c34c78f..6517566 100644 --- a/src/marking.hpp +++ b/src/marking.hpp @@ -2,28 +2,31 @@ * \file * \brief Header for tools to represent and manipulate omega-markings * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file declares the elements used to represent and manipulate * omega-markings of Petri nets. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MARKING_HPP_ diff --git a/src/markingscollection.cpp b/src/markingscollection.cpp index e91b4b2..a5c41b5 100644 --- a/src/markingscollection.cpp +++ b/src/markingscollection.cpp @@ -3,8 +3,11 @@ * \brief Tools to represent and manipulate unordered collections of * omega-markings * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file defines the elements used to represent and manipulate an unoredered @@ -12,20 +15,20 @@ * particular be used to represent the minimal coverability set of a Petri net. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #include "markingscollection.hpp" diff --git a/src/markingscollection.hpp b/src/markingscollection.hpp index 74e0a4c..5ed2d4b 100644 --- a/src/markingscollection.hpp +++ b/src/markingscollection.hpp @@ -3,8 +3,11 @@ * \brief Header for tools to represent and manipulate unordered collections of * omega-markings * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file declares the elements used to represent and manipulate an unordered @@ -12,20 +15,20 @@ * particular be used to represent the minimal coverability set of a Petri net. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MARKINGSCOLLECTION_HPP_ diff --git a/src/mincoversetcomputer.cpp b/src/mincoversetcomputer.cpp index 0308ebf..374619e 100644 --- a/src/mincoversetcomputer.cpp +++ b/src/mincoversetcomputer.cpp @@ -2,8 +2,11 @@ * \file * \brief Tools to compute the minimal coverability set of a Petri net * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file defines the elements used to compute the minimal coverability set @@ -11,20 +14,20 @@ * pruning algorithm. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #include "mincoversetcomputer.hpp" diff --git a/src/mincoversetcomputer.hpp b/src/mincoversetcomputer.hpp index b0178bc..5b800bb 100644 --- a/src/mincoversetcomputer.hpp +++ b/src/mincoversetcomputer.hpp @@ -3,28 +3,31 @@ * \brief Header for tools to compute the minimal coverability set of a Petri * net * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file declares the elements used to compute the minimal coverability set * of a Petri net. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MINCOVERSETCOMPUTER_HPP_ diff --git a/src/node.cpp b/src/node.cpp index 334a413..4b07d47 100644 --- a/src/node.cpp +++ b/src/node.cpp @@ -3,8 +3,11 @@ * \brief Tools to represent and manipulate the nodes and the tree used in the * monotone pruning algorithm * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file defines the elements used to represent and manipulate the @@ -14,20 +17,20 @@ * the execution of the algorithm. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #include "node.hpp" diff --git a/src/node.hpp b/src/node.hpp index 2f71464..f3f98e4 100644 --- a/src/node.hpp +++ b/src/node.hpp @@ -3,8 +3,11 @@ * \brief Header for tools to represent and manipulate the nodes of the tree * used in the monotone pruning algorithm * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file declares the elements used to represent and manipulate the @@ -14,20 +17,20 @@ * the execution of the algorithm. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifndef NODE_HPP_ diff --git a/src/orderedtuples.cpp b/src/orderedtuples.cpp index 1be0f2e..30883be 100644 --- a/src/orderedtuples.cpp +++ b/src/orderedtuples.cpp @@ -3,8 +3,11 @@ * \brief Tools to represent and manipulate ordered tuples used to accelerate * key steps of the monotone pruning algorithm * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file defines a data structure representing ordered tuples. It provides @@ -12,20 +15,20 @@ * the monotone pruning algorithm. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #include "orderedtuples.hpp" diff --git a/src/orderedtuples.hpp b/src/orderedtuples.hpp index 56bc2a2..d8a8c22 100644 --- a/src/orderedtuples.hpp +++ b/src/orderedtuples.hpp @@ -3,8 +3,11 @@ * \brief Header for tools to represent and manipulate ordered tuples used to * accelerate key steps of the monotone pruning algorithm * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file declares a data structure representing ordered tuples. It provides @@ -12,20 +15,20 @@ * the monotone pruning algorithm. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifndef ORDEREDTUPLES_HPP_ diff --git a/src/petrinet.cpp b/src/petrinet.cpp index daebf74..15cbe81 100644 --- a/src/petrinet.cpp +++ b/src/petrinet.cpp @@ -2,28 +2,31 @@ * \file * \brief Tools to represent and manipulate place/transition Petri nets * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file defines the tools to represent and manipulate place/transition * Petri nets. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #include "petrinet.hpp" diff --git a/src/petrinet.hpp b/src/petrinet.hpp index bfe3849..7397525 100644 --- a/src/petrinet.hpp +++ b/src/petrinet.hpp @@ -3,28 +3,31 @@ * \brief Header for tools to represent and manipulate place/transition Petri * nets * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file declares the tools to represent and manipulate place/transition * Petri nets. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifndef PETRINET_HPP_ diff --git a/src/pnmlreader.cpp b/src/pnmlreader.cpp index 29e07e0..24909f7 100644 --- a/src/pnmlreader.cpp +++ b/src/pnmlreader.cpp @@ -2,8 +2,11 @@ * \file * \brief Tools to read PNML Petri net files * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file defines the tools to read place/transition (P/T) Petri net files in @@ -13,20 +16,20 @@ * See http://www.pnml.org/ for details about the PNML file format. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #include "pnmlreader.hpp" diff --git a/src/pnmlreader.hpp b/src/pnmlreader.hpp index 37522f6..ec61201 100644 --- a/src/pnmlreader.hpp +++ b/src/pnmlreader.hpp @@ -2,8 +2,11 @@ * \file * \brief Header for tools to read PNML Petri net files * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This file declares the tools to read place/transition (P/T) Petri net files @@ -13,20 +16,20 @@ * See http://www.pnml.org/ for details about the PNML file format. */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifndef PNMLREADER_HPP_ diff --git a/src/src.doxyfile b/src/src.doxyfile index 765cb87..ba9aa74 100644 --- a/src/src.doxyfile +++ b/src/src.doxyfile @@ -1,23 +1,26 @@ # Doxyfile 1.8.11 -# Author: Florent JAILLET -# Date: 2016-2017 -# Copyright: LIF - UMR 7279 - Aix Marseille Univ. / CNRS +# Université d'Aix Marseille (AMU) - +# Centre National de la Recherche Scientifique (CNRS) - +# Université de Toulon (UT). +# Copyright © 2016-2018 AMU, CNRS, UT # -# This file is part of MinCoverpetri. +# This file is part of MinCoverPetri. # -# MinCoverpetri is free software: you can redistribute it and/or modify +# MinCoverPetri is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# -# MinCoverpetri is distributed in the hope that it will be useful, +# +# MinCoverPetri 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 Public License for more details. # # You should have received a copy of the GNU General Public License -# along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. +# along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Florent JAILLET - Laboratoire d'Informatique et Systèmes - UMR 7020 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. diff --git a/tests/tests.doxyfile b/tests/tests.doxyfile index 4c7648d..7e1b00c 100644 --- a/tests/tests.doxyfile +++ b/tests/tests.doxyfile @@ -1,23 +1,26 @@ # Doxyfile 1.8.11 -# Author: Florent JAILLET -# Date: 2016-2017 -# Copyright: LIF - UMR 7279 - Aix Marseille Univ. / CNRS +# Université d'Aix Marseille (AMU) - +# Centre National de la Recherche Scientifique (CNRS) - +# Université de Toulon (UT). +# Copyright © 2016-2018 AMU, CNRS, UT # -# This file is part of MinCoverpetri. +# This file is part of MinCoverPetri. # -# MinCoverpetri is free software: you can redistribute it and/or modify +# MinCoverPetri is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# -# MinCoverpetri is distributed in the hope that it will be useful, +# +# MinCoverPetri 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 Public License for more details. # # You should have received a copy of the GNU General Public License -# along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. +# along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Florent JAILLET - Laboratoire d'Informatique et Systèmes - UMR 7020 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. diff --git a/tests/tests_main.cpp b/tests/tests_main.cpp index b9d8022..a9171cd 100644 --- a/tests/tests_main.cpp +++ b/tests/tests_main.cpp @@ -2,8 +2,11 @@ * \file tests_main.cpp * \brief Tests for the code in main.hpp and main.cpp * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This files defines the test cases for the code in files main.hpp and @@ -11,20 +14,20 @@ * */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifdef COMPILE_TESTS diff --git a/tests/tests_marking.cpp b/tests/tests_marking.cpp index 6529b8b..4dd9181 100644 --- a/tests/tests_marking.cpp +++ b/tests/tests_marking.cpp @@ -2,8 +2,11 @@ * \file tests_marking.cpp * \brief Tests for the code in marking.hpp and marking.cpp * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This files defines the test cases for the code in files marking.hpp and @@ -11,20 +14,20 @@ * */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifdef COMPILE_TESTS diff --git a/tests/tests_markingscollection.cpp b/tests/tests_markingscollection.cpp index c25af60..da06003 100644 --- a/tests/tests_markingscollection.cpp +++ b/tests/tests_markingscollection.cpp @@ -3,8 +3,11 @@ * \brief Tests for the code in markingscollection.hpp and * markingscollection.cpp * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This files defines the test cases for the code in files @@ -12,20 +15,20 @@ * */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifdef COMPILE_TESTS diff --git a/tests/tests_mincoversetcomputer.cpp b/tests/tests_mincoversetcomputer.cpp index e260282..63ace83 100644 --- a/tests/tests_mincoversetcomputer.cpp +++ b/tests/tests_mincoversetcomputer.cpp @@ -3,8 +3,11 @@ * \brief Tests for the code in mincoversetcomputer.hpp and * mincoversetcomputer.cpp * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This files defines the test cases for the code in files @@ -12,20 +15,20 @@ * */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifdef COMPILE_TESTS diff --git a/tests/tests_node.cpp b/tests/tests_node.cpp index 2b2744a..c68e0e5 100644 --- a/tests/tests_node.cpp +++ b/tests/tests_node.cpp @@ -2,8 +2,11 @@ * \file tests_node.cpp * \brief Tests for the code in node.hpp and node.cpp * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This files defines the test cases for the code in files node.hpp and @@ -11,20 +14,20 @@ * */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifdef COMPILE_TESTS diff --git a/tests/tests_orderedtuples.cpp b/tests/tests_orderedtuples.cpp index c307ffb..c585fdc 100644 --- a/tests/tests_orderedtuples.cpp +++ b/tests/tests_orderedtuples.cpp @@ -2,8 +2,11 @@ * \file tests_orderedtuples.cpp * \brief Tests for the code in orderedtuples.hpp and orderedtuples.cpp * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This files defines the test cases for the code in files orderedtuples.hpp and @@ -11,20 +14,20 @@ * */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifdef COMPILE_TESTS diff --git a/tests/tests_petrinet.cpp b/tests/tests_petrinet.cpp index ee1e259..49052b1 100644 --- a/tests/tests_petrinet.cpp +++ b/tests/tests_petrinet.cpp @@ -2,8 +2,11 @@ * \file tests_petrinet.cpp * \brief Tests for the code in petrinet.hpp and petrinet.cpp * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This files defines the test cases for the code in files petrinet.hpp and @@ -11,20 +14,20 @@ * */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifdef COMPILE_TESTS diff --git a/tests/tests_pnmlreader.cpp b/tests/tests_pnmlreader.cpp index f981dd0..3495da4 100644 --- a/tests/tests_pnmlreader.cpp +++ b/tests/tests_pnmlreader.cpp @@ -2,8 +2,11 @@ * \file tests_pnmlreader.cpp * \brief Tests for the code in pnmlreader.hpp and pnmlreader.cpp * \author Florent JAILLET - * \date 2016-2017 - * \copyright LIF - UMR 7279 - Aix Marseille Univ. / CNRS. + * \date 2016-2018 + * \copyright Université d'Aix Marseille (AMU) - + * Centre National de la Recherche Scientifique (CNRS) - + * Université de Toulon (UT). + * Laboratoire d'Informatique et Systèmes - UMR 7020 * This file is released under the GPLv3+. * * This files defines the test cases for the code in files pnmlreader.hpp and @@ -11,20 +14,20 @@ * */ -/* This file is part of MinCoverpetri. +/* This file is part of MinCoverPetri. * - * MinCoverpetri is free software: you can redistribute it and/or modify + * MinCoverPetri is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * MinCoverpetri is distributed in the hope that it will be useful, + * MinCoverPetri 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 Public License for more details. * * You should have received a copy of the GNU General Public License - * along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. + * along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. */ #ifdef COMPILE_TESTS diff --git a/webpage/generate_webpage.sh b/webpage/generate_webpage.sh index 677157f..6458877 100755 --- a/webpage/generate_webpage.sh +++ b/webpage/generate_webpage.sh @@ -1,23 +1,26 @@ #! /bin/bash -# Author: Florent JAILLET -# Date: 2016-2017 -# Copyright: LIF - UMR 7279 - Aix Marseille Univ. / CNRS +# Université d'Aix Marseille (AMU) - +# Centre National de la Recherche Scientifique (CNRS) - +# Université de Toulon (UT). +# Copyright © 2016-2018 AMU, CNRS, UT # -# This file is part of MinCoverpetri. +# This file is part of MinCoverPetri. # -# MinCoverpetri is free software: you can redistribute it and/or modify +# MinCoverPetri is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# -# MinCoverpetri is distributed in the hope that it will be useful, +# +# MinCoverPetri 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 Public License for more details. # # You should have received a copy of the GNU General Public License -# along with MinCoverpetri. If not, see <http://www.gnu.org/licenses/>. +# along with MinCoverPetri. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Florent JAILLET - Laboratoire d'Informatique et Systèmes - UMR 7020 # This script generates the main webpage for the MinCoverPetri project using @@ -77,11 +80,11 @@ Here are the precompiled executables for MinCoverpetri version $VERSION: ### Source code The source code can be downloaded from the associated -[GitLab project](https://gitlab.lif.univ-mrs.fr/dev/mincoverpetri). +[GitLab project](https://gitlab.lis-lab.fr/dev/mincoverpetri). The build instructions are given in the [developer -documentation](http://dev.pages.lif.univ-mrs.fr/mincoverpetri/doc/src/html). +documentation](http://dev.pages.lis-lab.fr/mincoverpetri/doc/src/html). ### Example data @@ -120,7 +123,7 @@ echo \ ### Developer documentation The developer documentation is available -[here](http://dev.pages.lif.univ-mrs.fr/mincoverpetri/doc/src/html). +[here](http://dev.pages.lis-lab.fr/mincoverpetri/doc/src/html). " >> ${TMP_PREFIX}doc -- GitLab