diff --git a/base_evaluations_analyseCalc.xml b/base_evaluations_analyseCalc.xml
index 065eabe..fd903b2 100644
--- a/base_evaluations_analyseCalc.xml
+++ b/base_evaluations_analyseCalc.xml
@@ -1,3348 +1 @@
-
Version 3, 29 June 2007
\r\n" + + "\r\n" + + "Copyright © 2007 Free Software Foundation, Inc.\r\n" + + " <https://fsf.org/>
\r\n" + + " Everyone is permitted to copy and distribute verbatim copies\r\n" + + " of this license document, but changing it is not allowed.
\r\n" + + "\r\n" + + "The GNU General Public License is a free, copyleft license for\r\n" + + "software and other kinds of works.
\r\n" + + "\r\n" + + "The licenses for most software and other practical works are designed\r\n" + + "to take away your freedom to share and change the works. By contrast,\r\n" + + "the GNU General Public License is intended to guarantee your freedom to\r\n" + + "share and change all versions of a program--to make sure it remains free\r\n" + + "software for all its users. We, the Free Software Foundation, use the\r\n" + + "GNU General Public License for most of our software; it applies also to\r\n" + + "any other work released this way by its authors. You can apply it to\r\n" + + "your programs, too.
\r\n" + + "\r\n" + + "When we speak of free software, we are referring to freedom, not\r\n" + + "price. Our General Public Licenses are designed to make sure that you\r\n" + + "have the freedom to distribute copies of free software (and charge for\r\n" + + "them if you wish), that you receive source code or can get it if you\r\n" + + "want it, that you can change the software or use pieces of it in new\r\n" + + "free programs, and that you know you can do these things.
\r\n" + + "\r\n" + + "To protect your rights, we need to prevent others from denying you\r\n" + + "these rights or asking you to surrender the rights. Therefore, you have\r\n" + + "certain responsibilities if you distribute copies of the software, or if\r\n" + + "you modify it: responsibilities to respect the freedom of others.
\r\n" + + "\r\n" + + "For example, if you distribute copies of such a program, whether\r\n" + + "gratis or for a fee, you must pass on to the recipients the same\r\n" + + "freedoms that you received. You must make sure that they, too, receive\r\n" + + "or can get the source code. And you must show them these terms so they\r\n" + + "know their rights.
\r\n" + + "\r\n" + + "Developers that use the GNU GPL protect your rights with two steps:\r\n" + + "(1) assert copyright on the software, and (2) offer you this License\r\n" + + "giving you legal permission to copy, distribute and/or modify it.
\r\n" + + "\r\n" + + "For the developers' and authors' protection, the GPL clearly explains\r\n" + + "that there is no warranty for this free software. For both users' and\r\n" + + "authors' sake, the GPL requires that modified versions be marked as\r\n" + + "changed, so that their problems will not be attributed erroneously to\r\n" + + "authors of previous versions.
\r\n" + + "\r\n" + + "Some devices are designed to deny users access to install or run\r\n" + + "modified versions of the software inside them, although the manufacturer\r\n" + + "can do so. This is fundamentally incompatible with the aim of\r\n" + + "protecting users' freedom to change the software. The systematic\r\n" + + "pattern of such abuse occurs in the area of products for individuals to\r\n" + + "use, which is precisely where it is most unacceptable. Therefore, we\r\n" + + "have designed this version of the GPL to prohibit the practice for those\r\n" + + "products. If such problems arise substantially in other domains, we\r\n" + + "stand ready to extend this provision to those domains in future versions\r\n" + + "of the GPL, as needed to protect the freedom of users.
\r\n" + + "\r\n" + + "Finally, every program is threatened constantly by software patents.\r\n" + + "States should not allow patents to restrict development and use of\r\n" + + "software on general-purpose computers, but in those that do, we wish to\r\n" + + "avoid the special danger that patents applied to a free program could\r\n" + + "make it effectively proprietary. To prevent this, the GPL assures that\r\n" + + "patents cannot be used to render the program non-free.
\r\n" + + "\r\n" + + "The precise terms and conditions for copying, distribution and\r\n" + + "modification follow.
\r\n" + + "\r\n" + + "“This License” refers to version 3 of the GNU General Public License.
\r\n" + + "\r\n" + + "“Copyright” also means copyright-like laws that apply to other kinds of\r\n" + + "works, such as semiconductor masks.
\r\n" + + " \r\n" + + "“The Program” refers to any copyrightable work licensed under this\r\n" + + "License. Each licensee is addressed as “you”. “Licensees” and\r\n" + + "“recipients” may be individuals or organizations.
\r\n" + + "\r\n" + + "To “modify” a work means to copy from or adapt all or part of the work\r\n" + + "in a fashion requiring copyright permission, other than the making of an\r\n" + + "exact copy. The resulting work is called a “modified version” of the\r\n" + + "earlier work or a work “based on” the earlier work.
\r\n" + + "\r\n" + + "A “covered work” means either the unmodified Program or a work based\r\n" + + "on the Program.
\r\n" + + "\r\n" + + "To “propagate” a work means to do anything with it that, without\r\n" + + "permission, would make you directly or secondarily liable for\r\n" + + "infringement under applicable copyright law, except executing it on a\r\n" + + "computer or modifying a private copy. Propagation includes copying,\r\n" + + "distribution (with or without modification), making available to the\r\n" + + "public, and in some countries other activities as well.
\r\n" + + "\r\n" + + "To “convey” a work means any kind of propagation that enables other\r\n" + + "parties to make or receive copies. Mere interaction with a user through\r\n" + + "a computer network, with no transfer of a copy, is not conveying.
\r\n" + + "\r\n" + + "An interactive user interface displays “Appropriate Legal Notices”\r\n" + + "to the extent that it includes a convenient and prominently visible\r\n" + + "feature that (1) displays an appropriate copyright notice, and (2)\r\n" + + "tells the user that there is no warranty for the work (except to the\r\n" + + "extent that warranties are provided), that licensees may convey the\r\n" + + "work under this License, and how to view a copy of this License. If\r\n" + + "the interface presents a list of user commands or options, such as a\r\n" + + "menu, a prominent item in the list meets this criterion.
\r\n" + + "\r\n" + + "The “source code” for a work means the preferred form of the work\r\n" + + "for making modifications to it. “Object code” means any non-source\r\n" + + "form of a work.
\r\n" + + "\r\n" + + "A “Standard Interface” means an interface that either is an official\r\n" + + "standard defined by a recognized standards body, or, in the case of\r\n" + + "interfaces specified for a particular programming language, one that\r\n" + + "is widely used among developers working in that language.
\r\n" + + "\r\n" + + "The “System Libraries” of an executable work include anything, other\r\n" + + "than the work as a whole, that (a) is included in the normal form of\r\n" + + "packaging a Major Component, but which is not part of that Major\r\n" + + "Component, and (b) serves only to enable use of the work with that\r\n" + + "Major Component, or to implement a Standard Interface for which an\r\n" + + "implementation is available to the public in source code form. A\r\n" + + "“Major Component”, in this context, means a major essential component\r\n" + + "(kernel, window system, and so on) of the specific operating system\r\n" + + "(if any) on which the executable work runs, or a compiler used to\r\n" + + "produce the work, or an object code interpreter used to run it.
\r\n" + + "\r\n" + + "The “Corresponding Source” for a work in object code form means all\r\n" + + "the source code needed to generate, install, and (for an executable\r\n" + + "work) run the object code and to modify the work, including scripts to\r\n" + + "control those activities. However, it does not include the work's\r\n" + + "System Libraries, or general-purpose tools or generally available free\r\n" + + "programs which are used unmodified in performing those activities but\r\n" + + "which are not part of the work. For example, Corresponding Source\r\n" + + "includes interface definition files associated with source files for\r\n" + + "the work, and the source code for shared libraries and dynamically\r\n" + + "linked subprograms that the work is specifically designed to require,\r\n" + + "such as by intimate data communication or control flow between those\r\n" + + "subprograms and other parts of the work.
\r\n" + + "\r\n" + + "The Corresponding Source need not include anything that users\r\n" + + "can regenerate automatically from other parts of the Corresponding\r\n" + + "Source.
\r\n" + + "\r\n" + + "The Corresponding Source for a work in source code form is that\r\n" + + "same work.
\r\n" + + "\r\n" + + "All rights granted under this License are granted for the term of\r\n" + + "copyright on the Program, and are irrevocable provided the stated\r\n" + + "conditions are met. This License explicitly affirms your unlimited\r\n" + + "permission to run the unmodified Program. The output from running a\r\n" + + "covered work is covered by this License only if the output, given its\r\n" + + "content, constitutes a covered work. This License acknowledges your\r\n" + + "rights of fair use or other equivalent, as provided by copyright law.
\r\n" + + "\r\n" + + "You may make, run and propagate covered works that you do not\r\n" + + "convey, without conditions so long as your license otherwise remains\r\n" + + "in force. You may convey covered works to others for the sole purpose\r\n" + + "of having them make modifications exclusively for you, or provide you\r\n" + + "with facilities for running those works, provided that you comply with\r\n" + + "the terms of this License in conveying all material for which you do\r\n" + + "not control copyright. Those thus making or running the covered works\r\n" + + "for you must do so exclusively on your behalf, under your direction\r\n" + + "and control, on terms that prohibit them from making any copies of\r\n" + + "your copyrighted material outside their relationship with you.
\r\n" + + "\r\n" + + "Conveying under any other circumstances is permitted solely under\r\n" + + "the conditions stated below. Sublicensing is not allowed; section 10\r\n" + + "makes it unnecessary.
\r\n" + + "\r\n" + + "No covered work shall be deemed part of an effective technological\r\n" + + "measure under any applicable law fulfilling obligations under article\r\n" + + "11 of the WIPO copyright treaty adopted on 20 December 1996, or\r\n" + + "similar laws prohibiting or restricting circumvention of such\r\n" + + "measures.
\r\n" + + "\r\n" + + "When you convey a covered work, you waive any legal power to forbid\r\n" + + "circumvention of technological measures to the extent such circumvention\r\n" + + "is effected by exercising rights under this License with respect to\r\n" + + "the covered work, and you disclaim any intention to limit operation or\r\n" + + "modification of the work as a means of enforcing, against the work's\r\n" + + "users, your or third parties' legal rights to forbid circumvention of\r\n" + + "technological measures.
\r\n" + + "\r\n" + + "You may convey verbatim copies of the Program's source code as you\r\n" + + "receive it, in any medium, provided that you conspicuously and\r\n" + + "appropriately publish on each copy an appropriate copyright notice;\r\n" + + "keep intact all notices stating that this License and any\r\n" + + "non-permissive terms added in accord with section 7 apply to the code;\r\n" + + "keep intact all notices of the absence of any warranty; and give all\r\n" + + "recipients a copy of this License along with the Program.
\r\n" + + "\r\n" + + "You may charge any price or no price for each copy that you convey,\r\n" + + "and you may offer support or warranty protection for a fee.
\r\n" + + "\r\n" + + "You may convey a work based on the Program, or the modifications to\r\n" + + "produce it from the Program, in the form of source code under the\r\n" + + "terms of section 4, provided that you also meet all of these conditions:
\r\n" + + "\r\n" + + "A compilation of a covered work with other separate and independent\r\n" + + "works, which are not by their nature extensions of the covered work,\r\n" + + "and which are not combined with it such as to form a larger program,\r\n" + + "in or on a volume of a storage or distribution medium, is called an\r\n" + + "“aggregate” if the compilation and its resulting copyright are not\r\n" + + "used to limit the access or legal rights of the compilation's users\r\n" + + "beyond what the individual works permit. Inclusion of a covered work\r\n" + + "in an aggregate does not cause this License to apply to the other\r\n" + + "parts of the aggregate.
\r\n" + + "\r\n" + + "You may convey a covered work in object code form under the terms\r\n" + + "of sections 4 and 5, provided that you also convey the\r\n" + + "machine-readable Corresponding Source under the terms of this License,\r\n" + + "in one of these ways:
\r\n" + + "\r\n" + + "A separable portion of the object code, whose source code is excluded\r\n" + + "from the Corresponding Source as a System Library, need not be\r\n" + + "included in conveying the object code work.
\r\n" + + "\r\n" + + "A “User Product” is either (1) a “consumer product”, which means any\r\n" + + "tangible personal property which is normally used for personal, family,\r\n" + + "or household purposes, or (2) anything designed or sold for incorporation\r\n" + + "into a dwelling. In determining whether a product is a consumer product,\r\n" + + "doubtful cases shall be resolved in favor of coverage. For a particular\r\n" + + "product received by a particular user, “normally used” refers to a\r\n" + + "typical or common use of that class of product, regardless of the status\r\n" + + "of the particular user or of the way in which the particular user\r\n" + + "actually uses, or expects or is expected to use, the product. A product\r\n" + + "is a consumer product regardless of whether the product has substantial\r\n" + + "commercial, industrial or non-consumer uses, unless such uses represent\r\n" + + "the only significant mode of use of the product.
\r\n" + + "\r\n" + + "“Installation Information” for a User Product means any methods,\r\n" + + "procedures, authorization keys, or other information required to install\r\n" + + "and execute modified versions of a covered work in that User Product from\r\n" + + "a modified version of its Corresponding Source. The information must\r\n" + + "suffice to ensure that the continued functioning of the modified object\r\n" + + "code is in no case prevented or interfered with solely because\r\n" + + "modification has been made.
\r\n" + + "\r\n" + + "If you convey an object code work under this section in, or with, or\r\n" + + "specifically for use in, a User Product, and the conveying occurs as\r\n" + + "part of a transaction in which the right of possession and use of the\r\n" + + "User Product is transferred to the recipient in perpetuity or for a\r\n" + + "fixed term (regardless of how the transaction is characterized), the\r\n" + + "Corresponding Source conveyed under this section must be accompanied\r\n" + + "by the Installation Information. But this requirement does not apply\r\n" + + "if neither you nor any third party retains the ability to install\r\n" + + "modified object code on the User Product (for example, the work has\r\n" + + "been installed in ROM).
\r\n" + + "\r\n" + + "The requirement to provide Installation Information does not include a\r\n" + + "requirement to continue to provide support service, warranty, or updates\r\n" + + "for a work that has been modified or installed by the recipient, or for\r\n" + + "the User Product in which it has been modified or installed. Access to a\r\n" + + "network may be denied when the modification itself materially and\r\n" + + "adversely affects the operation of the network or violates the rules and\r\n" + + "protocols for communication across the network.
\r\n" + + "\r\n" + + "Corresponding Source conveyed, and Installation Information provided,\r\n" + + "in accord with this section must be in a format that is publicly\r\n" + + "documented (and with an implementation available to the public in\r\n" + + "source code form), and must require no special password or key for\r\n" + + "unpacking, reading or copying.
\r\n" + + "\r\n" + + "“Additional permissions” are terms that supplement the terms of this\r\n" + + "License by making exceptions from one or more of its conditions.\r\n" + + "Additional permissions that are applicable to the entire Program shall\r\n" + + "be treated as though they were included in this License, to the extent\r\n" + + "that they are valid under applicable law. If additional permissions\r\n" + + "apply only to part of the Program, that part may be used separately\r\n" + + "under those permissions, but the entire Program remains governed by\r\n" + + "this License without regard to the additional permissions.
\r\n" + + "\r\n" + + "When you convey a copy of a covered work, you may at your option\r\n" + + "remove any additional permissions from that copy, or from any part of\r\n" + + "it. (Additional permissions may be written to require their own\r\n" + + "removal in certain cases when you modify the work.) You may place\r\n" + + "additional permissions on material, added by you to a covered work,\r\n" + + "for which you have or can give appropriate copyright permission.
\r\n" + + "\r\n" + + "Notwithstanding any other provision of this License, for material you\r\n" + + "add to a covered work, you may (if authorized by the copyright holders of\r\n" + + "that material) supplement the terms of this License with terms:
\r\n" + + "\r\n" + + "All other non-permissive additional terms are considered “further\r\n" + + "restrictions” within the meaning of section 10. If the Program as you\r\n" + + "received it, or any part of it, contains a notice stating that it is\r\n" + + "governed by this License along with a term that is a further\r\n" + + "restriction, you may remove that term. If a license document contains\r\n" + + "a further restriction but permits relicensing or conveying under this\r\n" + + "License, you may add to a covered work material governed by the terms\r\n" + + "of that license document, provided that the further restriction does\r\n" + + "not survive such relicensing or conveying.
\r\n" + + "\r\n" + + "If you add terms to a covered work in accord with this section, you\r\n" + + "must place, in the relevant source files, a statement of the\r\n" + + "additional terms that apply to those files, or a notice indicating\r\n" + + "where to find the applicable terms.
\r\n" + + "\r\n" + + "Additional terms, permissive or non-permissive, may be stated in the\r\n" + + "form of a separately written license, or stated as exceptions;\r\n" + + "the above requirements apply either way.
\r\n" + + "\r\n" + + "You may not propagate or modify a covered work except as expressly\r\n" + + "provided under this License. Any attempt otherwise to propagate or\r\n" + + "modify it is void, and will automatically terminate your rights under\r\n" + + "this License (including any patent licenses granted under the third\r\n" + + "paragraph of section 11).
\r\n" + + "\r\n" + + "However, if you cease all violation of this License, then your\r\n" + + "license from a particular copyright holder is reinstated (a)\r\n" + + "provisionally, unless and until the copyright holder explicitly and\r\n" + + "finally terminates your license, and (b) permanently, if the copyright\r\n" + + "holder fails to notify you of the violation by some reasonable means\r\n" + + "prior to 60 days after the cessation.
\r\n" + + "\r\n" + + "Moreover, your license from a particular copyright holder is\r\n" + + "reinstated permanently if the copyright holder notifies you of the\r\n" + + "violation by some reasonable means, this is the first time you have\r\n" + + "received notice of violation of this License (for any work) from that\r\n" + + "copyright holder, and you cure the violation prior to 30 days after\r\n" + + "your receipt of the notice.
\r\n" + + "\r\n" + + "Termination of your rights under this section does not terminate the\r\n" + + "licenses of parties who have received copies or rights from you under\r\n" + + "this License. If your rights have been terminated and not permanently\r\n" + + "reinstated, you do not qualify to receive new licenses for the same\r\n" + + "material under section 10.
\r\n" + + "\r\n" + + "You are not required to accept this License in order to receive or\r\n" + + "run a copy of the Program. Ancillary propagation of a covered work\r\n" + + "occurring solely as a consequence of using peer-to-peer transmission\r\n" + + "to receive a copy likewise does not require acceptance. However,\r\n" + + "nothing other than this License grants you permission to propagate or\r\n" + + "modify any covered work. These actions infringe copyright if you do\r\n" + + "not accept this License. Therefore, by modifying or propagating a\r\n" + + "covered work, you indicate your acceptance of this License to do so.
\r\n" + + "\r\n" + + "Each time you convey a covered work, the recipient automatically\r\n" + + "receives a license from the original licensors, to run, modify and\r\n" + + "propagate that work, subject to this License. You are not responsible\r\n" + + "for enforcing compliance by third parties with this License.
\r\n" + + "\r\n" + + "An “entity transaction” is a transaction transferring control of an\r\n" + + "organization, or substantially all assets of one, or subdividing an\r\n" + + "organization, or merging organizations. If propagation of a covered\r\n" + + "work results from an entity transaction, each party to that\r\n" + + "transaction who receives a copy of the work also receives whatever\r\n" + + "licenses to the work the party's predecessor in interest had or could\r\n" + + "give under the previous paragraph, plus a right to possession of the\r\n" + + "Corresponding Source of the work from the predecessor in interest, if\r\n" + + "the predecessor has it or can get it with reasonable efforts.
\r\n" + + "\r\n" + + "You may not impose any further restrictions on the exercise of the\r\n" + + "rights granted or affirmed under this License. For example, you may\r\n" + + "not impose a license fee, royalty, or other charge for exercise of\r\n" + + "rights granted under this License, and you may not initiate litigation\r\n" + + "(including a cross-claim or counterclaim in a lawsuit) alleging that\r\n" + + "any patent claim is infringed by making, using, selling, offering for\r\n" + + "sale, or importing the Program or any portion of it.
\r\n" + + "\r\n" + + "A “contributor” is a copyright holder who authorizes use under this\r\n" + + "License of the Program or a work on which the Program is based. The\r\n" + + "work thus licensed is called the contributor's “contributor version”.
\r\n" + + "\r\n" + + "A contributor's “essential patent claims” are all patent claims\r\n" + + "owned or controlled by the contributor, whether already acquired or\r\n" + + "hereafter acquired, that would be infringed by some manner, permitted\r\n" + + "by this License, of making, using, or selling its contributor version,\r\n" + + "but do not include claims that would be infringed only as a\r\n" + + "consequence of further modification of the contributor version. For\r\n" + + "purposes of this definition, “control” includes the right to grant\r\n" + + "patent sublicenses in a manner consistent with the requirements of\r\n" + + "this License.
\r\n" + + "\r\n" + + "Each contributor grants you a non-exclusive, worldwide, royalty-free\r\n" + + "patent license under the contributor's essential patent claims, to\r\n" + + "make, use, sell, offer for sale, import and otherwise run, modify and\r\n" + + "propagate the contents of its contributor version.
\r\n" + + "\r\n" + + "In the following three paragraphs, a “patent license” is any express\r\n" + + "agreement or commitment, however denominated, not to enforce a patent\r\n" + + "(such as an express permission to practice a patent or covenant not to\r\n" + + "sue for patent infringement). To “grant” such a patent license to a\r\n" + + "party means to make such an agreement or commitment not to enforce a\r\n" + + "patent against the party.
\r\n" + + "\r\n" + + "If you convey a covered work, knowingly relying on a patent license,\r\n" + + "and the Corresponding Source of the work is not available for anyone\r\n" + + "to copy, free of charge and under the terms of this License, through a\r\n" + + "publicly available network server or other readily accessible means,\r\n" + + "then you must either (1) cause the Corresponding Source to be so\r\n" + + "available, or (2) arrange to deprive yourself of the benefit of the\r\n" + + "patent license for this particular work, or (3) arrange, in a manner\r\n" + + "consistent with the requirements of this License, to extend the patent\r\n" + + "license to downstream recipients. “Knowingly relying” means you have\r\n" + + "actual knowledge that, but for the patent license, your conveying the\r\n" + + "covered work in a country, or your recipient's use of the covered work\r\n" + + "in a country, would infringe one or more identifiable patents in that\r\n" + + "country that you have reason to believe are valid.
\r\n" + + " \r\n" + + "If, pursuant to or in connection with a single transaction or\r\n" + + "arrangement, you convey, or propagate by procuring conveyance of, a\r\n" + + "covered work, and grant a patent license to some of the parties\r\n" + + "receiving the covered work authorizing them to use, propagate, modify\r\n" + + "or convey a specific copy of the covered work, then the patent license\r\n" + + "you grant is automatically extended to all recipients of the covered\r\n" + + "work and works based on it.
\r\n" + + "\r\n" + + "A patent license is “discriminatory” if it does not include within\r\n" + + "the scope of its coverage, prohibits the exercise of, or is\r\n" + + "conditioned on the non-exercise of one or more of the rights that are\r\n" + + "specifically granted under this License. You may not convey a covered\r\n" + + "work if you are a party to an arrangement with a third party that is\r\n" + + "in the business of distributing software, under which you make payment\r\n" + + "to the third party based on the extent of your activity of conveying\r\n" + + "the work, and under which the third party grants, to any of the\r\n" + + "parties who would receive the covered work from you, a discriminatory\r\n" + + "patent license (a) in connection with copies of the covered work\r\n" + + "conveyed by you (or copies made from those copies), or (b) primarily\r\n" + + "for and in connection with specific products or compilations that\r\n" + + "contain the covered work, unless you entered into that arrangement,\r\n" + + "or that patent license was granted, prior to 28 March 2007.
\r\n" + + "\r\n" + + "Nothing in this License shall be construed as excluding or limiting\r\n" + + "any implied license or other defenses to infringement that may\r\n" + + "otherwise be available to you under applicable patent law.
\r\n" + + "\r\n" + + "If conditions are imposed on you (whether by court order, agreement or\r\n" + + "otherwise) that contradict the conditions of this License, they do not\r\n" + + "excuse you from the conditions of this License. If you cannot convey a\r\n" + + "covered work so as to satisfy simultaneously your obligations under this\r\n" + + "License and any other pertinent obligations, then as a consequence you may\r\n" + + "not convey it at all. For example, if you agree to terms that obligate you\r\n" + + "to collect a royalty for further conveying from those to whom you convey\r\n" + + "the Program, the only way you could satisfy both those terms and this\r\n" + + "License would be to refrain entirely from conveying the Program.
\r\n" + + "\r\n" + + "Notwithstanding any other provision of this License, you have\r\n" + + "permission to link or combine any covered work with a work licensed\r\n" + + "under version 3 of the GNU Affero General Public License into a single\r\n" + + "combined work, and to convey the resulting work. The terms of this\r\n" + + "License will continue to apply to the part which is the covered work,\r\n" + + "but the special requirements of the GNU Affero General Public License,\r\n" + + "section 13, concerning interaction through a network will apply to the\r\n" + + "combination as such.
\r\n" + + "\r\n" + + "The Free Software Foundation may publish revised and/or new versions of\r\n" + + "the GNU General Public License from time to time. Such new versions will\r\n" + + "be similar in spirit to the present version, but may differ in detail to\r\n" + + "address new problems or concerns.
\r\n" + + "\r\n" + + "Each version is given a distinguishing version number. If the\r\n" + + "Program specifies that a certain numbered version of the GNU General\r\n" + + "Public License “or any later version” applies to it, you have the\r\n" + + "option of following the terms and conditions either of that numbered\r\n" + + "version or of any later version published by the Free Software\r\n" + + "Foundation. If the Program does not specify a version number of the\r\n" + + "GNU General Public License, you may choose any version ever published\r\n" + + "by the Free Software Foundation.
\r\n" + + "\r\n" + + "If the Program specifies that a proxy can decide which future\r\n" + + "versions of the GNU General Public License can be used, that proxy's\r\n" + + "public statement of acceptance of a version permanently authorizes you\r\n" + + "to choose that version for the Program.
\r\n" + + "\r\n" + + "Later license versions may give you additional or different\r\n" + + "permissions. However, no additional obligations are imposed on any\r\n" + + "author or copyright holder as a result of your choosing to follow a\r\n" + + "later version.
\r\n" + + "\r\n" + + "THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\r\n" + + "APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\r\n" + + "HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY\r\n" + + "OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\r\n" + + "THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n" + + "PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\r\n" + + "IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\r\n" + + "ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
\r\n" + + "\r\n" + + "IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\r\n" + + "WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\r\n" + + "THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\r\n" + + "GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\r\n" + + "USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\r\n" + + "DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\r\n" + + "PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\r\n" + + "EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\r\n" + + "SUCH DAMAGES.
\r\n" + + "\r\n" + + "If the disclaimer of warranty and limitation of liability provided\r\n" + + "above cannot be given local legal effect according to their terms,\r\n" + + "reviewing courts shall apply local law that most closely approximates\r\n" + + "an absolute waiver of all civil liability in connection with the\r\n" + + "Program, unless a warranty or assumption of liability accompanies a\r\n" + + "copy of the Program in return for a fee.
\r\n" + + "\r\n" + + "END OF TERMS AND CONDITIONS
\r\n" + + "\r\n" + + "If you develop a new program, and you want it to be of the greatest\r\n" + + "possible use to the public, the best way to achieve this is to make it\r\n" + + "free software which everyone can redistribute and change under these terms.
\r\n" + + "\r\n" + + "To do so, attach the following notices to the program. It is safest\r\n" + + "to attach them to the start of each source file to most effectively\r\n" + + "state the exclusion of warranty; and each file should have at least\r\n" + + "the “copyright” line and a pointer to where the full notice is found.
\r\n" + + "\r\n" + + "<one line to give the program's name and a brief idea of what it does.>\r\n" + + " Copyright (C) <year> <name of author>\r\n" + + "\r\n" + + " This program is free software: you can redistribute it and/or modify\r\n" + + " it under the terms of the GNU General Public License as published by\r\n" + + " the Free Software Foundation, either version 3 of the License, or\r\n" + + " (at your option) any later version.\r\n" + + "\r\n" + + " This program is distributed in the hope that it will be useful,\r\n" + + " but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n" + + " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r\n" + + " GNU General Public License for more details.\r\n" + + "\r\n" + + " You should have received a copy of the GNU General Public License\r\n" + + " along with this program. If not, see <https://www.gnu.org/licenses/>.\r\n" + + "\r\n" + + "\r\n" + + "
Also add information on how to contact you by electronic and paper mail.
\r\n" + + "\r\n" + + "If the program does terminal interaction, make it output a short\r\n" + + "notice like this when it starts in an interactive mode:
\r\n" + + "\r\n" + + "<program> Copyright (C) <year> <name of author>\r\n" + + " This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\r\n" + + " This is free software, and you are welcome to redistribute it\r\n" + + " under certain conditions; type `show c' for details.\r\n" + + "\r\n" + + "\r\n" + + "
The hypothetical commands `show w' and `show c' should show the appropriate\r\n" + + "parts of the General Public License. Of course, your program's commands\r\n" + + "might be different; for a GUI interface, you would use an “about box”.
\r\n" + + "\r\n" + + "You should also get your employer (if you work as a programmer) or school,\r\n" + + "if any, to sign a “copyright disclaimer” for the program, if necessary.\r\n" + + "For more information on this, and how to apply and follow the GNU GPL, see\r\n" + + "<https://www.gnu.org/licenses/>.
\r\n" + + "\r\n" + + "The GNU General Public License does not permit incorporating your program\r\n" + + "into proprietary programs. If your program is a subroutine library, you\r\n" + + "may consider it more useful to permit linking proprietary applications with\r\n" + + "the library. If this is what you want to do, use the GNU Lesser General\r\n" + + "Public License instead of this License. But first, please read\r\n" + + "<https://www.gnu.org/licenses/why-not-lgpl.html>.
\r\n" + + ""; + + } + + +} diff --git a/src/calc/commandes.java b/src/calc/commandes.java index 45c1330..5e75b41 100644 --- a/src/calc/commandes.java +++ b/src/calc/commandes.java @@ -26,11 +26,11 @@ public class commandes { //************************* //** version ** //************************* - public static String version ="V2.0.1"; // La version actuelle + public static String version ="V3.0.0"; // La version actuelle public static Boolean newVersion = false; public static String nameNewVersion = ""; public static String branch = "Origin"; - public static String Annee ="2022"; + public static String Annee ="2024"; public static String versionEvaluation = ""; diff --git a/src/fenetres/about.java b/src/fenetres/about.java index 348999e..4ae4d61 100644 --- a/src/fenetres/about.java +++ b/src/fenetres/about.java @@ -1,16 +1,21 @@ package fenetres; +import java.awt.BorderLayout; import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.ImageIcon; import javax.swing.JButton; +import javax.swing.JEditorPane; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.JScrollPane; import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import calc.HTML_licence; import calc.commandes; public final class about extends JFrame { @@ -37,7 +42,7 @@ public final class about extends JFrame { setResizable(false); setTitle(commandes.Titre); setLocation(100, 100); - setSize(518,415); + setSize(530,415); int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth(); int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight(); setLocation(( (screenWidth) - getWidth()) / 2, (screenHeight - getHeight()) / 2); @@ -53,49 +58,51 @@ public final class about extends JFrame { lblNewLabelTitre.setIcon(new ImageIcon(about.class.getResource("/resources/accueilanalysecalc.png"))); lblNewLabelTitre.setHorizontalAlignment(SwingConstants.LEFT); lblNewLabelTitre.setFont(new Font("Pacifico", Font.PLAIN, 26)); - lblNewLabelTitre.setBounds(10, 10, 429, 90); + lblNewLabelTitre.setBounds(0, 0, 514, 126); contentPane.add(lblNewLabelTitre); JLabel lblNewLabelVersion = new JLabel("Version : " + commandes.version + " "+ commandes.branch + ""); lblNewLabelVersion.setFont(new Font("Tahoma", Font.PLAIN, 16)); - lblNewLabelVersion.setBounds(20, 100, 240, 20); + lblNewLabelVersion.setBounds(20, 145, 240, 20); contentPane.add(lblNewLabelVersion); JLabel lblNewLabelAnnee = new JLabel("Année : " + commandes.Annee + ""); lblNewLabelAnnee.setFont(new Font("Tahoma", Font.PLAIN, 16)); - lblNewLabelAnnee.setBounds(20, 120, 240, 20); + lblNewLabelAnnee.setBounds(20, 163, 240, 20); contentPane.add(lblNewLabelAnnee); - JLabel lblCredit = new JLabel("Crédit"); + JLabel lblCredit = new JLabel("Crédit"); lblCredit.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 14)); - lblCredit.setBounds(20, 268, 60, 20); + lblCredit.setBounds(20, 256, 112, 20); getContentPane().add(lblCredit); - JLabel lblNewLabelAuteur = new JLabel("Auteur : P. Rodriguez"); + JLabel lblNewLabelAuteur = new JLabel("Pablo Rodriguez
Enseignant d'informatique - TICE
Université d'Artois
Vérifier la version
Accès à la documentation
Les versions
du logiciel
Nouvelle version
"+commandes.nameNewVersion +"