Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use licence MPL 2.0 instead of GPL3_WITH_RTE-Exceptions #1812

Merged
merged 23 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
881 changes: 159 additions & 722 deletions COPYING.txt

Large diffs are not rendered by default.

35 changes: 18 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
# Antares Simulator
[![Status][ubuntu_precompiled_svg]][ubuntu_precompiled_link] [![Status][windows_precompiled_svg]][windows_precompiled_link] [![Status][centos_precompiled_svg]][centos_precompiled_link] [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=AntaresSimulatorTeam_Antares_Simulator&metric=alert_status)](https://sonarcloud.io/dashboard?id=AntaresSimulatorTeam_Antares_Simulator)

[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

[![License: MPL v2](https://img.shields.io/badge/License-MPLv2-blue.svg)](https://www.mozilla.org/en-US/MPL/2.0/)


Antares Simulator is an open source power system simulator meant to be
used by anybody placing value in quantifying the adequacy or the
economic performance of interconnected power systems, at short or
remote time horizons:
used by anybody placing value in quantifying the adequacy or the
economic performance of interconnected power systems, at short or
remote time horizons:

Transmission system Operators, Power Producers, Regulators, Academics,
Consultants, NGO and all others actors concerned by energy policy issues
are welcome to use the software.

The Antares Simulator project was initiated by RTE (French Electricity
The Antares Simulator project was initiated by RTE (French Electricity
Transmission system Operator) in 2007. It was developed from the start
as a cross-platform application (Windows, GNU/Linux ,Unix).
as a cross-platform application (Windows, GNU/Linux ,Unix).

Until 2018 it was distributed under the terms of a proprietary license.

In May 2018 RTE decided to release the project under the GPLv3 license.

In January 2024, RTE, as the exclusive Copyright owner decided, to switch from GPL V3 to MPL V2 License since the 9.0 major version of Antares-Simulator

The GUI is deprecated in favor of [Antares Web](https://github.com/AntaresSimulatorTeam/AntaREST).

[linux_system_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Linux%20CI%20(system%20libs)/badge.svg
Expand Down Expand Up @@ -49,33 +50,33 @@ The GUI is deprecated in favor of [Antares Web](https://github.com/AntaresSimula

This software suite has been tested under:

* Ubuntu 20.04 [![Status][ubuntu_precompiled_svg]][ubuntu_precompiled_link]
* Ubuntu 20.04 [![Status][ubuntu_precompiled_svg]][ubuntu_precompiled_link]
* Microsoft Windows with Visual Studio 2019 (64-bit) [![Status][windows_precompiled_svg]][windows_precompiled_link]
* Centos7 [![Status][centos_precompiled_svg]][centos_precompiled_link]
* Centos7 [![Status][centos_precompiled_svg]][centos_precompiled_link]

Antares Simulator is built using CMake.
For installation instructions, please visit [INSTALL.md](INSTALL.md)

# Source Code Content

* [AUTHORS](AUTHORS.txt) - Antares Simulator authors
* [CERTIFICATE](CERTIFICATE.txt) - A standard DCO that has to be signed by every contributor
* [CERTIFICATE](CERTIFICATE.txt) - A standard DCO that has to be signed by every contributor
* [CONTRIBUTING](CONTRIBUTING.txt) - How to submit patches and discuss about code evolutions
* [COPYING](COPYING.txt) - The GPL v3 license.
* [COPYING](COPYING.txt) - The MPL v2 license.
* [INSTALL](INSTALL.md) - Installation and building instructions.
* [NEWS](NEWS.md) - Important modifications between the releases.
* [README](README.md) - This file.
* [ROADMAP](ROADMAP.txt) - Main orientations for further developements
* [ROADMAP](ROADMAP.txt) - Main orientations for further developements
* [THANKS](THANKS.txt) - Attribution notices for external libraries and contributors.
* [resources/](resources) - Free sample data sets.
* [resources/](resources) - Free sample data sets.
* [src/analyzer/](src/analyzer) - source code for the statistical analysis of historical time-series.
* [src/cmake/](src/cmake) - files for initializing a solution ready for compilation.
* [src/distrib/](src/distrib) - system redistributable libraries Win(x64,x86),unix.
* [src/cmake/](src/cmake) - files for initializing a solution ready for compilation.
* [src/distrib/](src/distrib) - system redistributable libraries Win(x64,x86),unix.
* [src/ext/](src/ext) - third party libraries used by Antares_Simulator: libYuni, Sirius_Solver.
* [src/libs/](src/libs) - miscellaneous Antares_Simulator libraries.
* [src/solver/](src/solver) - simulation and optimization part.
* [src/tools/](src/tools) - miscellaneous tools for dataset management.
* [src/ui/](src/ui) - Graphic user interface.
* [src/tools/](src/tools) - miscellaneous tools for dataset management.
* [src/ui/](src/ui) - Graphic user interface.


[ubuntu_precompiled_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Ubuntu%20CI%20(pre-compiled)/badge.svg
Expand Down
3 changes: 2 additions & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Status][ubuntu_precompiled_svg]][ubuntu_precompiled_link] [![Status][windows_precompiled_svg]][windows_precompiled_link] [![Status][centos_precompiled_svg]][centos_precompiled_link] [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=AntaresSimulatorTeam_Antares_Simulator&metric=alert_status)](https://sonarcloud.io/dashboard?id=AntaresSimulatorTeam_Antares_Simulator)

[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
[![License: MPL v2](https://img.shields.io/badge/License-MPLv2-blue.svg)](https://www.mozilla.org/en-US/MPL/2.0/)

![C++](https://img.shields.io/badge/c++-%2300599C.svg?style=for-the-badge&logo=c%2B%2B&logoColor=white)

Expand All @@ -24,6 +24,7 @@ Until 2018 it was distributed under the terms of a proprietary license.

In May 2018 RTE decided to release the project under the GPLv3 license.

In January 2024, RTE, as the exclusive Copyright owner decided, to switch from GPL V3 to MPL V2 License since the 9.0 major version of Antares-Simulator
# Links:

- Antares web site : https://antares-simulator.org
Expand Down
2 changes: 1 addition & 1 deletion docs/reference-guide/11-modeling.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The purpose of this document is to give every user of the **Antares\_Simulator**

The aim of the information presented hereafter is to provide a transparent access to the inner workings of the software from a **formal** standpoint. Note that, aside from this conceptual transparency, the software itself offers an option that makes it possible for the user to print, in a standardized format, any or all of the optimization problems actually solved in the course of an **Antares\_Simulator** session

Used together with the elements developed in the next pages, this **practical** access to the internal model implemented the tool allows fair and open benchmarking with comparable software. Besides, another important issue regarding transparency is addressed by the release of **Antares\_Simulator** as an Open Source Gnu GPL 3.0 application.
Used together with the elements developed in the next pages, this **practical** access to the internal model implemented the tool allows fair and open benchmarking with comparable software. Besides, another important issue regarding transparency is addressed by the release of **Antares\_Simulator** as an Open Source Gnu GPL 3.0 application, now changed to MPL-2.0.

So as to delimit the scope of the present document with as much clarity as possible, it is important to notice that a typical **Antares\_Simulator** session involves different steps that are usually run in sequence, either automatically or with some degree of man-in-the-loop control, depending on the kind of study to perform.

Expand Down
30 changes: 16 additions & 14 deletions docs/reference-guide/12-attribution_notices.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,38 @@

**Antares\_Simulator**

**Copyright 2007-2022 RTE - Authors: The Antares\_Simulator Team**
**Copyright 2007-2024, RTE (https://www.rte-france.com) - Authors: The Antares\_Simulator Team**

Antares\_Simulator 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.
This file is part of Antares-Simulator, Adequacy and Performance assessment for interconnected energy networks.

Antares\_Simulator is free software: you can redistribute it and/or modify it under the terms of the Mozilla Public Licence 2.0 as published by the Mozilla Foundation, either version 2 of the License, or (at your option) any later version.

There are special exceptions to the terms and conditions of the license as they are applied to this software. View the full text of the exceptions in file COPYING.txt in the directory of a distribution of the software in source form.

Antares\_Simulator 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.
Antares\_Simulator 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 Mozilla Public Licence 2.0 for more details.

You should have received a copy of the GNU General Public License along with Antares\_Simulator. If not, see <[https://www.gnu.org/licenses/](https://www.gnu.org/licenses/) >.
You should have received a copy of the Mozilla Public Licence 2.0 along with Antares\_Simulator. If not, see <[https://opensource.org/license/mpl-2-0/](https://opensource.org/license/mpl-2-0/) >.

**Antares\_Simulator 8.3 uses external libraries and makes extensive use of the following persons' or companies code. Source and binary forms of these programs are distributed along with Antares\_Simulator with NO WARRANTY:**

- Wxwidgets 3.1.3 Copyright (c) 1998-2017 The wxWidget Team
[https://github.com/wxWidgets/wxWidgets.git](https://github.com/wxWidgets/wxWidgets.git)
- Wxwidgets 3.1.3 Copyright (c) 1998-2017 The wxWidget Team
[https://github.com/wxWidgets/wxWidgets.git](https://github.com/wxWidgets/wxWidgets.git)
license: wxWindows Library License,V3.1 [https://spdx.org/licenses/wxWindows.html](https://spdx.org/licenses/wxWindows.html)

- libYuni 1.1.0 [https://github.com/libyuni](https://github.com/libyuni)
- libYuni 1.1.0 [https://github.com/libyuni](https://github.com/libyuni)
license: Mozilla Public License 2.0 [https://spdx.org/licenses/MPL-2.0.html](https://spdx.org/licenses/MPL-2.0.html)

- Mersenne Twister Copyright (c) 1997-2002 M.Matsumoto and T.Nishimura
- Mersenne Twister Copyright (c) 1997-2002 M.Matsumoto and T.Nishimura
license: 3-clause BSD [https://spdx.org/licenses/BSD-3-Clause.html](https://spdx.org/licenses/BSD-3-Clause.html)

- strtod library Copyright (c) 1988-1993 The Regents of the University of California
Copyright (c) 1994 Sun Microsystems, Inc
- strtod library Copyright (c) 1988-1993 The Regents of the University of California
Copyright (c) 1994 Sun Microsystems, Inc
license: ISC license [https://spdx.org/licenses/ISC.html](https://spdx.org/licenses/ISC.html)

- Sirius\_Solver Copyright (c) 2007-2018 RTE
[https://github.com/rte-france/sirius-solver.git](https://github.com/rte-france/sirius-solver.git)
- Sirius\_Solver Copyright (c) 2007-2018 RTE
[https://github.com/rte-france/sirius-solver.git](https://github.com/rte-france/sirius-solver.git)
license: Apache 2.0 [https://spdx.org/licenses/Apache-2.0.html](https://spdx.org/licenses/Apache-2.0.html)

- OR-Tools Copyright (c) 2010-2020 Google LLC
[https://github.com/rte-france/or-tools.git](https://github.com/rte-france/or-tools.git)
- OR-Tools Copyright (c) 2010-2020 Google LLC
[https://github.com/rte-france/or-tools.git](https://github.com/rte-france/or-tools.git)
license: Apache 2.0 [https://spdx.org/licenses/Apache-2.0.html](https://spdx.org/licenses/Apache-2.0.html)
26 changes: 10 additions & 16 deletions src/analyzer/atsp/atsp.cpp
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
/*
** Copyright 2007-2023 RTE
** Authors: Antares_Simulator Team
**
** This file is part of Antares_Simulator.
** Copyright 2007-2024, RTE (https://www.rte-france.com)
** See AUTHORS.txt
** SPDX-License-Identifier: MPL-2.0
** This file is part of Antares-Simulator,
** Adequacy and Performance assessment for interconnected energy networks.
**
** Antares_Simulator 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
** it under the terms of the Mozilla Public Licence 2.0 as published by
** the Mozilla Foundation, either version 2 of the License, or
** (at your option) any later version.
**
** There are special exceptions to the terms and conditions of the
** license as they are applied to this software. View the full text of
** the exceptions in file COPYING.txt in the directory of this software
** distribution
**
** Antares_Simulator 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 Antares_Simulator. If not, see <http://www.gnu.org/licenses/>.
** Mozilla Public Licence 2.0 for more details.
**
** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
** You should have received a copy of the Mozilla Public Licence 2.0
** along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
*/

#include "atsp.h"
Expand Down
26 changes: 10 additions & 16 deletions src/analyzer/atsp/atsp.h
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
/*
** Copyright 2007-2023 RTE
** Authors: Antares_Simulator Team
**
** This file is part of Antares_Simulator.
** Copyright 2007-2024, RTE (https://www.rte-france.com)
** See AUTHORS.txt
** SPDX-License-Identifier: MPL-2.0
** This file is part of Antares-Simulator,
** Adequacy and Performance assessment for interconnected energy networks.
**
** Antares_Simulator 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
** it under the terms of the Mozilla Public Licence 2.0 as published by
** the Mozilla Foundation, either version 2 of the License, or
** (at your option) any later version.
**
** There are special exceptions to the terms and conditions of the
** license as they are applied to this software. View the full text of
** the exceptions in file COPYING.txt in the directory of this software
** distribution
**
** Antares_Simulator 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 Antares_Simulator. If not, see <http://www.gnu.org/licenses/>.
** Mozilla Public Licence 2.0 for more details.
**
** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
** You should have received a copy of the Mozilla Public Licence 2.0
** along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
*/
#ifndef __PREPROCESSOR_ATSP_H__
#define __PREPROCESSOR_ATSP_H__
Expand Down
26 changes: 10 additions & 16 deletions src/analyzer/atsp/atsp.hxx
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
/*
** Copyright 2007-2023 RTE
** Authors: Antares_Simulator Team
**
** This file is part of Antares_Simulator.
** Copyright 2007-2024, RTE (https://www.rte-france.com)
** See AUTHORS.txt
** SPDX-License-Identifier: MPL-2.0
** This file is part of Antares-Simulator,
** Adequacy and Performance assessment for interconnected energy networks.
**
** Antares_Simulator 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
** it under the terms of the Mozilla Public Licence 2.0 as published by
** the Mozilla Foundation, either version 2 of the License, or
** (at your option) any later version.
**
** There are special exceptions to the terms and conditions of the
** license as they are applied to this software. View the full text of
** the exceptions in file COPYING.txt in the directory of this software
** distribution
**
** Antares_Simulator 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 Antares_Simulator. If not, see <http://www.gnu.org/licenses/>.
** Mozilla Public Licence 2.0 for more details.
**
** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
** You should have received a copy of the Mozilla Public Licence 2.0
** along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
*/
#ifndef __PREPROCESSOR_ATSP_HXX__
#define __PREPROCESSOR_ATSP_HXX__
Expand Down
26 changes: 10 additions & 16 deletions src/analyzer/atsp/cache.cpp
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
/*
** Copyright 2007-2023 RTE
** Authors: Antares_Simulator Team
**
** This file is part of Antares_Simulator.
** Copyright 2007-2024, RTE (https://www.rte-france.com)
** See AUTHORS.txt
** SPDX-License-Identifier: MPL-2.0
** This file is part of Antares-Simulator,
** Adequacy and Performance assessment for interconnected energy networks.
**
** Antares_Simulator 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
** it under the terms of the Mozilla Public Licence 2.0 as published by
** the Mozilla Foundation, either version 2 of the License, or
** (at your option) any later version.
**
** There are special exceptions to the terms and conditions of the
** license as they are applied to this software. View the full text of
** the exceptions in file COPYING.txt in the directory of this software
** distribution
**
** Antares_Simulator 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 Antares_Simulator. If not, see <http://www.gnu.org/licenses/>.
** Mozilla Public Licence 2.0 for more details.
**
** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
** You should have received a copy of the Mozilla Public Licence 2.0
** along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
*/

#include "atsp.h"
Expand Down
Loading
Loading