diff --git a/GPLv2-LICENSE.md b/GPLv2-LICENSE.md deleted file mode 100644 index 28fbecab..00000000 --- a/GPLv2-LICENSE.md +++ /dev/null @@ -1,361 +0,0 @@ -### GNU GENERAL PUBLIC LICENSE - -Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -### Preamble - -The licenses for most software are designed to take away your freedom -to share and change it. By contrast, the GNU General Public License is -intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - -To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - -We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - -Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, -we want its recipients to know that what they have is not the -original, so that any problems introduced by others will not reflect -on the original authors' reputations. - -Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at -all. - -The precise terms and conditions for copying, distribution and -modification follow. - -### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -**0.** This License applies to any program or other work which -contains a notice placed by the copyright holder saying it may be -distributed under the terms of this General Public License. The -"Program", below, refers to any such program or work, and a "work -based on the Program" means either the Program or any derivative work -under copyright law: that is to say, a work containing the Program or -a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is -included without limitation in the term "modification".) Each licensee -is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the Program -(independent of having been made by running the Program). Whether that -is true depends on what the Program does. - -**1.** You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a -fee. - -**2.** You may modify your copy or copies of the Program or any -portion of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - -**a)** You must cause the modified files to carry prominent notices -stating that you changed the files and the date of any change. - - -**b)** You must cause any work that you distribute or publish, that in -whole or in part contains or is derived from the Program or any part -thereof, to be licensed as a whole at no charge to all third parties -under the terms of this License. - - -**c)** If the modified program normally reads commands interactively -when run, you must cause it, when started running for such interactive -use in the most ordinary way, to print or display an announcement -including an appropriate copyright notice and a notice that there is -no warranty (or else, saying that you provide a warranty) and that -users may redistribute the program under these conditions, and telling -the user how to view a copy of this License. (Exception: if the -Program itself is interactive but does not normally print such an -announcement, your work based on the Program is not required to print -an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - -**3.** You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - -**a)** Accompany it with the complete corresponding machine-readable -source code, which must be distributed under the terms of Sections 1 -and 2 above on a medium customarily used for software interchange; or, - - -**b)** Accompany it with a written offer, valid for at least three -years, to give any third party, for a charge no more than your cost of -physically performing source distribution, a complete machine-readable -copy of the corresponding source code, to be distributed under the -terms of Sections 1 and 2 above on a medium customarily used for -software interchange; or, - - -**c)** Accompany it with the information you received as to the offer -to distribute corresponding source code. (This alternative is allowed -only for noncommercial distribution and only if you received the -program in object code or executable form with such an offer, in -accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - -**4.** You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt otherwise -to copy, modify, sublicense or distribute the Program is void, and -will automatically terminate your rights under this License. However, -parties who have received copies, or rights, from you under this -License will not have their licenses terminated so long as such -parties remain in full compliance. - -**5.** You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -**6.** Each time you redistribute the Program (or any work based on -the Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - -**7.** If, as a consequence of a court judgment or allegation of -patent infringement or for any other reason (not limited to patent -issues), conditions are imposed on you (whether by court order, -agreement or otherwise) that contradict the conditions of this -License, they do not excuse you from the conditions of this License. -If you cannot distribute so as to satisfy simultaneously your -obligations under this License and any other pertinent obligations, -then as a consequence you may not distribute the Program at all. For -example, if a patent license would not permit royalty-free -redistribution of the Program by all those who receive copies directly -or indirectly through you, then the only way you could satisfy both it -and this License would be to refrain entirely from distribution of the -Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - -**8.** If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - -**9.** The Free Software Foundation may publish revised and/or new -versions of the General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Program does not specify a -version number of this License, you may choose any version ever -published by the Free Software Foundation. - -**10.** If you wish to incorporate parts of the Program into other -free programs whose distribution conditions are different, write to -the author to ask for permission. For software which is copyrighted by -the Free Software Foundation, write to the Free Software Foundation; -we sometimes make exceptions for this. Our decision will be guided by -the two goals of preserving the free status of all derivatives of our -free software and of promoting the sharing and reuse of software -generally. - -**NO WARRANTY** - -**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - -### END OF TERMS AND CONDITIONS - -### How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these -terms. - -To do so, attach the following notices to the program. It is safest to -attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - one line to give the program's name and an idea of what it does. - Copyright (C) yyyy name of author - - This program 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 2 - of the License, or (at your option) any later version. - - This program 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 this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Also add information on how to contact you by electronic and paper -mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details - type `show w'. This is free software, and you are welcome - to redistribute it under certain conditions; type `show c' - for details. - -The hypothetical commands \`show w' and \`show c' should show the -appropriate parts of the General Public License. Of course, the -commands you use may be called something other than \`show w' and -\`show c'; they could even be mouse-clicks or menu items--whatever -suits your program. - -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the program, -if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright - interest in the program `Gnomovision' - (which makes passes at compilers) written - by James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, -you may consider it more useful to permit linking proprietary -applications with the library. If this is what you want to do, use the -[GNU Lesser General Public -License](https://www.gnu.org/licenses/lgpl.html) instead of this -License. diff --git a/MIT-LICENSE.md b/MIT-LICENSE.md deleted file mode 100644 index aea1d6a7..00000000 --- a/MIT-LICENSE.md +++ /dev/null @@ -1,14 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/MechJeb2/MechJebLib/Control/PIDLoop.cs b/MechJeb2/MechJebLib/Control/PIDLoop.cs index 6e8947de..d5f52f44 100644 --- a/MechJeb2/MechJebLib/Control/PIDLoop.cs +++ b/MechJeb2/MechJebLib/Control/PIDLoop.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/Core/Bisection.cs b/MechJeb2/MechJebLib/Core/Bisection.cs index bc6fc9b2..bee79c59 100644 --- a/MechJeb2/MechJebLib/Core/Bisection.cs +++ b/MechJeb2/MechJebLib/Core/Bisection.cs @@ -1,6 +1,6 @@ /* * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors - * SPDX-License-Identifier: MIT-0 OR LGPL-2.1+ OR CC0-1.0 + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Core/BrentMin.cs b/MechJeb2/MechJebLib/Core/BrentMin.cs index 1f553da9..abe795bd 100644 --- a/MechJeb2/MechJebLib/Core/BrentMin.cs +++ b/MechJeb2/MechJebLib/Core/BrentMin.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/Core/BrentRoot.cs b/MechJeb2/MechJebLib/Core/BrentRoot.cs index 62e8f8ff..ec452ae9 100644 --- a/MechJeb2/MechJebLib/Core/BrentRoot.cs +++ b/MechJeb2/MechJebLib/Core/BrentRoot.cs @@ -1,6 +1,6 @@ /* * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors - * SPDX-License-Identifier: MIT-0 OR LGPL-2.1+ OR CC0-1.0 + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Core/FunctionImpls/RealDeltaVToChangeApoapsisPrograde.cs b/MechJeb2/MechJebLib/Core/FunctionImpls/RealDeltaVToChangeApoapsisPrograde.cs index d98c6f9f..2bcfc064 100644 --- a/MechJeb2/MechJebLib/Core/FunctionImpls/RealDeltaVToChangeApoapsisPrograde.cs +++ b/MechJeb2/MechJebLib/Core/FunctionImpls/RealDeltaVToChangeApoapsisPrograde.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Core/FunctionImpls/RealSingleImpulseHyperbolicBurn.cs b/MechJeb2/MechJebLib/Core/FunctionImpls/RealSingleImpulseHyperbolicBurn.cs index 294c18b8..b7b57c36 100644 --- a/MechJeb2/MechJebLib/Core/FunctionImpls/RealSingleImpulseHyperbolicBurn.cs +++ b/MechJeb2/MechJebLib/Core/FunctionImpls/RealSingleImpulseHyperbolicBurn.cs @@ -1,8 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Copyright Sebastien Gaggini (sebastien.gaggini@gmail.com) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/Core/Functions/Angles.cs b/MechJeb2/MechJebLib/Core/Functions/Angles.cs index d90d2376..46055e81 100644 --- a/MechJeb2/MechJebLib/Core/Functions/Angles.cs +++ b/MechJeb2/MechJebLib/Core/Functions/Angles.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; @@ -10,6 +9,8 @@ using MechJebLib.Utils; using static MechJebLib.Utils.Statics; +#nullable enable + // ReSharper disable InconsistentNaming namespace MechJebLib.Core.Functions { diff --git a/MechJeb2/MechJebLib/Core/Functions/Interpolants.cs b/MechJeb2/MechJebLib/Core/Functions/Interpolants.cs index 6804ed89..6bde2e2e 100644 --- a/MechJeb2/MechJebLib/Core/Functions/Interpolants.cs +++ b/MechJeb2/MechJebLib/Core/Functions/Interpolants.cs @@ -1,9 +1,10 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ +#nullable enable + using System.Collections.Generic; using MechJebLib.Primitives; diff --git a/MechJeb2/MechJebLib/Core/Functions/Maneuvers.cs b/MechJeb2/MechJebLib/Core/Functions/Maneuvers.cs index 50791ed9..e9f38a9e 100644 --- a/MechJeb2/MechJebLib/Core/Functions/Maneuvers.cs +++ b/MechJeb2/MechJebLib/Core/Functions/Maneuvers.cs @@ -1,9 +1,10 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ +#nullable enable + using MechJebLib.Core.TwoBody; using MechJebLib.Primitives; using MechJebLib.Utils; diff --git a/MechJeb2/MechJebLib/Core/Gooding.cs b/MechJeb2/MechJebLib/Core/Gooding.cs index bc5f5142..4ef6f435 100644 --- a/MechJeb2/MechJebLib/Core/Gooding.cs +++ b/MechJeb2/MechJebLib/Core/Gooding.cs @@ -1,8 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Copyright Sebastien Gaggini (sebastien.gaggini@gmail.com) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/Core/Maths.cs b/MechJeb2/MechJebLib/Core/Maths.cs index ca4fdfd3..5d51c7b0 100644 --- a/MechJeb2/MechJebLib/Core/Maths.cs +++ b/MechJeb2/MechJebLib/Core/Maths.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/Core/ODE/AbstractIVP.cs b/MechJeb2/MechJebLib/Core/ODE/AbstractIVP.cs index 82ad8587..f2c27f4e 100644 --- a/MechJeb2/MechJebLib/Core/ODE/AbstractIVP.cs +++ b/MechJeb2/MechJebLib/Core/ODE/AbstractIVP.cs @@ -1,6 +1,6 @@ /* * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors - * SPDX-License-Identifier: MIT-0 OR LGPL-2.1+ OR CC0-1.0 + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/Core/ODE/AbstractRungeKutta.cs b/MechJeb2/MechJebLib/Core/ODE/AbstractRungeKutta.cs index a07d61b1..8a10c0ea 100644 --- a/MechJeb2/MechJebLib/Core/ODE/AbstractRungeKutta.cs +++ b/MechJeb2/MechJebLib/Core/ODE/AbstractRungeKutta.cs @@ -1,6 +1,6 @@ /* * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors - * SPDX-License-Identifier: MIT-0 OR LGPL-2.1+ OR CC0-1.0 + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Core/ODE/BS3.cs b/MechJeb2/MechJebLib/Core/ODE/BS3.cs index 1aa07917..3b268513 100644 --- a/MechJeb2/MechJebLib/Core/ODE/BS3.cs +++ b/MechJeb2/MechJebLib/Core/ODE/BS3.cs @@ -1,6 +1,6 @@ /* * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors - * SPDX-License-Identifier: MIT-0 OR LGPL-2.1+ OR CC0-1.0 + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Core/ODE/DP5.cs b/MechJeb2/MechJebLib/Core/ODE/DP5.cs index 91175c3b..c61105dd 100644 --- a/MechJeb2/MechJebLib/Core/ODE/DP5.cs +++ b/MechJeb2/MechJebLib/Core/ODE/DP5.cs @@ -1,6 +1,6 @@ /* * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors - * SPDX-License-Identifier: MIT-0 OR LGPL-2.1+ OR CC0-1.0 + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Core/ODE/Event.cs b/MechJeb2/MechJebLib/Core/ODE/Event.cs index 5f192032..a4a7551c 100644 --- a/MechJeb2/MechJebLib/Core/ODE/Event.cs +++ b/MechJeb2/MechJebLib/Core/ODE/Event.cs @@ -1,4 +1,9 @@ -#nullable enable +/* + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ + */ + +#nullable enable using System; using System.Collections.Generic; diff --git a/MechJeb2/MechJebLib/Core/TwoBody/Farnocchia.cs b/MechJeb2/MechJebLib/Core/TwoBody/Farnocchia.cs index 2b8e2128..33c17749 100644 --- a/MechJeb2/MechJebLib/Core/TwoBody/Farnocchia.cs +++ b/MechJeb2/MechJebLib/Core/TwoBody/Farnocchia.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Core/TwoBody/Shepperd.cs b/MechJeb2/MechJebLib/Core/TwoBody/Shepperd.cs index f90d2d80..ae598b40 100644 --- a/MechJeb2/MechJebLib/Core/TwoBody/Shepperd.cs +++ b/MechJeb2/MechJebLib/Core/TwoBody/Shepperd.cs @@ -1,6 +1,13 @@ -using System; +/* + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ + */ + +using System; using MechJebLib.Primitives; +#nullable enable + namespace MechJebLib.Core.TwoBody { public static class Shepperd diff --git a/MechJeb2/MechJebLib/Maneuvers/ChangeOrbitalElement.cs b/MechJeb2/MechJebLib/Maneuvers/ChangeOrbitalElement.cs index 2f7188bf..1de5de20 100644 --- a/MechJeb2/MechJebLib/Maneuvers/ChangeOrbitalElement.cs +++ b/MechJeb2/MechJebLib/Maneuvers/ChangeOrbitalElement.cs @@ -1,7 +1,14 @@ +/* + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ + */ + using System; using MechJebLib.Primitives; using static MechJebLib.Utils.Statics; +#nullable enable + namespace MechJebLib.Maneuvers { public static class ChangeOrbitalElement diff --git a/MechJeb2/MechJebLib/Maneuvers/ReturnFromMoon.cs b/MechJeb2/MechJebLib/Maneuvers/ReturnFromMoon.cs index dd7c2ce1..9489b987 100644 --- a/MechJeb2/MechJebLib/Maneuvers/ReturnFromMoon.cs +++ b/MechJeb2/MechJebLib/Maneuvers/ReturnFromMoon.cs @@ -1,9 +1,16 @@ +/* + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ + */ + using System; using JetBrains.Annotations; using MechJebLib.Core.TwoBody; using MechJebLib.Primitives; using MechJebLib.Utils; +#nullable enable + namespace MechJebLib.Maneuvers { public static class ReturnFromMoon diff --git a/MechJeb2/MechJebLib/PVG/ArrayWrapper.cs b/MechJeb2/MechJebLib/PVG/ArrayWrapper.cs index 8a3c7c15..9ee3bd58 100644 --- a/MechJeb2/MechJebLib/PVG/ArrayWrapper.cs +++ b/MechJeb2/MechJebLib/PVG/ArrayWrapper.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable @@ -213,7 +212,7 @@ public void Dispose() public static void Clear(ArrayWrapper obj) { - + } } } diff --git a/MechJeb2/MechJebLib/PVG/Ascent.cs b/MechJeb2/MechJebLib/PVG/Ascent.cs index 761092bb..46b43442 100644 --- a/MechJeb2/MechJebLib/PVG/Ascent.cs +++ b/MechJeb2/MechJebLib/PVG/Ascent.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/PVG/AscentBuilder.cs b/MechJeb2/MechJebLib/PVG/AscentBuilder.cs index 251c3394..36d043b9 100644 --- a/MechJeb2/MechJebLib/PVG/AscentBuilder.cs +++ b/MechJeb2/MechJebLib/PVG/AscentBuilder.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System.Collections.Generic; @@ -18,7 +17,7 @@ public partial class Ascent public class AscentBuilder { public readonly List _phases = new List(); - + public V3 _r0 { get; private set; } public V3 _v0 { get; private set; } public V3 _u0 { get; private set; } @@ -38,49 +37,49 @@ public class AscentBuilder public int _optimizedPhase { get; private set; } public int _optimizedCoastPhase { get; private set; } = -1; public Solution? _solution { get; private set; } - - + + public AscentBuilder AddStageUsingFinalMass(double m0, double mf, double isp, double bt, int kspStage, bool optimizeTime = false, bool unguided = false) { Log($"[MechJebLib.AscentBuilder] AddStageUsingFinalMass({m0}, {mf}, {isp}, {bt}, {kspStage}, {(optimizeTime?"true":"false")}, {(unguided?"true":"false")})"); - + _phases.Add(Phase.NewStageUsingFinalMass(m0, mf, isp, bt, kspStage, optimizeTime, unguided)); if (optimizeTime) _optimizedPhase = _phases.Count - 1; - + return this; } - + public AscentBuilder AddStageUsingThrust(double m0, double thrust, double isp, double bt, int kspStage, bool optimizeTime = false, bool unguided = false) { Log($"[MechJebLib.AscentBuilder] AddStageUsingThrust({m0}, {thrust}, {isp}, {bt}, {kspStage}, {(optimizeTime?"true":"false")}, {(unguided?"true":"false")})"); - + _phases.Add(Phase.NewStageUsingThrust(m0, thrust, isp, bt, kspStage, optimizeTime, unguided)); if (optimizeTime) _optimizedPhase = _phases.Count - 1; - + return this; } - + public AscentBuilder AddFixedCoast(double m0, double ct, int kspStage) { Log($"[MechJebLib.AscentBuilder] AddFixedCoast({m0}, {ct}, {kspStage})"); - + _phases.Add(Phase.NewFixedCoast(m0, ct, kspStage)); - + return this; } - + public AscentBuilder AddOptimizedCoast(double m0, double mint, double maxt, int kspStage) { Log($"[MechJebLib.AscentBuilder] AddOptimizedCoast({m0}, {mint}, {maxt}, {kspStage})"); - + _phases.Add(Phase.NewOptimizedCoast(m0, mint, maxt, kspStage)); _optimizedCoastPhase = _phases.Count - 1; - + return this; } - + public AscentBuilder Initial(V3 r0, V3 v0, V3 u0, double t0, double mu, double rbody) { Check.NonZeroFinite(r0); @@ -88,7 +87,7 @@ public AscentBuilder Initial(V3 r0, V3 v0, V3 u0, double t0, double mu, double r Check.Finite(t0); Check.PositiveFinite(mu); Check.PositiveFinite(rbody); - + Log($"[MechJebLib.AscentBuilder] Initial({r0}, {v0}, {u0}, {t0}, {mu}, {rbody})"); _r0 = r0; _v0 = v0; diff --git a/MechJeb2/MechJebLib/PVG/Integrators/IPVGIntegrator.cs b/MechJeb2/MechJebLib/PVG/Integrators/IPVGIntegrator.cs index 777496e4..56e71c99 100644 --- a/MechJeb2/MechJebLib/PVG/Integrators/IPVGIntegrator.cs +++ b/MechJeb2/MechJebLib/PVG/Integrators/IPVGIntegrator.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using MechJebLib.Primitives; diff --git a/MechJeb2/MechJebLib/PVG/Integrators/VacuumCoastAnalytic.cs b/MechJeb2/MechJebLib/PVG/Integrators/VacuumCoastAnalytic.cs index 0bab8a2d..7b4141b5 100644 --- a/MechJeb2/MechJebLib/PVG/Integrators/VacuumCoastAnalytic.cs +++ b/MechJeb2/MechJebLib/PVG/Integrators/VacuumCoastAnalytic.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/PVG/Integrators/VacuumThrustAnalytic.cs b/MechJeb2/MechJebLib/PVG/Integrators/VacuumThrustAnalytic.cs index c9175616..9338e1b5 100644 --- a/MechJeb2/MechJebLib/PVG/Integrators/VacuumThrustAnalytic.cs +++ b/MechJeb2/MechJebLib/PVG/Integrators/VacuumThrustAnalytic.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable @@ -18,7 +17,7 @@ public class VacuumThrustAnalytic : IPVGIntegrator public void Integrate(Vn yin, Vn yfout, Phase phase, double t0, double tf) { Check.True(phase.Normalized); - + using var y0 = ArrayWrapper.Rent(yin); using var yf = ArrayWrapper.Rent(yfout); @@ -32,7 +31,7 @@ public void Integrate(Vn yin, Vn yfout, Phase phase, double t0, double tf) thrust *= 2; mdot = 0; } - + // precompute some values double omega = 1.0/Math.Sqrt(rm * rm * rm); double dt = tf - t0; @@ -105,7 +104,7 @@ public void Integrate(Vn yin, Vn yfout, Phase phase, double t0, double tf) yf.DV = y0.DV + phase.ve * Math.Log(phase.m0 / (phase.m0 - dt * phase.mdot)); else yf.DV = y0.DV + phase.thrust / phase.m0 * dt; - + yf.Pm = y0.Pm; // FIXME: this is certainly wrong } diff --git a/MechJeb2/MechJebLib/PVG/Optimizer.cs b/MechJeb2/MechJebLib/PVG/Optimizer.cs index 85cf161d..4b2d9fb4 100644 --- a/MechJeb2/MechJebLib/PVG/Optimizer.cs +++ b/MechJeb2/MechJebLib/PVG/Optimizer.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable @@ -25,7 +24,7 @@ public partial class Optimizer : IDisposable public int LmStatus; public int LmIterations; public OptimStatus Status; - + private readonly Problem _problem; private readonly List _phases; private readonly List _initial = new List(); @@ -35,7 +34,7 @@ public partial class Optimizer : IDisposable private readonly alglib.minlmreport _rep = new alglib.minlmreport(); private readonly alglib.ndimensional_fvec _residualHandle; private alglib.minlmstate _state = new alglib.minlmstate(); - + public enum OptimStatus { CREATED, BOOTSTRAPPED, SUCCESS, FAILED } private Optimizer(Problem problem, IEnumerable phases) @@ -179,9 +178,9 @@ internal void ResidualFunction(double[] yin, double[] zout, object? o) { if (_terminating) return; - + _timeoutToken.ThrowIfCancellationRequested(); - + CopyToInitial(yin); Shooting(); // need to backwards integrate the mass costate here @@ -210,13 +209,13 @@ private void AnalyzePhases() if (lastFreeBurnPhase >= 0) _phases[lastFreeBurnPhase].LastFreeBurn = true; } - + private CancellationToken _timeoutToken; private void UnSafeRun() { _terminating = false; - + AnalyzePhases(); ExpandArrays(); @@ -226,24 +225,24 @@ private void UnSafeRun() for (int i = 0; i < yGuess.Length; i++) yGuess[i] = _initial[i / ArrayWrapper.ARRAY_WRAPPER_LEN][i % ArrayWrapper.ARRAY_WRAPPER_LEN]; - + alglib.minlmcreatev(ArrayWrapper.ARRAY_WRAPPER_LEN * _phases.Count, yGuess, LmDiffStep, out _state); alglib.minlmsetcond(_state, LmEpsx, MaxIter); alglib.minlmoptimize(_state, _residualHandle, null, null); alglib.minlmresultsbuf(_state, ref yNew, _rep); - + LmStatus = _rep.terminationtype; LmIterations = _rep.iterationscount; - + if (_rep.terminationtype != 8) ResidualFunction(yNew, z, null); } - + public Optimizer Run() { if (Status != OptimStatus.BOOTSTRAPPED) throw new Exception("run should only be called on BOOTSTRAPPED optimizer"); - + try { var tokenSource = new CancellationTokenSource(); // FIXME: bit of garbage here @@ -253,30 +252,30 @@ public Optimizer Run() } catch (OperationCanceledException) { - + } - + for(int p = 0; p <= lastPhase; p++) { Log(_phases[p].ToString()); } - + Log("solved initial: "); - + for(int p = 0; p <= lastPhase; p++) { Log(DoubleArrayString(_initial[p])); } - + Log("solved terminal: "); - + for(int p = 0; p <= lastPhase; p++) { Log(DoubleArrayString(_terminal[p])); } - + Log("solved residuals: "); - + for(int p = 0; p <= lastPhase; p++) { Log(DoubleArrayString(_residual[p])); @@ -341,7 +340,7 @@ public Solution GetSolution() { if (Status != OptimStatus.SUCCESS) throw new Exception("getting solution from bad/failed optimizer state"); - + var solution = new Solution(_problem); Shooting(solution); @@ -353,9 +352,9 @@ public Optimizer Bootstrap(V3 pv0, V3 pr0) { if (Status != OptimStatus.CREATED) throw new Exception("bootstrap should only be called on CREATED optimizer"); - + ExpandArrays(); - + using var integArray = Vn.Rent(ArrayWrapper.ARRAY_WRAPPER_LEN); using var integ = ArrayWrapper.Rent(integArray); @@ -365,7 +364,7 @@ public Optimizer Bootstrap(V3 pv0, V3 pr0) for (int p = 0; p <= lastPhase; p++) { Phase phase = _phases[p]; - + using var y0 = ArrayWrapper.Rent(_initial[p]); using var yf = ArrayWrapper.Rent(_terminal[p]); @@ -386,70 +385,70 @@ public Optimizer Bootstrap(V3 pv0, V3 pr0) y0.M = phase.m0; _initial[p].CopyTo(integArray); } - + double tf = t0 + y0.Bt; - + integ.DV = lastDv; - + phase.u0 = GetIntertialHeading(p, y0.PV); phase.Integrate(integArray, _terminal[p], t0, tf); lastDv = yf.DV; - + t0 += tf; } - + for(int p = 0; p <= lastPhase; p++) { Log(_phases[p].ToString()); } - + Log("bootstrap1 initial: "); - + for(int p = 0; p <= lastPhase; p++) { Log(DoubleArrayString(_initial[p])); } - + Log("bootstrap1 terminal: "); - + for(int p = 0; p <= lastPhase; p++) { Log(DoubleArrayString(_terminal[p])); } - + Log("bootstrap1 residuals: "); - + for(int p = 0; p <= lastPhase; p++) { Log(DoubleArrayString(_residual[p])); } - Status = OptimStatus.BOOTSTRAPPED; + Status = OptimStatus.BOOTSTRAPPED; return this; } - + public Optimizer Bootstrap(Solution solution) { if (Status != OptimStatus.CREATED) throw new Exception("bootstrap should only be called on CREATED optimizer"); - + ExpandArrays(); - + using var integArray = Vn.Rent(ArrayWrapper.ARRAY_WRAPPER_LEN); using var integ = ArrayWrapper.Rent(integArray); //double tbar = solution.Tbar(_problem.t0); - + double t0 = 0; double lastDv = 0; for (int p = 0; p <= lastPhase; p++) { Phase phase = _phases[p]; - + using var y0 = ArrayWrapper.Rent(_initial[p]); using var yf = ArrayWrapper.Rent(_terminal[p]); @@ -471,49 +470,49 @@ public Optimizer Bootstrap(Solution solution) y0.M = phase.m0; _initial[p].CopyTo(integArray); } - + double tf = t0 + y0.Bt; - + integ.DV = lastDv; phase.u0 = GetIntertialHeading(p, y0.PV); - + phase.Integrate(integArray, _terminal[p], t0, tf); lastDv = yf.DV; t0 += tf; - + } - + CalculateResiduals(); for(int p = 0; p <= lastPhase; p++) { Log(_phases[p].ToString()); } - + Log("bootstrap2 initial: "); - + for(int p = 0; p <= lastPhase; p++) { Log(DoubleArrayString(_initial[p])); } - + Log("bootstrap2 terminal: "); - + for(int p = 0; p <= lastPhase; p++) { Log(DoubleArrayString(_terminal[p])); } - + Log("bootstrap2 residuals: "); - + for(int p = 0; p <= lastPhase; p++) { Log(DoubleArrayString(_residual[p])); } - + Status = OptimStatus.BOOTSTRAPPED; return this; diff --git a/MechJeb2/MechJebLib/PVG/OptimizerBuilder.cs b/MechJeb2/MechJebLib/PVG/OptimizerBuilder.cs index 3c305b7f..6a7a28dc 100644 --- a/MechJeb2/MechJebLib/PVG/OptimizerBuilder.cs +++ b/MechJeb2/MechJebLib/PVG/OptimizerBuilder.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable @@ -26,16 +25,16 @@ public class OptimizerBuilder : IDisposable private double _mu; private double _rbody; private double _hT; - + public Optimizer Build(List phases) { _phases = phases; - + double m0 = _phases[0].m0; var problem = new Problem(_r0, _v0, _u0, m0, _t0, _mu, _rbody); var normalizedPhases = new List(); - + foreach (Phase phase in _phases) { normalizedPhases.Add(phase.Rescale(problem.Scale)); @@ -45,7 +44,7 @@ public Optimizer Build(List phases) throw new Exception("Optimizer.Build() called with no terminal conditions"); problem.Terminal = _terminal.Rescale(problem.Scale); - + var solver = new Optimizer(problem, normalizedPhases); return solver; } diff --git a/MechJeb2/MechJebLib/PVG/Phase.cs b/MechJeb2/MechJebLib/PVG/Phase.cs index 600a6475..b235e9dc 100644 --- a/MechJeb2/MechJebLib/PVG/Phase.cs +++ b/MechJeb2/MechJebLib/PVG/Phase.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; @@ -47,7 +46,7 @@ public Phase DeepCopy() return newphase; } - + private Phase(double m0, double thrust, double isp, double mf, double bt, int kspStage) { this.KSPStage = kspStage; @@ -69,7 +68,7 @@ public Phase Rescale(Scale scale) Check.False(Normalized); var phase = (Phase)this.MemberwiseClone(); - + phase.ve = ve / scale.VelocityScale; phase.tau = tau / scale.TimeScale; phase.mdot = mdot / scale.MdotScale; @@ -101,31 +100,31 @@ public static Phase NewStageUsingFinalMass(double m0, double mf, double isp, dou Check.PositiveFinite(mf); Check.PositiveFinite(isp); Check.PositiveFinite(bt); - + double mdot = (m0 - mf) / bt; double thrust = mdot * (isp * G0); - + Check.PositiveFinite(mdot); Check.PositiveFinite(thrust); - + var phase = new Phase(m0, thrust, isp, mf, bt, kspStage) { OptimizeTime = optimizeTime, Unguided = unguided }; return phase; } - + public static Phase NewStageUsingThrust(double m0, double thrust, double isp, double bt, int kspStage, bool optimizeTime = false, bool unguided = false) { Check.PositiveFinite(m0); Check.PositiveFinite(thrust); Check.PositiveFinite(isp); Check.PositiveFinite(bt); - + double mdot = thrust / (isp * G0); double mf = m0 - mdot * bt; - + Check.PositiveFinite(mdot); Check.PositiveFinite(mf); - + var phase = new Phase(m0, thrust, isp, mf, bt, kspStage) { OptimizeTime = optimizeTime, Unguided = unguided }; return phase; @@ -135,7 +134,7 @@ public static Phase NewFixedCoast(double m0, double ct, int kspStage) { return new Phase(m0, 0, 0, m0, ct, kspStage); } - + public static Phase NewOptimizedCoast(double m0, double mint, double maxt, int kspStage) { var phase = new Phase(m0, 0, 0, m0, mint, kspStage) { OptimizeTime = true, mint = mint, maxt = maxt }; diff --git a/MechJeb2/MechJebLib/PVG/Problem.cs b/MechJeb2/MechJebLib/PVG/Problem.cs index ab635cdc..dbcfb931 100644 --- a/MechJeb2/MechJebLib/PVG/Problem.cs +++ b/MechJeb2/MechJebLib/PVG/Problem.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/PVG/ResidualWrapper.cs b/MechJeb2/MechJebLib/PVG/ResidualWrapper.cs index 08d850d0..257ff84a 100644 --- a/MechJeb2/MechJebLib/PVG/ResidualWrapper.cs +++ b/MechJeb2/MechJebLib/PVG/ResidualWrapper.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable @@ -157,10 +156,10 @@ public void Dispose() { _pool.Release(this); } - + public static void Clear(ResidualWrapper obj) { - + } } } diff --git a/MechJeb2/MechJebLib/PVG/Solution.cs b/MechJeb2/MechJebLib/PVG/Solution.cs index 4f96cf34..7201c283 100644 --- a/MechJeb2/MechJebLib/PVG/Solution.cs +++ b/MechJeb2/MechJebLib/PVG/Solution.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle3Energy.cs b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle3Energy.cs index 493a0733..27058803 100644 --- a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle3Energy.cs +++ b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle3Energy.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Energy.cs b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Energy.cs index 94190ed2..650413f2 100644 --- a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Energy.cs +++ b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Energy.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Propellant.cs b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Propellant.cs index dd5c4760..b444b1c6 100644 --- a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Propellant.cs +++ b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Propellant.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Reduced.cs b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Reduced.cs index 15a00508..8590cc32 100644 --- a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Reduced.cs +++ b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle4Reduced.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle5Reduced.cs b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle5Reduced.cs index f142b3b3..1e64bcbf 100644 --- a/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle5Reduced.cs +++ b/MechJeb2/MechJebLib/PVG/Terminal/FlightPathAngle5Reduced.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/PVG/Terminal/IPVGTerminal.cs b/MechJeb2/MechJebLib/PVG/Terminal/IPVGTerminal.cs index 4fc5f55e..49e43dd6 100644 --- a/MechJeb2/MechJebLib/PVG/Terminal/IPVGTerminal.cs +++ b/MechJeb2/MechJebLib/PVG/Terminal/IPVGTerminal.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/PVG/Terminal/Intercept6Cartesian.cs b/MechJeb2/MechJebLib/PVG/Terminal/Intercept6Cartesian.cs index 48a36191..22a0c862 100644 --- a/MechJeb2/MechJebLib/PVG/Terminal/Intercept6Cartesian.cs +++ b/MechJeb2/MechJebLib/PVG/Terminal/Intercept6Cartesian.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/PVG/Terminal/Kepler3Reduced.cs b/MechJeb2/MechJebLib/PVG/Terminal/Kepler3Reduced.cs index 0af23238..4c796893 100644 --- a/MechJeb2/MechJebLib/PVG/Terminal/Kepler3Reduced.cs +++ b/MechJeb2/MechJebLib/PVG/Terminal/Kepler3Reduced.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/PVG/Terminal/Kepler4Reduced.cs b/MechJeb2/MechJebLib/PVG/Terminal/Kepler4Reduced.cs index 8339f968..9fc17bad 100644 --- a/MechJeb2/MechJebLib/PVG/Terminal/Kepler4Reduced.cs +++ b/MechJeb2/MechJebLib/PVG/Terminal/Kepler4Reduced.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/PVG/Terminal/Kepler5Reduced.cs b/MechJeb2/MechJebLib/PVG/Terminal/Kepler5Reduced.cs index a81bc76a..f1d408f7 100644 --- a/MechJeb2/MechJebLib/PVG/Terminal/Kepler5Reduced.cs +++ b/MechJeb2/MechJebLib/PVG/Terminal/Kepler5Reduced.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/Primitives/H1.cs b/MechJeb2/MechJebLib/Primitives/H1.cs index 718c810f..9963d0fb 100644 --- a/MechJeb2/MechJebLib/Primitives/H1.cs +++ b/MechJeb2/MechJebLib/Primitives/H1.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Primitives/H3.cs b/MechJeb2/MechJebLib/Primitives/H3.cs index 84f20f88..d04d0174 100644 --- a/MechJeb2/MechJebLib/Primitives/H3.cs +++ b/MechJeb2/MechJebLib/Primitives/H3.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Primitives/HBase.cs b/MechJeb2/MechJebLib/Primitives/HBase.cs index e8b0c567..f401883c 100644 --- a/MechJeb2/MechJebLib/Primitives/HBase.cs +++ b/MechJeb2/MechJebLib/Primitives/HBase.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Primitives/Hn.cs b/MechJeb2/MechJebLib/Primitives/Hn.cs index 5d5827ca..68257575 100644 --- a/MechJeb2/MechJebLib/Primitives/Hn.cs +++ b/MechJeb2/MechJebLib/Primitives/Hn.cs @@ -1,6 +1,6 @@ /* * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors - * SPDX-License-Identifier: MIT-0 OR LGPL-2.1+ OR CC0-1.0 + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Primitives/M3.cs b/MechJeb2/MechJebLib/Primitives/M3.cs index a2fc7e53..a37abd56 100644 --- a/MechJeb2/MechJebLib/Primitives/M3.cs +++ b/MechJeb2/MechJebLib/Primitives/M3.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Primitives/Q3.cs b/MechJeb2/MechJebLib/Primitives/Q3.cs index f21f51d8..0e8b1be4 100644 --- a/MechJeb2/MechJebLib/Primitives/Q3.cs +++ b/MechJeb2/MechJebLib/Primitives/Q3.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/Primitives/Scale.cs b/MechJeb2/MechJebLib/Primitives/Scale.cs index d982b32e..081c5de9 100644 --- a/MechJeb2/MechJebLib/Primitives/Scale.cs +++ b/MechJeb2/MechJebLib/Primitives/Scale.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Primitives/V3.cs b/MechJeb2/MechJebLib/Primitives/V3.cs index 68d40df5..200563c0 100644 --- a/MechJeb2/MechJebLib/Primitives/V3.cs +++ b/MechJeb2/MechJebLib/Primitives/V3.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/Primitives/Vn.cs b/MechJeb2/MechJebLib/Primitives/Vn.cs index 077e3d85..818f5acc 100644 --- a/MechJeb2/MechJebLib/Primitives/Vn.cs +++ b/MechJeb2/MechJebLib/Primitives/Vn.cs @@ -1,6 +1,6 @@ /* * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors - * SPDX-License-Identifier: MIT-0 OR LGPL-2.1+ OR CC0-1.0 + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Utils/Check.cs b/MechJeb2/MechJebLib/Utils/Check.cs index 1127aca2..69cb57eb 100644 --- a/MechJeb2/MechJebLib/Utils/Check.cs +++ b/MechJeb2/MechJebLib/Utils/Check.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ using System; diff --git a/MechJeb2/MechJebLib/Utils/Logger.cs b/MechJeb2/MechJebLib/Utils/Logger.cs index 6178e162..1e847041 100644 --- a/MechJeb2/MechJebLib/Utils/Logger.cs +++ b/MechJeb2/MechJebLib/Utils/Logger.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable @@ -18,7 +17,7 @@ namespace MechJebLib.Utils public class Logger { private Logger() { } - + private static Logger _instance { get; } = new Logger(); private Action _logger = o => { }; @@ -32,7 +31,7 @@ public static void Register(Action logger) { _instance._logger = logger; } - + public static void Log(string message) { _instance.LogImpl(message); diff --git a/MechJeb2/MechJebLib/Utils/ObjectPool.cs b/MechJeb2/MechJebLib/Utils/ObjectPool.cs index 7d2b4aed..88d33113 100644 --- a/MechJeb2/MechJebLib/Utils/ObjectPool.cs +++ b/MechJeb2/MechJebLib/Utils/ObjectPool.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/MechJeb2/MechJebLib/Utils/Statics.cs b/MechJeb2/MechJebLib/Utils/Statics.cs index 4637dcaa..14c3424a 100644 --- a/MechJeb2/MechJebLib/Utils/Statics.cs +++ b/MechJeb2/MechJebLib/Utils/Statics.cs @@ -1,7 +1,6 @@ /* - * Copyright Lamont Granquist (lamont@scriptkiddie.org) - * Dual licensed under the MIT (MIT-LICENSE) license - * and GPLv2 (GPLv2-LICENSE) license or any later version. + * Copyright Lamont Granquist, Sebastien Gaggini and the MechJeb contributors + * SPDX-License-Identifier: LicenseRef-PD-hp OR Unlicense OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT OR LGPL-2.1+ */ #nullable enable diff --git a/README.md b/README.md index 9042b05d..bf55eaff 100644 --- a/README.md +++ b/README.md @@ -161,5 +161,6 @@ make install Licensed under the [GNU General Public License, Version 3](LICENSE.md). -Portions Dual-Licensed under the [GNU General Public License, Version2](GPLv2-LICENSE.md) -and [MIT License](MIT-LICENSE.md), where it is documented in the affected source code headers. +Portions (in the "MechJebLib" directory) Dual-Licensed under the [GNU General Public License, Version2](GPLv2-LICENSE.md) +OR [MIT License](MIT-LICENSE.md) OR CCO Public Domain License (at the choice of the user), +where it is documented in the affected source code headers.