Author: echatellier Date: 2012-11-07 12:33:53 +0100 (Wed, 07 Nov 2012) New Revision: 101 Url: http://forge.codelutin.com/repositories/revision/isis-fish-docs/101 Log: Update license Fix rst error with jrst 2 Added: trunk/src/site/resources/js/ trunk/src/site/resources/js/maven-isisfish.js Modified: trunk/LICENSE.txt trunk/pom.xml trunk/src/site/en/resources/css/site.css trunk/src/site/en/rst/contact.rst trunk/src/site/en/rst/download.rst trunk/src/site/en/rst/index.rst trunk/src/site/en/rst/license.rst trunk/src/site/en/rst/listStats.rst trunk/src/site/en/rst/publications.rst trunk/src/site/en/rst/research.rst trunk/src/site/resources/css/site.css trunk/src/site/resources/v4/downloads/EffortReduction.java trunk/src/site/resources/v4/downloads/Effort_2000_2004_MultiSp.java trunk/src/site/resources/v4/downloads/Exemple_PlanSimulation.java trunk/src/site/resources/v4/downloads/MigrationAdultsAvrilHistoric.java trunk/src/site/resources/v4/downloads/MigrationAout.java trunk/src/site/resources/v4/downloads/MzonesAnneeMpertMgdg.java trunk/src/site/resources/v4/downloads/Repro_recru0-2_StockOeufs_Spatialisee061107.java trunk/src/site/resources/v4/downloads/TACfix_Es_Anchois.java trunk/src/site/resources/v4/downloads/VBGFAnchois.java trunk/src/site/resources/v4/downloads/Weight_month.java trunk/src/site/resources/v4/downloads/calibration.java trunk/src/site/resources/v4/downloads/prixAnchois.java trunk/src/site/rst/contact.rst trunk/src/site/rst/download.rst trunk/src/site/rst/history.rst trunk/src/site/rst/history/changelog.rst trunk/src/site/rst/history/history.rst trunk/src/site/rst/index.rst trunk/src/site/rst/license.rst trunk/src/site/rst/listStats.rst trunk/src/site/rst/news.rst trunk/src/site/rst/othertools.rst trunk/src/site/rst/presentation.rst trunk/src/site/rst/publications.rst trunk/src/site/rst/research.rst trunk/src/site/rst/tools/eclipse.rst trunk/src/site/rst/tools/netbeans.rst trunk/src/site/rst/v1/changelog.rst trunk/src/site/rst/v2/changelog.rst trunk/src/site/rst/v2/devel/index.rst trunk/src/site/rst/v2/index.rst trunk/src/site/rst/v2/user/ECMAScript.rst trunk/src/site/rst/v2/user/ECMAScriptEdit.rst trunk/src/site/rst/v2/user/FAQ.rst trunk/src/site/rst/v2/user/Rules.rst trunk/src/site/rst/v2/user/ScriptHilaire.rst trunk/src/site/rst/v2/user/SimulationLauncher.rst trunk/src/site/rst/v2/user/index.rst trunk/src/site/rst/v3/changeVersion.rst trunk/src/site/rst/v3/changelog.rst trunk/src/site/rst/v3/devel/SyntaxeOption.rst trunk/src/site/rst/v3/devel/index.rst trunk/src/site/rst/v3/devel/isis-architecture.rst trunk/src/site/rst/v3/devel/usbkey.rst trunk/src/site/rst/v3/index.rst trunk/src/site/rst/v3/user/AnalysePlan.rst trunk/src/site/rst/v3/user/ExternalScriptEditor.rst trunk/src/site/rst/v3/user/FAQ.rst trunk/src/site/rst/v3/user/Historique.rst trunk/src/site/rst/v3/user/Installation.rst trunk/src/site/rst/v3/user/Introduction.rst trunk/src/site/rst/v3/user/LaunchOption.rst trunk/src/site/rst/v3/user/UserInterface.rst trunk/src/site/rst/v3/user/addSshKey.rst trunk/src/site/rst/v3/user/index.rst trunk/src/site/rst/v3/user/inputs.rst trunk/src/site/rst/v3/user/isisFishData.rst trunk/src/site/rst/v3/user/result.rst trunk/src/site/rst/v3/user/scripts.rst trunk/src/site/rst/v3/user/simulations.rst trunk/src/site/rst/v4/devel/architecture.rst trunk/src/site/rst/v4/devel/architectureMexico.rst trunk/src/site/rst/v4/devel/architectureResult.rst trunk/src/site/rst/v4/devel/index.rst trunk/src/site/rst/v4/index.rst trunk/src/site/rst/v4/user/API.rst trunk/src/site/rst/v4/user/FAQ.rst trunk/src/site/rst/v4/user/caparmor.rst trunk/src/site/rst/v4/user/changements40.rst trunk/src/site/rst/v4/user/installation.rst trunk/src/site/rst/v4/user/installationr.rst trunk/src/site/rst/v4/user/isisFishModel.rst trunk/src/site/rst/v4/user/migrationv3v4.rst trunk/src/site/rst/v4/user/scripts.rst trunk/src/site/rst/v4/user/scriptsR.rst trunk/src/site/rst/v4/user/tutorials.rst trunk/src/site/rst/v4/user/tutorials/firstLaunch.rst trunk/src/site/rst/v4/user/tutorials/parameterising.rst trunk/src/site/rst/v4/user/tutorials/simulationPlan.rst trunk/src/site/rst/v4/user/tutorials/useAPI.rst trunk/src/site/rst/v4/user/tutorials/utilCaparmor.rst trunk/src/site/rst/v4/user/usermanual.rst trunk/src/site/rst/v4/user/usermanual/GUI.rst trunk/src/site/rst/v4/user/usermanual/analysisPlan.rst trunk/src/site/rst/v4/user/usermanual/inputs.rst trunk/src/site/rst/v4/user/usermanual/introduction.rst trunk/src/site/rst/v4/user/usermanual/launcher.rst trunk/src/site/rst/v4/user/usermanual/queue.rst trunk/src/site/rst/v4/user/usermanual/results.rst trunk/src/site/rst/v4/user/usermanual/scripts.rst trunk/src/site/rst/v4/user/usermanual/sensitivity.rst trunk/src/site/rst/v4/user/warning.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/LICENSE.txt 2012-11-07 11:33:53 UTC (rev 101) @@ -1,301 +1,642 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + 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 + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. 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. +them 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. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. 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. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. 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. + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. - 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. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. - 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. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + TERMS AND CONDITIONS - 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". + 0. Definitions. -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. + "This License" refers to version 3 of the GNU General Public License. - 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. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. -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. + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. - 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: + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. + A "covered work" means either the unmodified Program or a work based +on the Program. - 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. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. - 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.) + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. -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. + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. -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. + 1. Source Code. -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. + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. - 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 "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. - 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, + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. - 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, + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. - 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 Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. -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. + The Corresponding Source for a work in source code form is that +same work. -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. + 2. Basic Permissions. - 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. + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. - 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. + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. - 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 + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of 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 + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying 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. + 13. Use with the GNU Affero General Public License. -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. + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. + 14. Revised Versions 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 + The Free Software Foundation may publish revised and/or new versions of +the GNU 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. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public 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. + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. - NO WARRANTY + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. - 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. + 15. Disclaimer of Warranty. - 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. + 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. - END OF TERMS AND CONDITIONS + 16. Limitation of Liability. - How to Apply These Terms to Your New Programs + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +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. + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + 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 +state 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 a brief idea of what it does.> Copyright (C) <year> <name of author> - This program is free software; you can redistribute it and/or modify + 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 + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -303,37 +644,31 @@ 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. + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. 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: + If the program does terminal interaction, 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'. + <program> Copyright (C) <year> <name of author> + This program 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. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". -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: + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. - 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 instead of this License. + The GNU 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 instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/pom.xml 2012-11-07 11:33:53 UTC (rev 101) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.6</version> + <version>3.4.3</version> </parent> <groupId>fr.ifremer</groupId> @@ -133,7 +133,8 @@ <projectId>isis-fish-docs</projectId> <platform>forge.codelutin.com</platform> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> - <license.licenseName>gpl_v2</license.licenseName> + <license.licenseName>gpl_v3</license.licenseName> + <license.organizationName>Ifremer, Codelutin</license.organizationName> </properties> <distributionManagement> Modified: trunk/src/site/en/resources/css/site.css =================================================================== --- trunk/src/site/en/resources/css/site.css 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/en/resources/css/site.css 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ * $Id: site.css 3124 2010-11-29 18:14:09Z chatellier $ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 Ifremer, Code Lutin + * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric * %% * 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 + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,17 +19,10 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -#paypal { - display: none; -} -#Google-AdSense, #Google-search, #googleAnalytics { - display: none; -} - body { background: url(http://flotte.ifremer.fr/extension/ifremer-v4/design/skin-ifremer-v4/images/...) repeat 0% 0%; width: 960px; @@ -39,7 +32,7 @@ } #bodyColumn { - padding-top: 25px; + padding-top: 10px; } #contentBox { @@ -79,6 +72,7 @@ #bannerLeft { margin-top: 24px; + float: left; } #bannerRight { @@ -113,6 +107,11 @@ color:#FFE600; } +#leftColumn { + background-color: transparent; + border: medium none; +} + #navcolumn { text-align: right; } @@ -134,6 +133,11 @@ padding-left: 10px; } +#navcolumn li.none { + margin-left: 0; + text-indent: 0; +} + #navcolumn a:link, #navcolumn a:visited, #navcolumn a:active { color: #BCE8FE; } Modified: trunk/src/site/en/rst/contact.rst =================================================================== --- trunk/src/site/en/rst/contact.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/en/rst/contact.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2011 Ifremer, Code Lutin, Chatellier Eric +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -90,5 +90,5 @@ .. _create an account: http://forge.codelutin.com/account/register .. _Bug tracking: http://forge.codelutin.com/projects/isis-fish/issues?set_filter=1&tracker_id=1 -.. _Featue request: http://forge.codelutin.com/projects/isis-fish/issues?set_filter=1&tracker_id=2 -.. _Roadmap: http://forge.codelutin.com/projects/isis-fish/roadmap \ No newline at end of file +.. _Feature request: http://forge.codelutin.com/projects/isis-fish/issues?set_filter=1&tracker_id=2 +.. _Roadmap: http://forge.codelutin.com/projects/isis-fish/roadmap Modified: trunk/src/site/en/rst/download.rst =================================================================== --- trunk/src/site/en/rst/download.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/en/rst/download.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/en/rst/index.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/en/rst/license.rst =================================================================== --- trunk/src/site/en/rst/license.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/en/rst/license.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -1,25 +1,25 @@ .. - .. * #%L .. * IsisFish -.. * +.. * .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 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 +.. * +.. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -28,283 +28,677 @@ :: - 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. - - GNU GENERAL PUBLIC LICENSE - 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 + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for + software and other kinds of works. + + The licenses for most software and other practical works are designed + to take away your freedom to share and change the works. By contrast, + the GNU General Public License is intended to guarantee your freedom to + share and change all versions of a program--to make sure it remains free + software for all its users. We, the Free Software Foundation, use the + GNU General Public License for most of our software; it applies also to + any other work released this way by its authors. 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 + them 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 prevent others from denying you + these rights or asking you to surrender the rights. Therefore, you have + certain responsibilities if you distribute copies of the software, or if + you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether + gratis or for a fee, you must pass on to the recipients the same + freedoms that you received. 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. + + Developers that use the GNU GPL protect your rights with two steps: + (1) assert copyright on the software, and (2) offer you this License + giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains + that there is no warranty for this free software. For both users' and + authors' sake, the GPL requires that modified versions be marked as + changed, so that their problems will not be attributed erroneously to + authors of previous versions. + + Some devices are designed to deny users access to install or run + modified versions of the software inside them, although the manufacturer + can do so. This is fundamentally incompatible with the aim of + protecting users' freedom to change the software. The systematic + pattern of such abuse occurs in the area of products for individuals to + use, which is precisely where it is most unacceptable. Therefore, we + have designed this version of the GPL to prohibit the practice for those + products. If such problems arise substantially in other domains, we + stand ready to extend this provision to those domains in future versions + of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. + States should not allow patents to restrict development and use of + software on general-purpose computers, but in those that do, we wish to + avoid the special danger that patents applied to a free program could + make it effectively proprietary. To prevent this, the GPL assures that + patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and + modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of + works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this + License. Each licensee is addressed as "you". "Licensees" and + "recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work + in a fashion requiring copyright permission, other than the making of an + exact copy. The resulting work is called a "modified version" of the + earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based + on the Program. + + To "propagate" a work means to do anything with it that, without + permission, would make you directly or secondarily liable for + infringement under applicable copyright law, except executing it on a + computer or modifying a private copy. Propagation includes copying, + distribution (with or without modification), making available to the + public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other + parties to make or receive copies. Mere interaction with a user through + a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" + to the extent that it includes a convenient and prominently visible + feature that (1) displays an appropriate copyright notice, and (2) + tells the user that there is no warranty for the work (except to the + extent that warranties are provided), that licensees may convey the + work under this License, and how to view a copy of this License. If + the interface presents a list of user commands or options, such as a + menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work + for making modifications to it. "Object code" means any non-source + form of a work. + + A "Standard Interface" means an interface that either is an official + standard defined by a recognized standards body, or, in the case of + interfaces specified for a particular programming language, one that + is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other + than the work as a whole, that (a) is included in the normal form of + packaging a Major Component, but which is not part of that Major + Component, and (b) serves only to enable use of the work with that + Major Component, or to implement a Standard Interface for which an + implementation is available to the public in source code form. A + "Major Component", in this context, means a major essential component + (kernel, window system, and so on) of the specific operating system + (if any) on which the executable work runs, or a compiler used to + produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all + the source code needed to generate, install, and (for an executable + work) run the object code and to modify the work, including scripts to + control those activities. However, it does not include the work's + System Libraries, or general-purpose tools or generally available free + programs which are used unmodified in performing those activities but + which are not part of the work. For example, Corresponding Source + includes interface definition files associated with source files for + the work, and the source code for shared libraries and dynamically + linked subprograms that the work is specifically designed to require, + such as by intimate data communication or control flow between those + subprograms and other parts of the work. + + The Corresponding Source need not include anything that users + can regenerate automatically from other parts of the Corresponding + Source. + + The Corresponding Source for a work in source code form is that + same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of + copyright on the Program, and are irrevocable provided the stated + conditions are met. This License explicitly affirms your unlimited + permission to run the unmodified Program. The output from running a + covered work is covered by this License only if the output, given its + content, constitutes a covered work. This License acknowledges your + rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not + convey, without conditions so long as your license otherwise remains + in force. You may convey covered works to others for the sole purpose + of having them make modifications exclusively for you, or provide you + with facilities for running those works, provided that you comply with + the terms of this License in conveying all material for which you do + not control copyright. Those thus making or running the covered works + for you must do so exclusively on your behalf, under your direction + and control, on terms that prohibit them from making any copies of + your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under + the conditions stated below. Sublicensing is not allowed; section 10 + makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological + measure under any applicable law fulfilling obligations under article + 11 of the WIPO copyright treaty adopted on 20 December 1996, or + similar laws prohibiting or restricting circumvention of such + measures. + + When you convey a covered work, you waive any legal power to forbid + circumvention of technological measures to the extent such circumvention + is effected by exercising rights under this License with respect to + the covered work, and you disclaim any intention to limit operation or + modification of the work as a means of enforcing, against the work's + users, your or third parties' legal rights to forbid circumvention of + technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; + keep intact all notices stating that this License and any + non-permissive terms added in accord with section 7 apply to the code; + keep intact all notices of the absence of any warranty; and give all + recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, + and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to + produce it from the Program, in the form of source code under the + terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent + works, which are not by their nature extensions of the covered work, + and which are not combined with it such as to form a larger program, + in or on a volume of a storage or distribution medium, is called an + "aggregate" if the compilation and its resulting copyright are not + used to limit the access or legal rights of the compilation's users + beyond what the individual works permit. Inclusion of a covered work + in an aggregate does not cause this License to apply to the other + parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms + of sections 4 and 5, provided that you also convey the + machine-readable Corresponding Source under the terms of this License, + in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded + from the Corresponding Source as a System Library, need not be + included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any + tangible personal property which is normally used for personal, family, + or household purposes, or (2) anything designed or sold for incorporation + into a dwelling. In determining whether a product is a consumer product, + doubtful cases shall be resolved in favor of coverage. For a particular + product received by a particular user, "normally used" refers to a + typical or common use of that class of product, regardless of the status + of the particular user or of the way in which the particular user + actually uses, or expects or is expected to use, the product. A product + is a consumer product regardless of whether the product has substantial + commercial, industrial or non-consumer uses, unless such uses represent + the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, + procedures, authorization keys, or other information required to install + and execute modified versions of a covered work in that User Product from + a modified version of its Corresponding Source. The information must + suffice to ensure that the continued functioning of the modified object + code is in no case prevented or interfered with solely because + modification has been made. + + If you convey an object code work under this section in, or with, or + specifically for use in, a User Product, and the conveying occurs as + part of a transaction in which the right of possession and use of the + User Product is transferred to the recipient in perpetuity or for a + fixed term (regardless of how the transaction is characterized), the + Corresponding Source conveyed under this section must be accompanied + by the Installation Information. But this requirement does not apply + if neither you nor any third party retains the ability to install + modified object code on the User Product (for example, the work has + been installed in ROM). + + The requirement to provide Installation Information does not include a + requirement to continue to provide support service, warranty, or updates + for a work that has been modified or installed by the recipient, or for + the User Product in which it has been modified or installed. Access to a + network may be denied when the modification itself materially and + adversely affects the operation of the network or violates the rules and + protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, + in accord with this section must be in a format that is publicly + documented (and with an implementation available to the public in + source code form), and must require no special password or key for + unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this + License by making exceptions from one or more of its conditions. + Additional permissions that are applicable to the entire Program shall + be treated as though they were included in this License, to the extent + that they are valid under applicable law. If additional permissions + apply only to part of the Program, that part may be used separately + under those permissions, but the entire Program remains governed by + this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option + remove any additional permissions from that copy, or from any part of + it. (Additional permissions may be written to require their own + removal in certain cases when you modify the work.) You may place + additional permissions on material, added by you to a covered work, + for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you + add to a covered work, you may (if authorized by the copyright holders of + that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further + restrictions" within the meaning of section 10. If the Program as you + received it, or any part of it, contains a notice stating that it is + governed by this License along with a term that is a further + restriction, you may remove that term. If a license document contains + a further restriction but permits relicensing or conveying under this + License, you may add to a covered work material governed by the terms + of that license document, provided that the further restriction does + not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you + must place, in the relevant source files, a statement of the + additional terms that apply to those files, or a notice indicating + where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the + form of a separately written license, or stated as exceptions; + the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly + provided under this License. Any attempt otherwise to propagate or + modify it is void, and will automatically terminate your rights under + this License (including any patent licenses granted under the third + paragraph of section 11). + + However, if you cease all violation of this License, then your + license from a particular copyright holder is reinstated (a) + provisionally, unless and until the copyright holder explicitly and + finally terminates your license, and (b) permanently, if the copyright + holder fails to notify you of the violation by some reasonable means + prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is + reinstated permanently if the copyright holder notifies you of the + violation by some reasonable means, this is the first time you have + received notice of violation of this License (for any work) from that + copyright holder, and you cure the violation prior to 30 days after + your receipt of the notice. + + Termination of your rights under this section does not terminate the + licenses of parties who have received copies or rights from you under + this License. If your rights have been terminated and not permanently + reinstated, you do not qualify to receive new licenses for the same + material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or + run a copy of the Program. Ancillary propagation of a covered work + occurring solely as a consequence of using peer-to-peer transmission + to receive a copy likewise does not require acceptance. However, + nothing other than this License grants you permission to propagate or + modify any covered work. These actions infringe copyright if you do + not accept this License. Therefore, by modifying or propagating a + covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically + receives a license from the original licensors, to run, modify and + propagate that work, subject to this License. You are not responsible + for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an + organization, or substantially all assets of one, or subdividing an + organization, or merging organizations. If propagation of a covered + work results from an entity transaction, each party to that + transaction who receives a copy of the work also receives whatever + licenses to the work the party's predecessor in interest had or could + give under the previous paragraph, plus a right to possession of the + Corresponding Source of the work from the predecessor in interest, if + the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the + rights granted or affirmed under this License. For example, you may + not impose a license fee, royalty, or other charge for exercise of + rights granted under this License, and you may not initiate litigation + (including a cross-claim or counterclaim in a lawsuit) alleging that + any patent claim is infringed by making, using, selling, offering for + sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this + License of the Program or a work on which the Program is based. The + work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims + owned or controlled by the contributor, whether already acquired or + hereafter acquired, that would be infringed by some manner, permitted + by this License, of making, using, or selling its contributor version, + but do not include claims that would be infringed only as a + consequence of further modification of the contributor version. For + purposes of this definition, "control" includes the right to grant + patent sublicenses in a manner consistent with the requirements of + this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free + patent license under the contributor's essential patent claims, to + make, use, sell, offer for sale, import and otherwise run, modify and + propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express + agreement or commitment, however denominated, not to enforce a patent + (such as an express permission to practice a patent or covenant not to + sue for patent infringement). To "grant" such a patent license to a + party means to make such an agreement or commitment not to enforce a + patent against the party. + + If you convey a covered work, knowingly relying on a patent license, + and the Corresponding Source of the work is not available for anyone + to copy, free of charge and under the terms of this License, through a + publicly available network server or other readily accessible means, + then you must either (1) cause the Corresponding Source to be so + available, or (2) arrange to deprive yourself of the benefit of the + patent license for this particular work, or (3) arrange, in a manner + consistent with the requirements of this License, to extend the patent + license to downstream recipients. "Knowingly relying" means you have + actual knowledge that, but for the patent license, your conveying the + covered work in a country, or your recipient's use of the covered work + in a country, would infringe one or more identifiable patents in that + country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or + arrangement, you convey, or propagate by procuring conveyance of, a + covered work, and grant a patent license to some of the parties + receiving the covered work authorizing them to use, propagate, modify + or convey a specific copy of the covered work, then the patent license + you grant is automatically extended to all recipients of the covered + work and works based on it. + + A patent license is "discriminatory" if it does not include within + the scope of its coverage, prohibits the exercise of, or is + conditioned on the non-exercise of one or more of the rights that are + specifically granted under this License. You may not convey a covered + work if you are a party to an arrangement with a third party that is + in the business of distributing software, under which you make payment + to the third party based on the extent of your activity of conveying + the work, and under which the third party grants, to any of the + parties who would receive the covered work from you, a discriminatory + patent license (a) in connection with copies of the covered work + conveyed by you (or copies made from those copies), or (b) primarily + for and in connection with specific products or compilations that + contain the covered work, unless you entered into that arrangement, + or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting + any implied license or other defenses to infringement that may + otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a + covered work so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you may + not convey it at all. For example, if you agree to terms that obligate you + to collect a royalty for further conveying from those to whom you convey + the Program, the only way you could satisfy both those terms and this + License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have + permission to link or combine any covered work with a work licensed + under version 3 of the GNU Affero General Public License into a single + combined work, and to convey the resulting work. The terms of this + License will continue to apply to the part which is the covered work, + but the special requirements of the GNU Affero General Public License, + section 13, concerning interaction through a network will apply to the + combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of + the GNU 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 that a certain numbered version of the GNU General + Public License "or any later version" applies to it, you have the + option of following the terms and conditions either of that numbered + version or of any later version published by the Free Software + Foundation. If the Program does not specify a version number of the + GNU General Public License, you may choose any version ever published + by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future + versions of the GNU General Public License can be used, that proxy's + public statement of acceptance of a version permanently authorizes you + to choose that version for the Program. + + Later license versions may give you additional or different + permissions. However, no additional obligations are imposed on any + author or copyright holder as a result of your choosing to follow a + later version. + + 15. Disclaimer of Warranty. + + 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. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS + 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. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided + above cannot be given local legal effect according to their terms, + reviewing courts shall apply local law that most closely approximates + an absolute waiver of all civil liability in connection with the + Program, unless a warranty or assumption of liability accompanies a + copy of the Program in return for a fee. + + 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 + state 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 a brief idea of what it does.> + Copyright (C) <year> <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 3 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, see <http://www.gnu.org/licenses/>. + + Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short + notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program 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, your program's commands + might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, + if any, to sign a "copyright disclaimer" for the program, if necessary. + For more information on this, and how to apply and follow the GNU GPL, see + <http://www.gnu.org/licenses/>. + + The GNU 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 instead of this License. But first, please read + <http://www.gnu.org/philosophy/why-not-lgpl.html>. Modified: trunk/src/site/en/rst/listStats.rst =================================================================== --- trunk/src/site/en/rst/listStats.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/en/rst/listStats.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -102,4 +102,4 @@ * 2008: 2479 * 2009: 4348 -Total : 12009 \ No newline at end of file +Total : 12009 Modified: trunk/src/site/en/rst/publications.rst =================================================================== --- trunk/src/site/en/rst/publications.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/en/rst/publications.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2011 Ifremer, Code Lutin, Chatellier +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -32,16 +32,16 @@ ===== ======================================================================================================================================================================================================================================================================================================================================================================================================================================================== ============================================================================================== =========================================================== Year Publication Download Original publication ===== ======================================================================================================================================================================================================================================================================================================================================================================================================================================================== ============================================================================================== =========================================================== -2011 **Hussein, C.**, M.Verdoit-Jarraya, J.Pastor, A.Ibrahim, G.Saragoni, D.Pelletier, S. Mahévas, P.Lenfant, 2011. 'Assessing the impact of artisanal and recreational fishing and protection on a white seabream (Diplodus sargussargus) population in the north-western Mediterranean Sea using a simulation model. Part2: Sensitivity analysis and management measures.' **Fisheries Research** 108, Issue 1, Pages 174-183 `Here <https://w3.ifremer.fr/archimer/doc/00030/14115/11337.pdf>`_ `Fisheries research <http://www.journals.elsevier.com/fisheries-research/>`_ -2011 **Hussein, C.**, M.Verdoit-Jarraya, J.Pastor, A.Ibrahim, G.Saragoni, D.Pelletier, S. Mahévas, P.Lenfant (2011) 'Assessing the impact of artisanal and recreational fishing and protection on a white seabream (Diplodus sargussargus) population in the north-western Mediterranean Sea using a simulation model. Part1: Parameterization and simulations.' **Fisheries Research** 108, Issue 1, Pages 163-173 `Here <https://w3.ifremer.fr/archimer/doc/00030/14114/11351.pdf>`_ `Fisheries research <http://www.journals.elsevier.com/fisheries-research/>`_ -2011 **Marchal, P.**, Little, L.R., and Thébaud, O., 2011. 'Quota allocation in mixed-fisheries: a bioeconomic modelling approach applied to the Channel flatfish fisheries.' **ICES Journal of Marine Science**, 68, 1580–1591. `Here <https://w3.ifremer.fr/archimer/doc/00044/15492/12971.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ -2010 **Lehuta, S.**, Mahévas, S., Petitgas, P. et Pelletier, D., 2010. 'Combining sensitivity and uncertainty analysis to evaluate the impact of management measures with ISIS–Fish: marine protected areas for the Bay of Biscay anchovy(Engraulis encrasicolus) fishery. **ICES journal of Marine science** 67:1063-1075. `Here <http://archimer.ifremer.fr/doc/00011/12234/9281.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ -2009 **Marchal, P.**, Francis, C., Lallemand, P., Lehuta, S., Mahévas, S., Stokes, K. & Vermard,Y., 2009. 'Catch-quota balancing in mixed-fisheries: a bio-economic modelling approach applied to the New Zealand hoki (Macruronus novaezelandiae) fishery' . **Aquatic Living Resource** 22:483-498. `Here <http://archimer.ifremer.fr/doc/00000/11168/7521.pdf>`_ `ALR <http://www.alr-journal.org/>`_ -2009 **Pelletier, D.** , Mahévas, S., Drouineau, H., Vermard, Y., Thebaud, O., Guyader,O. & Poussin, B., 2009. 'Evaluation of the bioeconomic sustainability of multi-species multi-fleet fisheries under a wide range of policy options using ISIS-Fish.' **Ecological Modelling** 220 (7): pp. 1013-1033. `Here <http://archimer.ifremer.fr/doc/2009/publication-6782.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ -2009 **Kraus, G.** , Pelletier, D., Dubreuil, J., Moellmann, C., Hinrichsen, H., Bastardie, F., Vermard,Y. & Mahévas, S., 2009. 'A model-based evaluation of Marine Protected Areas as fishery management tool for a stock facing strong environmental variability - the example of Eastern Baltic cod (Gadus morhua callarias L.).' **ICES Journal of Marine Science** 66: pp. 109-121. `Here <http://archimer.ifremer.fr/doc/2009/publication-6094.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ -2006 **Drouineau, H.** , S. Mahévas, D. Pelletier, B. Beliaeff. 'Assessing the impact of different management options using ISIS-Fish: the French Merluccius merluccius – Nephrops norvegicus mixed fishery of the Bay of Biscay.' **Aquat. Living Resour.** 19, 15–29 `Here <http://archimer.ifremer.fr/doc/2006/publication-1340.pdf>`_ `ALR <http://www.alr-journal.org/>`_ -2005 **Pelletier, D.** & S. Mahévas. 'Fisheries simulation models for evaluating the impact of management policies, with emphasis on marine protected areas.' **Fish and Fisheries** ; 6 (4) : 307-349. `Here <http://archimer.ifremer.fr/doc/2005/publication-1031.pdf>`_ `Fish and Fisheries <http://www.blackwellpublishing.com/>`_ -2004 **Mahévas, S.** & D. Pelletier, 2004. 'ISIS-Fish, a generic and spatially-explicit simulation tool for evaluating the impact of management measures on fisheries dynamics.' **Ecological Modelling** 171, 65-84. `Here <http://archimer.ifremer.fr/doc/2004/publication-1133.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ +2011 **Hussein, C.**, M.Verdoit-Jarraya, J.Pastor, A.Ibrahim, G.Saragoni, D.Pelletier, S. Mahévas, P.Lenfant, 2011. 'Assessing the impact of artisanal and recreational fishing and protection on a white seabream (Diplodus sargussargus) population in the north-western Mediterranean Sea using a simulation model. Part2: Sensitivity analysis and management measures.' **Fisheries Research** 108, Issue 1, Pages 174-183 `Here <https://w3.ifremer.fr/archimer/doc/00030/14115/11337.pdf>`__ `Fisheries research <http://www.journals.elsevier.com/fisheries-research/>`_ +2011 **Hussein, C.**, M.Verdoit-Jarraya, J.Pastor, A.Ibrahim, G.Saragoni, D.Pelletier, S. Mahévas, P.Lenfant (2011) 'Assessing the impact of artisanal and recreational fishing and protection on a white seabream (Diplodus sargussargus) population in the north-western Mediterranean Sea using a simulation model. Part1: Parameterization and simulations.' **Fisheries Research** 108, Issue 1, Pages 163-173 `Here <https://w3.ifremer.fr/archimer/doc/00030/14114/11351.pdf>`__ `Fisheries research <http://www.journals.elsevier.com/fisheries-research/>`_ +2011 **Marchal, P.**, Little, L.R., and Thébaud, O., 2011. 'Quota allocation in mixed-fisheries: a bioeconomic modelling approach applied to the Channel flatfish fisheries.' **ICES Journal of Marine Science**, 68, 1580–1591. `Here <https://w3.ifremer.fr/archimer/doc/00044/15492/12971.pdf>`__ `sciencedirect <http://www.sciencedirect.com/>`_ +2010 **Lehuta, S.**, Mahévas, S., Petitgas, P. et Pelletier, D., 2010. 'Combining sensitivity and uncertainty analysis to evaluate the impact of management measures with ISIS–Fish: marine protected areas for the Bay of Biscay anchovy(Engraulis encrasicolus) fishery. **ICES journal of Marine science** 67:1063-1075. `Here <http://archimer.ifremer.fr/doc/00011/12234/9281.pdf>`__ `sciencedirect <http://www.sciencedirect.com/>`_ +2009 **Marchal, P.**, Francis, C., Lallemand, P., Lehuta, S., Mahévas, S., Stokes, K. & Vermard,Y., 2009. 'Catch-quota balancing in mixed-fisheries: a bio-economic modelling approach applied to the New Zealand hoki (Macruronus novaezelandiae) fishery' . **Aquatic Living Resource** 22:483-498. `Here <http://archimer.ifremer.fr/doc/00000/11168/7521.pdf>`__ `ALR <http://www.alr-journal.org/>`_ +2009 **Pelletier, D.** , Mahévas, S., Drouineau, H., Vermard, Y., Thebaud, O., Guyader,O. & Poussin, B., 2009. 'Evaluation of the bioeconomic sustainability of multi-species multi-fleet fisheries under a wide range of policy options using ISIS-Fish.' **Ecological Modelling** 220 (7): pp. 1013-1033. `Here <http://archimer.ifremer.fr/doc/2009/publication-6782.pdf>`__ `sciencedirect <http://www.sciencedirect.com/>`_ +2009 **Kraus, G.** , Pelletier, D., Dubreuil, J., Moellmann, C., Hinrichsen, H., Bastardie, F., Vermard,Y. & Mahévas, S., 2009. 'A model-based evaluation of Marine Protected Areas as fishery management tool for a stock facing strong environmental variability - the example of Eastern Baltic cod (Gadus morhua callarias L.).' **ICES Journal of Marine Science** 66: pp. 109-121. `Here <http://archimer.ifremer.fr/doc/2009/publication-6094.pdf>`__ `sciencedirect <http://www.sciencedirect.com/>`_ +2006 **Drouineau, H.** , S. Mahévas, D. Pelletier, B. Beliaeff. 'Assessing the impact of different management options using ISIS-Fish: the French Merluccius merluccius – Nephrops norvegicus mixed fishery of the Bay of Biscay.' **Aquat. Living Resour.** 19, 15–29 `Here <http://archimer.ifremer.fr/doc/2006/publication-1340.pdf>`__ `ALR <http://www.alr-journal.org/>`_ +2005 **Pelletier, D.** & S. Mahévas. 'Fisheries simulation models for evaluating the impact of management policies, with emphasis on marine protected areas.' **Fish and Fisheries** ; 6 (4) : 307-349. `Here <http://archimer.ifremer.fr/doc/2005/publication-1031.pdf>`__ `Fish and Fisheries <http://www.blackwellpublishing.com/>`_ +2004 **Mahévas, S.** & D. Pelletier, 2004. 'ISIS-Fish, a generic and spatially-explicit simulation tool for evaluating the impact of management measures on fisheries dynamics.' **Ecological Modelling** 171, 65-84. `Here <http://archimer.ifremer.fr/doc/2004/publication-1133.pdf>`__ `sciencedirect <http://www.sciencedirect.com/>`_ 2001 **Pelletier, D.** , S. Mahévas, B. Poussin, J. Bayon, P. André and J.C. Royer. 2001. 'A conceptual model for evaluating the impact of spatial management measures on the dynamics of a mixed fishery', pp. 53-66 In : G. H. Kruse, N. Bez, T. Booth, M. Dorn, S. Hills, R. Lipcius, D. Pelletier, C. Roy, S. Smith, & D. Witherell (eds), Spatial Processes and Management of Marine Populations. University of Alaska Sea Grant, AK-SG-00-04, Fairbanks ===== ======================================================================================================================================================================================================================================================================================================================================================================================================================================================== ============================================================================================== =========================================================== @@ -124,9 +124,9 @@ Period Student School Title Download ========= ========================== =========================================================================================== ================================================================================================================================================================================================= ============================================================= 2011 Hussein Chirine École Pratique des Hautes Études, Mention Systèmes Intégrés, Environnement et Biodiversité. Modélisation de l’impact de la pêche et de la protection sur une ressource exploitée : le sar commun, Diplodus sargus sargus (L., 1758) autour de la réserve naturelle marine de Cerbère-Banyuls. -2007-2010 Lehuta Sigrid « Vie, Agro, Santé » (VAS) Développement d’indicateurs de pêcheries pour évaluer l’impact de mesures de gestion. `Here <http://archimer.ifremer.fr/doc/00025/13630/10712.pdf>`_ -2006-2009 Vermard Youen « Vie, Agro, Santé » (VAS) La compréhension des dynamiques de flottille permet-elle d'améliorer les scénarios de gestion ? `Here <http://archimer.ifremer.fr/doc/00001/11256/7799.pdf>`_ -2004-2007 Drouineau Hilaire « Vie, Agro, Santé » (VAS) Le développement d’un modèle de dynamique de population structuré en longueur et spatialisé – application au Merlu (Merluccius merluccius) d’Atlantique Nord-Est. `Here <http://archimer.ifremer.fr/doc/2008/these-3710.pdf>`_ +2007-2010 Lehuta Sigrid « Vie, Agro, Santé » (VAS) Développement d’indicateurs de pêcheries pour évaluer l’impact de mesures de gestion. `Here <http://archimer.ifremer.fr/doc/00025/13630/10712.pdf>`__ +2006-2009 Vermard Youen « Vie, Agro, Santé » (VAS) La compréhension des dynamiques de flottille permet-elle d'améliorer les scénarios de gestion ? `Here <http://archimer.ifremer.fr/doc/00001/11256/7799.pdf>`__ +2004-2007 Drouineau Hilaire « Vie, Agro, Santé » (VAS) Le développement d’un modèle de dynamique de population structuré en longueur et spatialisé – application au Merlu (Merluccius merluccius) d’Atlantique Nord-Est. `Here <http://archimer.ifremer.fr/doc/2008/these-3710.pdf>`__ ========= ========================== =========================================================================================== ================================================================================================================================================================================================= ============================================================= Post-doctorates Modified: trunk/src/site/en/rst/research.rst =================================================================== --- trunk/src/site/en/rst/research.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/en/rst/research.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/resources/css/site.css =================================================================== --- trunk/src/site/resources/css/site.css 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/css/site.css 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ * $Id: site.css 3124 2010-11-29 18:14:09Z chatellier $ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 Ifremer, Code Lutin + * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric * %% * 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 + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,17 +19,10 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -#paypal { - display: none; -} -#Google-AdSense, #Google-search, #googleAnalytics { - display: none; -} - body { background: url(http://flotte.ifremer.fr/extension/ifremer-v4/design/skin-ifremer-v4/images/...) repeat 0% 0%; width: 960px; @@ -39,7 +32,7 @@ } #bodyColumn { - padding-top: 25px; + padding-top: 10px; } #contentBox { @@ -79,6 +72,7 @@ #bannerLeft { margin-top: 24px; + float: left; } #bannerRight { @@ -113,6 +107,11 @@ color:#FFE600; } +#leftColumn { + background-color: transparent; + border: medium none; +} + #navcolumn { text-align: right; } @@ -134,6 +133,11 @@ padding-left: 10px; } +#navcolumn li.none { + margin-left: 0; + text-indent: 0; +} + #navcolumn a:link, #navcolumn a:visited, #navcolumn a:active { color: #BCE8FE; } Added: trunk/src/site/resources/js/maven-isisfish.js =================================================================== --- trunk/src/site/resources/js/maven-isisfish.js (rev 0) +++ trunk/src/site/resources/js/maven-isisfish.js 2012-11-07 11:33:53 UTC (rev 101) @@ -0,0 +1,96 @@ +/* + * #%L + * Isis-Fish + * + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +$(document).ready(function () { + + var metas = $('#projectMetas'); + var piwikEnabled = metas.attr('piwikEnabled'); + if (piwikEnabled) { + //Piwik Tracking Code + var piwikId = metas.attr('piwikId'); + if (!piwikId) { + + // default piwikId for forge.codelutin.com + piwikId = 4; + } + + console.log("use Piwik with id = " + piwikId); + var pkBaseURL = "https:" == document.location.protocol ? + "https://piwik.codelutin.com/" : + "http://piwik.codelutin.com/"; + $.getScript(pkBaseURL + "piwik.js", function (data, textStatus, jqxhr) { + var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", piwikId); + piwikTracker.trackPageView(); + piwikTracker.enableLinkTracking(); + console.log("piwikTracker loaded = " + piwikTracker); + }); + //Piwik Tracking Code + } + var scmwebeditorenabled = metas.attr('scmwebeditorenabled'); + var scm = metas.attr('scm'); + if (scmwebeditorenabled && scm.indexOf("/trunk") > -1) { + + // allow scmwebeditor is enabled and on trunk + + // remove scm prefix (scm:svn:) + scm = scm.replace('scm:svn:',''); + + var scmurl = metas.attr('scmwebeditorurl'); + var projectId = metas.attr('projectId'); + var siteSourcesType = metas.attr('siteSourcesType'); + var path; + var pathname = document.location.pathname; + if (pathname.indexOf('target/site') > 0) { + path = pathname.substr(pathname.indexOf('/site')). + replace('/site/', ''); + } else { + if (pathname == '/' + projectId + '/') { + // on / page + path = 'index.html'; + } else { + path = pathname.substr(pathname.indexOf('/' + projectId)). + replace('/' + projectId + '/', ''); + } + } + path = path.replace('.html', '.' + siteSourcesType); + + // current page + var url = scmurl + "?address=" + scm + "/src/site/" + siteSourcesType + "/" + path; + console.log("Add scmwebeditor with url = " + url); + var html = "| <a class='externalLink' href='" + url + + "'>Éditer la page</a>"; + var ul = $('#breadcrumbs .xright'); + ul.append(html); + + // menu + var url2; + if (path.lastIndexOf("en/") === 0) { + url = scmurl + "?address=" + scm + "/src/site/site_en.xml"; + } else { + url = scmurl + "?address=" + scm + "/src/site/site_fr.xml"; + } + var html2 = "<a href='" + url + "'>(éditer)</a>"; + var ul2 = $('#navcolumn'); + ul2.append(html2); + } +}); \ No newline at end of file Modified: trunk/src/site/resources/v4/downloads/EffortReduction.java =================================================================== --- trunk/src/site/resources/v4/downloads/EffortReduction.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/EffortReduction.java 2012-11-07 11:33:53 UTC (rev 101) @@ -1,5 +1,29 @@ package rules; +/* + * #%L + * IsisFish + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import static org.nuiton.i18n.I18n._; import java.util.List; Modified: trunk/src/site/resources/v4/downloads/Effort_2000_2004_MultiSp.java =================================================================== --- trunk/src/site/resources/v4/downloads/Effort_2000_2004_MultiSp.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/Effort_2000_2004_MultiSp.java 2012-11-07 11:33:53 UTC (rev 101) @@ -1,5 +1,29 @@ package rules; +/* + * #%L + * IsisFish + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; Modified: trunk/src/site/resources/v4/downloads/Exemple_PlanSimulation.java =================================================================== --- trunk/src/site/resources/v4/downloads/Exemple_PlanSimulation.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/Exemple_PlanSimulation.java 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ * %% * 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 + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package simulationplans; Modified: trunk/src/site/resources/v4/downloads/MigrationAdultsAvrilHistoric.java =================================================================== --- trunk/src/site/resources/v4/downloads/MigrationAdultsAvrilHistoric.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/MigrationAdultsAvrilHistoric.java 2012-11-07 11:33:53 UTC (rev 101) @@ -1,3 +1,26 @@ +/* + * #%L + * IsisFish + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ // Adult migration coefficients {2000,...,2008,mean} double [] gir = {0.2523304,0.2086467,0.5008767,0.1155539,0.1063631,0.5764831,0.2469257,0.2556178,0.3414639,0.289}; double [] lc = {0.05400881,0.16173449,0.04129422,0.14009017,0.29670246,0.00000000,0.30205351,0.14407688,0.19059324,0.148}; Modified: trunk/src/site/resources/v4/downloads/MigrationAout.java =================================================================== --- trunk/src/site/resources/v4/downloads/MigrationAout.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/MigrationAout.java 2012-11-07 11:33:53 UTC (rev 101) @@ -1,3 +1,26 @@ +/* + * #%L + * IsisFish + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ if (group.getId() == 1 && "SudGolfe".equals(arrivalZone.getName()) ) return 1; else if(group.getId() ==3 && "SudGolfe".equals(departureZone.getName()) && "Recru".equals(arrivalZone.getName()) ) return 1; else if((group.getId() == 16 || group.getId() == 17) && "MigHiver".equals(arrivalZone.getName()) ){ Modified: trunk/src/site/resources/v4/downloads/MzonesAnneeMpertMgdg.java =================================================================== --- trunk/src/site/resources/v4/downloads/MzonesAnneeMpertMgdg.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/MzonesAnneeMpertMgdg.java 2012-11-07 11:33:53 UTC (rev 101) @@ -1,3 +1,26 @@ +/* + * #%L + * IsisFish + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ //test survies martin Date date = context.getSimulationControl().getDate(); Modified: trunk/src/site/resources/v4/downloads/Repro_recru0-2_StockOeufs_Spatialisee061107.java =================================================================== --- trunk/src/site/resources/v4/downloads/Repro_recru0-2_StockOeufs_Spatialisee061107.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/Repro_recru0-2_StockOeufs_Spatialisee061107.java 2012-11-07 11:33:53 UTC (rev 101) @@ -1,12 +1,35 @@ +/* + * #%L + * IsisFish + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ //Equation de repro du modele en longueur v3// ////////////////////////////////////////// /*hypothese : il existe une taille minimum et un declencheur (temp etc) -la dur�e de repro depend de la taille en avril +la dur�e de repro depend de la taille en avril Le declencheur a lieu en avril sauf pour rochebonne en mai*/ double ind = 1; double tot = 0.0; -//boucle pour implementer le recrutement observ� +//boucle pour implementer le recrutement observ� if (context.getSimulationControl().getDate().getYear() < 3){ double coeffR = 0; double recru = 0; Modified: trunk/src/site/resources/v4/downloads/TACfix_Es_Anchois.java =================================================================== --- trunk/src/site/resources/v4/downloads/TACfix_Es_Anchois.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/TACfix_Es_Anchois.java 2012-11-07 11:33:53 UTC (rev 101) @@ -1,5 +1,29 @@ package rules; +/* + * #%L + * IsisFish + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.HashSet; import java.util.List; import java.util.Set; Modified: trunk/src/site/resources/v4/downloads/VBGFAnchois.java =================================================================== --- trunk/src/site/resources/v4/downloads/VBGFAnchois.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/VBGFAnchois.java 2012-11-07 11:33:53 UTC (rev 101) @@ -1,3 +1,26 @@ +/* + * #%L + * IsisFish + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ // Parameters to input double Linf = 18.77; double K = 1.25; Modified: trunk/src/site/resources/v4/downloads/Weight_month.java =================================================================== --- trunk/src/site/resources/v4/downloads/Weight_month.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/Weight_month.java 2012-11-07 11:33:53 UTC (rev 101) @@ -1,3 +1,26 @@ +/* + * #%L + * IsisFish + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ //Weight equation /*Based on legth-weight key based on PelGas survey 2000-2005 Modified: trunk/src/site/resources/v4/downloads/calibration.java =================================================================== --- trunk/src/site/resources/v4/downloads/calibration.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/calibration.java 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ * %% * 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 + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,453 +19,455 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package analyseplans; -import static org.codelutin.i18n.I18n._; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import scripts.ResultName; -import java.io.*; -import java.util.*; -import org.codelutin.math.matrix.*; -import org.codelutin.topia.*;// pour pouvoir utiliser la methode StringUtil.toDouble() -import org.codelutin.util.*;// pour pouvoir utiliser la methode StringUtil.toDouble() -import fr.ifremer.isisfish.*; -import fr.ifremer.isisfish.types.*; -import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.entities.*; -import fr.ifremer.isisfish.simulator.AnalysePlan; -import fr.ifremer.isisfish.simulator.AnalysePlanContext; -import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.datastore.ResultStorage; - -/** - * /////***File must be copied in isis-database-3/ analyseplans/ - * File name : CalibrationEspeceq1q2Export.java - * /////*** File name could be modified if needed - * /////*** BUT class name must be identical to file name (without the extention ".java") see below - * - * Created: 17 septembre 2007 - * - * @author <> - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - - -/////***You can modify class name if you want -/////***BUT attention : file name and class name must be the same (without the extention ".java"), ie here : "CalibrationEspeceq1q2Export" -public class CalibrationEspeceq1q2Export implements AnalysePlan { - - /** to use log facility, just put in your code: log.info("..."); */ - -/////***class name to check here - static private Log log = LogFactory.getLog(CalibrationEspeceq1q2Export.class); - - enum State {STATE_INIT, STATE_0, STATE_1, STATE_2, STATE_3, STATE_4}; - -/////***here must appear the path to export the historic file ("Historic.csv") where q1, q2 and criteria computed at each simulation are written -/////***Attention : before beginning a new calibration rename your eventual old file Historic.csv otherwise it will be lost - File exportHistoric = new File ("C:Documents and Settings/Sigrid/work/ISIS-FISH/Calibration/Historic.csv"); - protected String exportHisto = ""; - - -//initial points of the simplex - public Population param_Population = null; - public String param_M1 = "2.42e-5;2.11e-6";// devient un parametre du plan d analyse - public String param_M2 = "2.34e-5;2.59e-6";// devient un parametre du plan d analyse - public String param_M3 = "2.59e-5;2.41e-6";// devient un parametre du plan d analyse - //public String param_pas = "1e-5";// devient un parametre du plan d analyse -///// ***put here the path and name of the file containing the data on which you calibrate your fichery ( here observed catches) - public String param_nomfichier_debarquements = "Q:/work/ISIS-FISH/Simu/Calibration/Observedlandings2001-2003.csv";//in row : time ; in columns : age or length group - protected File debarquementsObserves; - protected MatrixND matrixDebarquement; - - protected State state = State.STATE_INIT; - public Experiences experiences = new Experiences(); - public String [] necessaryResult = { - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET - }; - - public String[] getNecessaryResult() { - return this.necessaryResult; - } - - /** - * Permet d'afficher a l'utilisateur une aide sur le plan. - * @return L'aide ou la description du plan - */ - public String getDescription() throws Exception { - return _("Calibration using variable step Simplex method (Walters): user gives a file of observations (here catches) by time step and group (.csv), output will try to approach oservations by changing the values of catchability"); - } - - /** - * Appele au demarrage de la simulation, cette methode permet d'initialiser - * des valeurs - * @param simulation La simulation pour lequel on utilise cette regle - */ - public void init(AnalysePlanContext context) throws Exception { - if (param_nomfichier_debarquements==null || "".equals(param_nomfichier_debarquements)){ - debarquementsObserves = FileUtil.getFile(".*.csv", "fichier csv s�parateur ';'"); - } else { - debarquementsObserves = new File(param_nomfichier_debarquements); - } - int nbYear = context.getParam().getNumberOfYear(); - - TopiaContext db = context.getParam().getRegion().getStorage().beginTransaction(); - Population pop = (Population)db.findByTopiaId(param_Population.getTopiaId()); - - /////*** specify dimention of the matrix containning observations (observed landings for instance) - /////*** numbers of group/columns : could be equal to your number of classes in ISIS but may also be different if your had only aggregated data - int nbGroup = 4 ; -/////*** enter number of observation per year (if you have observation by quarter put 4) / lines of the observations file - int nbTrim = nbYear * 4; - int [] dimMatrix = {nbTrim,nbGroup}; - matrixDebarquement = MatrixFactory.getInstance().create(dimMatrix); -//matrixDebarquement = MatrixFactory.getInstance().create(new int[]{nbGroup}); -// List<PopulationGroup> groups = pop.getPopulationGroup(); -// matrixDebarquement = MatrixFactory.getInstance().create(new List[]{groups}); - matrixDebarquement.importCSV(new FileReader(debarquementsObserves),new int []{0,0}); - log.info("MatrixDebarquement : " + matrixDebarquement); - db.closeContext(); - } - - /** - * Call before each simulation - * @param context plan context - * @param nextSimulation storage used for next simulation - * @return true if we must do next simulation, false to stop plan - * @throws Exception - */ - double g1; - double g2; - double worst1; - double worst2; - - public boolean beforeSimulation(AnalysePlanContext context, SimulationStorage nextSimulation) throws Exception { - boolean doNext = true; - boolean doBoucle = true; -log.info("before simulation"); - - int number = nextSimulation.getParameter().getAnalysePlanNumber(); - -if (number <3) { -log.info("number<3"); - - String [] M1 = param_M1.split(";"); - String [] M2 = param_M2.split(";"); - String [] M3 = param_M3.split(";"); - - double [] q1 = StringUtil.toArrayDouble(M1[0], M2[0], M3[0]); - double [] q2 = StringUtil.toArrayDouble(M1[1], M2[1], M3[1]); - experiences.getExperience(number).q1 = q1[number]; - experiences.getExperience(number).q2 = q2[number]; - - changeDB(experiences.getExperience(number), nextSimulation); - -} else { - - double q1 = 1000; - double q2 = 1000; - double lastCritere = experiences.getExperience(number-1).criteria; - while (doBoucle){ - doBoucle = false; - if (state == State.STATE_INIT) { -doBoucle = false ; -log.info("state init"); - -//ordonne les 3 premieres experiences selon leur critere -Collections.sort(experiences.current); -//log.info("SIMPLEXE : current 0 = " + experiences.current.get(0).criteria + "current 1 = " + experiences.current.get(1).criteria + "current 2 = " + experiences.current.get(2).criteria ); -log.info("SIMPLEXE : current 0 = " + experiences.current.get(0).criteria + "current 1 = " + experiences.current.get(1).criteria + "current 2 = " + experiences.current.get(2).criteria ); -log.info("SIMPLEXE : Best q1 = " + experiences.current.get(0).q1 + " q2 = " + experiences.current.get(0).q2); -log.info("SIMPLEXE : NextBest q1 = " + experiences.current.get(1).q1 + " q2 = " + experiences.current.get(1).q2); -log.info("SIMPLEXE : Worst q1 = " + experiences.current.get(2).q1 + " q2 = " + experiences.current.get(2).q2); - - -//Calcul et evaluation de R -double g1 = (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0; -double g2 = (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0; -double worst1 = experiences.current.get(2).q1; -double worst2 = experiences.current.get(2).q2; - -state = State.STATE_0; - - q1 = 2 * g1 - worst1; - q2 = 2 * g2 - worst2; - -log.info ("R : q1 = " + q1 + " q2 = " + q2 ); - - } else if (state == State.STATE_0) { -doBoucle = false; -log.info("state 0"); - - // on fait la 5eme avec des q qui dependent de la 4eme dans le dernier cas -//log.info("g1 = " + g1 + " " + "g2 = " + g2); -//log.info("worst1 = " + worst1 + " " + "worst2 = " + worst2); - - if (lastCritere > experiences.current.get(2).criteria) { -log.info("State 0 : R : lastCtritere > current2 : R pire de W"); - state = State.STATE_1; - //calcul de Cw - q1 = ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - ( ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - experiences.current.get(2).q1 ) / 2.0; - q2 = ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - ( ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - experiences.current.get(2).q2 ) / 2.0; -log.info("Cw : q1 = " + q1 + " q2 = " + q2); - - - } else if (lastCritere > experiences.current.get(1).criteria) { -log.info("State 0 :R : lastCritere > current 1 : R meilleur que W et moins bon que N"); - state = State.STATE_2; - // calcul de Cr - q1 = ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) + ( ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - experiences.current.get(2).q1 ) / 2.0; - q2 = ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) + ( ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - experiences.current.get(2).q2 ) / 2.0; -log.info("Cr : q1 = " + q1 + " q2 = " + q2); - - } else if (lastCritere > experiences.current.get(0).criteria) { -log.info("State 0 :R : lastCritere > current0 : R meilleur que N et moins bon que B"); - state = State.STATE_INIT; - experiences.current.remove(2);//remove(3)avant - doBoucle = true; -log.info("remove W, simplex BNR"); - - } else { // dernier cas possible: if (lastCritere < experiences.current.get(0).critere) { -log.info("State 0 :R : lastCritere < current 0 : R meilleur que B, calcul de E"); - state = State.STATE_4; - - q1 = experiences.getExperience(number-1).q1 + (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0 - experiences.current.get(2).q1; - q2 = experiences.getExperience(number-1).q2 + (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0 - experiences.current.get(2).q2; - //q1 = experiences.current.get(3).q1 + (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0 - experiences.current.get(2).q1; - //q2 = experiences.current.get(3).q2 + (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0 - experiences.current.get(2).q2; -log.info("E : q1 = " + q1 + " q2 = " + q2); - } - - } else if (state == State.STATE_1) { -log.info("state 1, simplex BNCw"); - experiences.current.remove(3); - experiences.current.remove(2); - state = State.STATE_INIT; - doBoucle = true; - - - } else if (state == State.STATE_2) { -log.info("state 2, simplex BNCr"); - experiences.current.remove(3); - experiences.current.remove(2); - state = State.STATE_INIT; - doBoucle = true; - - - } else if (state == State.STATE_4) { -log.info("state 4 :comparaison de E a B"); - doBoucle = true; - if (lastCritere < experiences.current.get(0).criteria) { -log.info("E meilleur que B, remove 2 et 3 : simplex BNE"); - experiences.current.remove(3); - experiences.current.remove(2); - } else { -log.info("E moins bon que B, remove 2 et 4, simplex BNR"); - experiences.current.remove(4); - experiences.current.remove(2); - } - - state = State.STATE_INIT; - } - - -}//fin du while -//on remplit la table experiences - experiences.getExperience(number).q1 = q1; - experiences.getExperience(number).q2 = q2; - -log.info("on change Q dans la DB avec : q1 = " + q1 + " " + "q2 = " + q2); - -// on change la valeur de q dans la DB - changeDB(experiences.getExperience(number), nextSimulation); - }// fin du else (number > 3) -return doNext; - }// fin du before simulation - - - - /** - - * Call after each simulation, compute criteria for last simulation - * @param context plan context - * @param nextSimulation storage used for next simulation - * @return true if we must do next simulation, false to stop plan - * @throws Exception - */ - - public boolean afterSimulation(AnalysePlanContext context, SimulationStorage lastSimulation) throws Exception { - boolean doNext = true; -log.info("after simulation"); - int number = lastSimulation.getParameter().getAnalysePlanNumber(); - ResultStorage result = lastSimulation.getResultStorage(); - -/////*** Simulated catches are cumulated over strategies, areas and metiers - - MatrixND L2 = result.getMatrix(param_Population, ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); -// log.info("dim de L2" + " " + Arrays.toString(L2.getDim())); -/////*** If some strategies, metiers or areas must not be included in the cumulated catches see below else put "//" at the beginning of line 297 and replace "L2" by "L" at line 289 -/////*** the strategies or so to exclude must be at the begining or end of the list you enter in the parameters interface -/////*** fill the line MatrixND L = L2.getSubMatrix(a,b,c).copy(); as follow : -/////*** a = 1 if you want to exclude strategies, 2 if metiers and 4 if areas -/////*** b = indice of the first object considered -/////*** c = number of object to keep after b, b included - MatrixND L = L2.getSubMatrix(1,2,4).copy(); // for instance : keep strategies 2,3,4,5 -//log.info("sous matrice extraite"); - L = L.sumOverDim(1);// sum over strategies - L = L.sumOverDim(2);// sum over metiers - L = L.sumOverDim(4);// sum over zones -log.info("sommes sur les strategies, metiers et zones faites"); - -/////*** if observations are cumulated by groups else put "//" at the beginning of the following line -L = L.sumOverDim(3); -/////*** else if number of groups in your database differs from number of groups in observations ... write me an e-mail - -////*** if observations are cumulated over quarter a = 3, over year a = 12, else put "//" at the beginning of the following line - L = L.sumOverDim(0,a); - - L = L.reduce(); - - -///////////////////Calcul du critere////////////////// -log.info("calcul du critere"); -log.info("dim de L" + " " + Arrays.toString(L.getDim())); -log.info("dim de obs" + " " + Arrays.toString(matrixDebarquement.getDim())); - double crit = 0; - for ( MatrixIterator g = L.iterator(); g.hasNext();){ - g.next(); -//boucle sur les trimestres et les classes d age - - int [] dim = g.getCoordinates(); - - double obs = matrixDebarquement.getValue(dim); - double simules = g.getValue(); - - crit += Math.pow(obs-simules, 2); // crit = crit + (obs-simules)^2 - }// fin du for -log.info("critere " + number + " = " + crit ); - -//ajoute le critere dans la table experiences - experiences.getExperience(number).criteria = crit; - -//ecriture de la table historic -exportHisto += experiences.getExperience(number).q1 +";"+ experiences.getExperience(number).q2 +";"+ experiences.getExperience(number).criteria + "\n"; -org.codelutin.util.FileUtil.writeString(exportHistoric, exportHisto); - - -return doNext; - -}// fin du after simulation - - /** - * Modify nextSimulation database with q1 and q2 in exp. - * @param exp - * @param nextSimulation - * @throws Exception - */ - - - protected void changeDB(Experience exp, SimulationStorage nextSimulation) throws Exception { -//methode appelee dans before simualtion - TopiaContext db = nextSimulation.getStorage().beginTransaction();//ouvrir un context pour modifier les donnees - Population pop = (Population)db.findByTopiaId(param_Population.getTopiaId()); //reccupere la pop ciblee - MatrixND c = pop.getCapturability(); // reccupere la matrice de capturabilit� - -//log.info("Pour cette simulation : q1 = " + exp.q1 + ";" + "q2 = " + exp.q2 ); - -/////*** that is where you explain how to fill the catchability matrix with q1 and q2 - for (MatrixIterator i = c.iterator(); i.hasNext();){ - i.next(); - Object [] sem = i.getSemanticsCoordinates(); - PopulationGroup group = (PopulationGroup)sem[0]; - PopulationSeasonInfo season = (PopulationSeasonInfo)sem[1]; - -////*** exemple when q2 corresponds to the 12 first groups (groups 0 to 11) - if (group.getId() < 12){ - i.setValue(exp.q2); - }else { - i.setValue(exp.q1); - } - -/////*** exemple when it depends on seasons and groups -/* if (season.getFirstMonth().after(Month.JULY) && group.getId() >=18){ //month >= aout && groupID >= 18 - i.setValue(exp.q2); - }else { - i.setValue(exp.q1); - } -*/ - - }//fin du for - - db.commitTransaction(); // effectue la modification - db.closeContext(); // ferme le context -} - - - - - static public class Experiences { -// cree la liste experiences ou sont stoqu�s q1,q2 et critere pour chaque simulation - - /** contains last simplex and potentialy 2 more simulation */ - public List<Experience> current = new ArrayList<Experience>(); - - /** contains all experience done */ - public List<Experience> history = new ArrayList<Experience>(); - /** - * return experience requested, if this experience doesn't exist - * create it. - * - * @param i simulation number - * @return experience with simulation number fixed if new experience - * is returned - */ - public Experience getExperience(int i) { - Experience result; - if (i<history.size()) { - result = history.get(i); - } else { - result = new Experience(); - result.simNumber = i; - history.add(i, result); - current.add(result); - } - return result; - }//fin de la definition de getExperience - - -/** - * @return the history - */ - public List<Experience> getHistory() { - return this.history; - } - }// fin de la creation des listes experiences - - - - static public class Experience implements Comparable { - public int simNumber; - public double criteria; - public double q1; - public double q2; - /** - * Permit to order experience, first is experience with smallest criteria - */ - public int compareTo(Object arg0) { - Experience other = (Experience)arg0; - int result = Double.compare(this.criteria, other.criteria); - return result; - } - } - - -} \ No newline at end of file + +package analyseplans; + +import static org.codelutin.i18n.I18n._; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import scripts.ResultName; +import java.io.*; +import java.util.*; +import org.codelutin.math.matrix.*; +import org.codelutin.topia.*;// pour pouvoir utiliser la methode StringUtil.toDouble() +import org.codelutin.util.*;// pour pouvoir utiliser la methode StringUtil.toDouble() +import fr.ifremer.isisfish.*; +import fr.ifremer.isisfish.types.*; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.Date; +import fr.ifremer.isisfish.entities.*; +import fr.ifremer.isisfish.simulator.AnalysePlan; +import fr.ifremer.isisfish.simulator.AnalysePlanContext; +import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.datastore.ResultStorage; + +/** + * /////***File must be copied in isis-database-3/ analyseplans/ + * File name : CalibrationEspeceq1q2Export.java + * /////*** File name could be modified if needed + * /////*** BUT class name must be identical to file name (without the extention ".java") see below + * + * Created: 17 septembre 2007 + * + * @author <> + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ + + +/////***You can modify class name if you want +/////***BUT attention : file name and class name must be the same (without the extention ".java"), ie here : "CalibrationEspeceq1q2Export" +public class CalibrationEspeceq1q2Export implements AnalysePlan { + + /** to use log facility, just put in your code: log.info("..."); */ + +/////***class name to check here + static private Log log = LogFactory.getLog(CalibrationEspeceq1q2Export.class); + + enum State {STATE_INIT, STATE_0, STATE_1, STATE_2, STATE_3, STATE_4}; + +/////***here must appear the path to export the historic file ("Historic.csv") where q1, q2 and criteria computed at each simulation are written +/////***Attention : before beginning a new calibration rename your eventual old file Historic.csv otherwise it will be lost + File exportHistoric = new File ("C:Documents and Settings/Sigrid/work/ISIS-FISH/Calibration/Historic.csv"); + protected String exportHisto = ""; + + +//initial points of the simplex + public Population param_Population = null; + public String param_M1 = "2.42e-5;2.11e-6";// devient un parametre du plan d analyse + public String param_M2 = "2.34e-5;2.59e-6";// devient un parametre du plan d analyse + public String param_M3 = "2.59e-5;2.41e-6";// devient un parametre du plan d analyse + //public String param_pas = "1e-5";// devient un parametre du plan d analyse +///// ***put here the path and name of the file containing the data on which you calibrate your fichery ( here observed catches) + public String param_nomfichier_debarquements = "Q:/work/ISIS-FISH/Simu/Calibration/Observedlandings2001-2003.csv";//in row : time ; in columns : age or length group + protected File debarquementsObserves; + protected MatrixND matrixDebarquement; + + protected State state = State.STATE_INIT; + public Experiences experiences = new Experiences(); + public String [] necessaryResult = { + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET + }; + + public String[] getNecessaryResult() { + return this.necessaryResult; + } + + /** + * Permet d'afficher a l'utilisateur une aide sur le plan. + * @return L'aide ou la description du plan + */ + public String getDescription() throws Exception { + return _("Calibration using variable step Simplex method (Walters): user gives a file of observations (here catches) by time step and group (.csv), output will try to approach oservations by changing the values of catchability"); + } + + /** + * Appele au demarrage de la simulation, cette methode permet d'initialiser + * des valeurs + * @param simulation La simulation pour lequel on utilise cette regle + */ + public void init(AnalysePlanContext context) throws Exception { + if (param_nomfichier_debarquements==null || "".equals(param_nomfichier_debarquements)){ + debarquementsObserves = FileUtil.getFile(".*.csv", "fichier csv s�parateur ';'"); + } else { + debarquementsObserves = new File(param_nomfichier_debarquements); + } + int nbYear = context.getParam().getNumberOfYear(); + + TopiaContext db = context.getParam().getRegion().getStorage().beginTransaction(); + Population pop = (Population)db.findByTopiaId(param_Population.getTopiaId()); + + /////*** specify dimention of the matrix containning observations (observed landings for instance) + /////*** numbers of group/columns : could be equal to your number of classes in ISIS but may also be different if your had only aggregated data + int nbGroup = 4 ; +/////*** enter number of observation per year (if you have observation by quarter put 4) / lines of the observations file + int nbTrim = nbYear * 4; + int [] dimMatrix = {nbTrim,nbGroup}; + matrixDebarquement = MatrixFactory.getInstance().create(dimMatrix); +//matrixDebarquement = MatrixFactory.getInstance().create(new int[]{nbGroup}); +// List<PopulationGroup> groups = pop.getPopulationGroup(); +// matrixDebarquement = MatrixFactory.getInstance().create(new List[]{groups}); + matrixDebarquement.importCSV(new FileReader(debarquementsObserves),new int []{0,0}); + log.info("MatrixDebarquement : " + matrixDebarquement); + db.closeContext(); + } + + /** + * Call before each simulation + * @param context plan context + * @param nextSimulation storage used for next simulation + * @return true if we must do next simulation, false to stop plan + * @throws Exception + */ + double g1; + double g2; + double worst1; + double worst2; + + public boolean beforeSimulation(AnalysePlanContext context, SimulationStorage nextSimulation) throws Exception { + boolean doNext = true; + boolean doBoucle = true; +log.info("before simulation"); + + int number = nextSimulation.getParameter().getAnalysePlanNumber(); + +if (number <3) { +log.info("number<3"); + + String [] M1 = param_M1.split(";"); + String [] M2 = param_M2.split(";"); + String [] M3 = param_M3.split(";"); + + double [] q1 = StringUtil.toArrayDouble(M1[0], M2[0], M3[0]); + double [] q2 = StringUtil.toArrayDouble(M1[1], M2[1], M3[1]); + experiences.getExperience(number).q1 = q1[number]; + experiences.getExperience(number).q2 = q2[number]; + + changeDB(experiences.getExperience(number), nextSimulation); + +} else { + + double q1 = 1000; + double q2 = 1000; + double lastCritere = experiences.getExperience(number-1).criteria; + while (doBoucle){ + doBoucle = false; + if (state == State.STATE_INIT) { +doBoucle = false ; +log.info("state init"); + +//ordonne les 3 premieres experiences selon leur critere +Collections.sort(experiences.current); +//log.info("SIMPLEXE : current 0 = " + experiences.current.get(0).criteria + "current 1 = " + experiences.current.get(1).criteria + "current 2 = " + experiences.current.get(2).criteria ); +log.info("SIMPLEXE : current 0 = " + experiences.current.get(0).criteria + "current 1 = " + experiences.current.get(1).criteria + "current 2 = " + experiences.current.get(2).criteria ); +log.info("SIMPLEXE : Best q1 = " + experiences.current.get(0).q1 + " q2 = " + experiences.current.get(0).q2); +log.info("SIMPLEXE : NextBest q1 = " + experiences.current.get(1).q1 + " q2 = " + experiences.current.get(1).q2); +log.info("SIMPLEXE : Worst q1 = " + experiences.current.get(2).q1 + " q2 = " + experiences.current.get(2).q2); + + +//Calcul et evaluation de R +double g1 = (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0; +double g2 = (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0; +double worst1 = experiences.current.get(2).q1; +double worst2 = experiences.current.get(2).q2; + +state = State.STATE_0; + + q1 = 2 * g1 - worst1; + q2 = 2 * g2 - worst2; + +log.info ("R : q1 = " + q1 + " q2 = " + q2 ); + + } else if (state == State.STATE_0) { +doBoucle = false; +log.info("state 0"); + + // on fait la 5eme avec des q qui dependent de la 4eme dans le dernier cas +//log.info("g1 = " + g1 + " " + "g2 = " + g2); +//log.info("worst1 = " + worst1 + " " + "worst2 = " + worst2); + + if (lastCritere > experiences.current.get(2).criteria) { +log.info("State 0 : R : lastCtritere > current2 : R pire de W"); + state = State.STATE_1; + //calcul de Cw + q1 = ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - ( ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - experiences.current.get(2).q1 ) / 2.0; + q2 = ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - ( ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - experiences.current.get(2).q2 ) / 2.0; +log.info("Cw : q1 = " + q1 + " q2 = " + q2); + + + } else if (lastCritere > experiences.current.get(1).criteria) { +log.info("State 0 :R : lastCritere > current 1 : R meilleur que W et moins bon que N"); + state = State.STATE_2; + // calcul de Cr + q1 = ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) + ( ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - experiences.current.get(2).q1 ) / 2.0; + q2 = ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) + ( ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - experiences.current.get(2).q2 ) / 2.0; +log.info("Cr : q1 = " + q1 + " q2 = " + q2); + + } else if (lastCritere > experiences.current.get(0).criteria) { +log.info("State 0 :R : lastCritere > current0 : R meilleur que N et moins bon que B"); + state = State.STATE_INIT; + experiences.current.remove(2);//remove(3)avant + doBoucle = true; +log.info("remove W, simplex BNR"); + + } else { // dernier cas possible: if (lastCritere < experiences.current.get(0).critere) { +log.info("State 0 :R : lastCritere < current 0 : R meilleur que B, calcul de E"); + state = State.STATE_4; + + q1 = experiences.getExperience(number-1).q1 + (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0 - experiences.current.get(2).q1; + q2 = experiences.getExperience(number-1).q2 + (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0 - experiences.current.get(2).q2; + //q1 = experiences.current.get(3).q1 + (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0 - experiences.current.get(2).q1; + //q2 = experiences.current.get(3).q2 + (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0 - experiences.current.get(2).q2; +log.info("E : q1 = " + q1 + " q2 = " + q2); + } + + } else if (state == State.STATE_1) { +log.info("state 1, simplex BNCw"); + experiences.current.remove(3); + experiences.current.remove(2); + state = State.STATE_INIT; + doBoucle = true; + + + } else if (state == State.STATE_2) { +log.info("state 2, simplex BNCr"); + experiences.current.remove(3); + experiences.current.remove(2); + state = State.STATE_INIT; + doBoucle = true; + + + } else if (state == State.STATE_4) { +log.info("state 4 :comparaison de E a B"); + doBoucle = true; + if (lastCritere < experiences.current.get(0).criteria) { +log.info("E meilleur que B, remove 2 et 3 : simplex BNE"); + experiences.current.remove(3); + experiences.current.remove(2); + } else { +log.info("E moins bon que B, remove 2 et 4, simplex BNR"); + experiences.current.remove(4); + experiences.current.remove(2); + } + + state = State.STATE_INIT; + } + + +}//fin du while +//on remplit la table experiences + experiences.getExperience(number).q1 = q1; + experiences.getExperience(number).q2 = q2; + +log.info("on change Q dans la DB avec : q1 = " + q1 + " " + "q2 = " + q2); + +// on change la valeur de q dans la DB + changeDB(experiences.getExperience(number), nextSimulation); + }// fin du else (number > 3) +return doNext; + }// fin du before simulation + + + + /** + + * Call after each simulation, compute criteria for last simulation + * @param context plan context + * @param nextSimulation storage used for next simulation + * @return true if we must do next simulation, false to stop plan + * @throws Exception + */ + + public boolean afterSimulation(AnalysePlanContext context, SimulationStorage lastSimulation) throws Exception { + boolean doNext = true; +log.info("after simulation"); + int number = lastSimulation.getParameter().getAnalysePlanNumber(); + ResultStorage result = lastSimulation.getResultStorage(); + +/////*** Simulated catches are cumulated over strategies, areas and metiers + + MatrixND L2 = result.getMatrix(param_Population, ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); +// log.info("dim de L2" + " " + Arrays.toString(L2.getDim())); +/////*** If some strategies, metiers or areas must not be included in the cumulated catches see below else put "//" at the beginning of line 297 and replace "L2" by "L" at line 289 +/////*** the strategies or so to exclude must be at the begining or end of the list you enter in the parameters interface +/////*** fill the line MatrixND L = L2.getSubMatrix(a,b,c).copy(); as follow : +/////*** a = 1 if you want to exclude strategies, 2 if metiers and 4 if areas +/////*** b = indice of the first object considered +/////*** c = number of object to keep after b, b included + MatrixND L = L2.getSubMatrix(1,2,4).copy(); // for instance : keep strategies 2,3,4,5 +//log.info("sous matrice extraite"); + L = L.sumOverDim(1);// sum over strategies + L = L.sumOverDim(2);// sum over metiers + L = L.sumOverDim(4);// sum over zones +log.info("sommes sur les strategies, metiers et zones faites"); + +/////*** if observations are cumulated by groups else put "//" at the beginning of the following line +L = L.sumOverDim(3); +/////*** else if number of groups in your database differs from number of groups in observations ... write me an e-mail + +////*** if observations are cumulated over quarter a = 3, over year a = 12, else put "//" at the beginning of the following line + L = L.sumOverDim(0,a); + + L = L.reduce(); + + +///////////////////Calcul du critere////////////////// +log.info("calcul du critere"); +log.info("dim de L" + " " + Arrays.toString(L.getDim())); +log.info("dim de obs" + " " + Arrays.toString(matrixDebarquement.getDim())); + double crit = 0; + for ( MatrixIterator g = L.iterator(); g.hasNext();){ + g.next(); +//boucle sur les trimestres et les classes d age + + int [] dim = g.getCoordinates(); + + double obs = matrixDebarquement.getValue(dim); + double simules = g.getValue(); + + crit += Math.pow(obs-simules, 2); // crit = crit + (obs-simules)^2 + }// fin du for +log.info("critere " + number + " = " + crit ); + +//ajoute le critere dans la table experiences + experiences.getExperience(number).criteria = crit; + +//ecriture de la table historic +exportHisto += experiences.getExperience(number).q1 +";"+ experiences.getExperience(number).q2 +";"+ experiences.getExperience(number).criteria + "\n"; +org.codelutin.util.FileUtil.writeString(exportHistoric, exportHisto); + + +return doNext; + +}// fin du after simulation + + /** + * Modify nextSimulation database with q1 and q2 in exp. + * @param exp + * @param nextSimulation + * @throws Exception + */ + + + protected void changeDB(Experience exp, SimulationStorage nextSimulation) throws Exception { +//methode appelee dans before simualtion + TopiaContext db = nextSimulation.getStorage().beginTransaction();//ouvrir un context pour modifier les donnees + Population pop = (Population)db.findByTopiaId(param_Population.getTopiaId()); //reccupere la pop ciblee + MatrixND c = pop.getCapturability(); // reccupere la matrice de capturabilit� + +//log.info("Pour cette simulation : q1 = " + exp.q1 + ";" + "q2 = " + exp.q2 ); + +/////*** that is where you explain how to fill the catchability matrix with q1 and q2 + for (MatrixIterator i = c.iterator(); i.hasNext();){ + i.next(); + Object [] sem = i.getSemanticsCoordinates(); + PopulationGroup group = (PopulationGroup)sem[0]; + PopulationSeasonInfo season = (PopulationSeasonInfo)sem[1]; + +////*** exemple when q2 corresponds to the 12 first groups (groups 0 to 11) + if (group.getId() < 12){ + i.setValue(exp.q2); + }else { + i.setValue(exp.q1); + } + +/////*** exemple when it depends on seasons and groups +/* if (season.getFirstMonth().after(Month.JULY) && group.getId() >=18){ //month >= aout && groupID >= 18 + i.setValue(exp.q2); + }else { + i.setValue(exp.q1); + } +*/ + + }//fin du for + + db.commitTransaction(); // effectue la modification + db.closeContext(); // ferme le context +} + + + + + static public class Experiences { +// cree la liste experiences ou sont stoqu�s q1,q2 et critere pour chaque simulation + + /** contains last simplex and potentialy 2 more simulation */ + public List<Experience> current = new ArrayList<Experience>(); + + /** contains all experience done */ + public List<Experience> history = new ArrayList<Experience>(); + /** + * return experience requested, if this experience doesn't exist + * create it. + * + * @param i simulation number + * @return experience with simulation number fixed if new experience + * is returned + */ + public Experience getExperience(int i) { + Experience result; + if (i<history.size()) { + result = history.get(i); + } else { + result = new Experience(); + result.simNumber = i; + history.add(i, result); + current.add(result); + } + return result; + }//fin de la definition de getExperience + + +/** + * @return the history + */ + public List<Experience> getHistory() { + return this.history; + } + }// fin de la creation des listes experiences + + + + static public class Experience implements Comparable { + public int simNumber; + public double criteria; + public double q1; + public double q2; + /** + * Permit to order experience, first is experience with smallest criteria + */ + public int compareTo(Object arg0) { + Experience other = (Experience)arg0; + int result = Double.compare(this.criteria, other.criteria); + return result; + } + } + + +} Modified: trunk/src/site/resources/v4/downloads/prixAnchois.java =================================================================== --- trunk/src/site/resources/v4/downloads/prixAnchois.java 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/resources/v4/downloads/prixAnchois.java 2012-11-07 11:33:53 UTC (rev 101) @@ -1,3 +1,26 @@ +/* + * #%L + * IsisFish + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ Date date = context.getSimulationControl().getDate() ; Population pop = group.getPopulation() ; String name = "matrixCatchWeightPerStrategyMetPerZonePop" ; Modified: trunk/src/site/rst/contact.rst =================================================================== --- trunk/src/site/rst/contact.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/contact.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -1,7 +1,7 @@ .. - .. * #%L .. * IsisFish -.. * +.. * .. * $Id$ .. * $HeadURL$ .. * %% @@ -9,17 +9,17 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 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 +.. * +.. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -100,4 +100,4 @@ .. _Roadmap: http://forge.codelutin.com/projects/isis-fish/roadmap .. _isis-fish-devel@list.isis-fish.org: http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-devel .. _isis-fish-bugreport@list.isis-fish.org: http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-bugreport -.. _isis-fish-commits@list.isis-fish.org: http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits \ No newline at end of file +.. _isis-fish-commits@list.isis-fish.org: http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits Modified: trunk/src/site/rst/download.rst =================================================================== --- trunk/src/site/rst/download.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/download.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -57,12 +57,6 @@ .. _Base BoB Anchovy: downloads/DataBaseAnchovyBoBHindcast_commented.zip -Base Pelagic fishery of the Bay of Biscay ------------------------------------------ -`Base Pelagic BoB`_ -.. _Base BoB Anchovy: - - ISIS-Fish (Version R) --------------------- Modified: trunk/src/site/rst/history/changelog.rst =================================================================== --- trunk/src/site/rst/history/changelog.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/history/changelog.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/history/history.rst =================================================================== --- trunk/src/site/rst/history/history.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/history/history.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/history.rst =================================================================== --- trunk/src/site/rst/history.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/history.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -45,4 +45,4 @@ .. _Version 1: v1/changelog.html .. _Version 2: v2/index.html .. _Version 3: v3/index.html - \ No newline at end of file + Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/index.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/license.rst =================================================================== --- trunk/src/site/rst/license.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/license.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -1,25 +1,25 @@ .. - .. * #%L .. * IsisFish -.. * +.. * .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 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 +.. * +.. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -28,283 +28,677 @@ :: - 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. - - GNU GENERAL PUBLIC LICENSE - 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 + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for + software and other kinds of works. + + The licenses for most software and other practical works are designed + to take away your freedom to share and change the works. By contrast, + the GNU General Public License is intended to guarantee your freedom to + share and change all versions of a program--to make sure it remains free + software for all its users. We, the Free Software Foundation, use the + GNU General Public License for most of our software; it applies also to + any other work released this way by its authors. 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 + them 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 prevent others from denying you + these rights or asking you to surrender the rights. Therefore, you have + certain responsibilities if you distribute copies of the software, or if + you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether + gratis or for a fee, you must pass on to the recipients the same + freedoms that you received. 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. + + Developers that use the GNU GPL protect your rights with two steps: + (1) assert copyright on the software, and (2) offer you this License + giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains + that there is no warranty for this free software. For both users' and + authors' sake, the GPL requires that modified versions be marked as + changed, so that their problems will not be attributed erroneously to + authors of previous versions. + + Some devices are designed to deny users access to install or run + modified versions of the software inside them, although the manufacturer + can do so. This is fundamentally incompatible with the aim of + protecting users' freedom to change the software. The systematic + pattern of such abuse occurs in the area of products for individuals to + use, which is precisely where it is most unacceptable. Therefore, we + have designed this version of the GPL to prohibit the practice for those + products. If such problems arise substantially in other domains, we + stand ready to extend this provision to those domains in future versions + of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. + States should not allow patents to restrict development and use of + software on general-purpose computers, but in those that do, we wish to + avoid the special danger that patents applied to a free program could + make it effectively proprietary. To prevent this, the GPL assures that + patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and + modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of + works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this + License. Each licensee is addressed as "you". "Licensees" and + "recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work + in a fashion requiring copyright permission, other than the making of an + exact copy. The resulting work is called a "modified version" of the + earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based + on the Program. + + To "propagate" a work means to do anything with it that, without + permission, would make you directly or secondarily liable for + infringement under applicable copyright law, except executing it on a + computer or modifying a private copy. Propagation includes copying, + distribution (with or without modification), making available to the + public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other + parties to make or receive copies. Mere interaction with a user through + a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" + to the extent that it includes a convenient and prominently visible + feature that (1) displays an appropriate copyright notice, and (2) + tells the user that there is no warranty for the work (except to the + extent that warranties are provided), that licensees may convey the + work under this License, and how to view a copy of this License. If + the interface presents a list of user commands or options, such as a + menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work + for making modifications to it. "Object code" means any non-source + form of a work. + + A "Standard Interface" means an interface that either is an official + standard defined by a recognized standards body, or, in the case of + interfaces specified for a particular programming language, one that + is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other + than the work as a whole, that (a) is included in the normal form of + packaging a Major Component, but which is not part of that Major + Component, and (b) serves only to enable use of the work with that + Major Component, or to implement a Standard Interface for which an + implementation is available to the public in source code form. A + "Major Component", in this context, means a major essential component + (kernel, window system, and so on) of the specific operating system + (if any) on which the executable work runs, or a compiler used to + produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all + the source code needed to generate, install, and (for an executable + work) run the object code and to modify the work, including scripts to + control those activities. However, it does not include the work's + System Libraries, or general-purpose tools or generally available free + programs which are used unmodified in performing those activities but + which are not part of the work. For example, Corresponding Source + includes interface definition files associated with source files for + the work, and the source code for shared libraries and dynamically + linked subprograms that the work is specifically designed to require, + such as by intimate data communication or control flow between those + subprograms and other parts of the work. + + The Corresponding Source need not include anything that users + can regenerate automatically from other parts of the Corresponding + Source. + + The Corresponding Source for a work in source code form is that + same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of + copyright on the Program, and are irrevocable provided the stated + conditions are met. This License explicitly affirms your unlimited + permission to run the unmodified Program. The output from running a + covered work is covered by this License only if the output, given its + content, constitutes a covered work. This License acknowledges your + rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not + convey, without conditions so long as your license otherwise remains + in force. You may convey covered works to others for the sole purpose + of having them make modifications exclusively for you, or provide you + with facilities for running those works, provided that you comply with + the terms of this License in conveying all material for which you do + not control copyright. Those thus making or running the covered works + for you must do so exclusively on your behalf, under your direction + and control, on terms that prohibit them from making any copies of + your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under + the conditions stated below. Sublicensing is not allowed; section 10 + makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological + measure under any applicable law fulfilling obligations under article + 11 of the WIPO copyright treaty adopted on 20 December 1996, or + similar laws prohibiting or restricting circumvention of such + measures. + + When you convey a covered work, you waive any legal power to forbid + circumvention of technological measures to the extent such circumvention + is effected by exercising rights under this License with respect to + the covered work, and you disclaim any intention to limit operation or + modification of the work as a means of enforcing, against the work's + users, your or third parties' legal rights to forbid circumvention of + technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; + keep intact all notices stating that this License and any + non-permissive terms added in accord with section 7 apply to the code; + keep intact all notices of the absence of any warranty; and give all + recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, + and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to + produce it from the Program, in the form of source code under the + terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent + works, which are not by their nature extensions of the covered work, + and which are not combined with it such as to form a larger program, + in or on a volume of a storage or distribution medium, is called an + "aggregate" if the compilation and its resulting copyright are not + used to limit the access or legal rights of the compilation's users + beyond what the individual works permit. Inclusion of a covered work + in an aggregate does not cause this License to apply to the other + parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms + of sections 4 and 5, provided that you also convey the + machine-readable Corresponding Source under the terms of this License, + in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded + from the Corresponding Source as a System Library, need not be + included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any + tangible personal property which is normally used for personal, family, + or household purposes, or (2) anything designed or sold for incorporation + into a dwelling. In determining whether a product is a consumer product, + doubtful cases shall be resolved in favor of coverage. For a particular + product received by a particular user, "normally used" refers to a + typical or common use of that class of product, regardless of the status + of the particular user or of the way in which the particular user + actually uses, or expects or is expected to use, the product. A product + is a consumer product regardless of whether the product has substantial + commercial, industrial or non-consumer uses, unless such uses represent + the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, + procedures, authorization keys, or other information required to install + and execute modified versions of a covered work in that User Product from + a modified version of its Corresponding Source. The information must + suffice to ensure that the continued functioning of the modified object + code is in no case prevented or interfered with solely because + modification has been made. + + If you convey an object code work under this section in, or with, or + specifically for use in, a User Product, and the conveying occurs as + part of a transaction in which the right of possession and use of the + User Product is transferred to the recipient in perpetuity or for a + fixed term (regardless of how the transaction is characterized), the + Corresponding Source conveyed under this section must be accompanied + by the Installation Information. But this requirement does not apply + if neither you nor any third party retains the ability to install + modified object code on the User Product (for example, the work has + been installed in ROM). + + The requirement to provide Installation Information does not include a + requirement to continue to provide support service, warranty, or updates + for a work that has been modified or installed by the recipient, or for + the User Product in which it has been modified or installed. Access to a + network may be denied when the modification itself materially and + adversely affects the operation of the network or violates the rules and + protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, + in accord with this section must be in a format that is publicly + documented (and with an implementation available to the public in + source code form), and must require no special password or key for + unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this + License by making exceptions from one or more of its conditions. + Additional permissions that are applicable to the entire Program shall + be treated as though they were included in this License, to the extent + that they are valid under applicable law. If additional permissions + apply only to part of the Program, that part may be used separately + under those permissions, but the entire Program remains governed by + this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option + remove any additional permissions from that copy, or from any part of + it. (Additional permissions may be written to require their own + removal in certain cases when you modify the work.) You may place + additional permissions on material, added by you to a covered work, + for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you + add to a covered work, you may (if authorized by the copyright holders of + that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further + restrictions" within the meaning of section 10. If the Program as you + received it, or any part of it, contains a notice stating that it is + governed by this License along with a term that is a further + restriction, you may remove that term. If a license document contains + a further restriction but permits relicensing or conveying under this + License, you may add to a covered work material governed by the terms + of that license document, provided that the further restriction does + not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you + must place, in the relevant source files, a statement of the + additional terms that apply to those files, or a notice indicating + where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the + form of a separately written license, or stated as exceptions; + the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly + provided under this License. Any attempt otherwise to propagate or + modify it is void, and will automatically terminate your rights under + this License (including any patent licenses granted under the third + paragraph of section 11). + + However, if you cease all violation of this License, then your + license from a particular copyright holder is reinstated (a) + provisionally, unless and until the copyright holder explicitly and + finally terminates your license, and (b) permanently, if the copyright + holder fails to notify you of the violation by some reasonable means + prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is + reinstated permanently if the copyright holder notifies you of the + violation by some reasonable means, this is the first time you have + received notice of violation of this License (for any work) from that + copyright holder, and you cure the violation prior to 30 days after + your receipt of the notice. + + Termination of your rights under this section does not terminate the + licenses of parties who have received copies or rights from you under + this License. If your rights have been terminated and not permanently + reinstated, you do not qualify to receive new licenses for the same + material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or + run a copy of the Program. Ancillary propagation of a covered work + occurring solely as a consequence of using peer-to-peer transmission + to receive a copy likewise does not require acceptance. However, + nothing other than this License grants you permission to propagate or + modify any covered work. These actions infringe copyright if you do + not accept this License. Therefore, by modifying or propagating a + covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically + receives a license from the original licensors, to run, modify and + propagate that work, subject to this License. You are not responsible + for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an + organization, or substantially all assets of one, or subdividing an + organization, or merging organizations. If propagation of a covered + work results from an entity transaction, each party to that + transaction who receives a copy of the work also receives whatever + licenses to the work the party's predecessor in interest had or could + give under the previous paragraph, plus a right to possession of the + Corresponding Source of the work from the predecessor in interest, if + the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the + rights granted or affirmed under this License. For example, you may + not impose a license fee, royalty, or other charge for exercise of + rights granted under this License, and you may not initiate litigation + (including a cross-claim or counterclaim in a lawsuit) alleging that + any patent claim is infringed by making, using, selling, offering for + sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this + License of the Program or a work on which the Program is based. The + work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims + owned or controlled by the contributor, whether already acquired or + hereafter acquired, that would be infringed by some manner, permitted + by this License, of making, using, or selling its contributor version, + but do not include claims that would be infringed only as a + consequence of further modification of the contributor version. For + purposes of this definition, "control" includes the right to grant + patent sublicenses in a manner consistent with the requirements of + this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free + patent license under the contributor's essential patent claims, to + make, use, sell, offer for sale, import and otherwise run, modify and + propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express + agreement or commitment, however denominated, not to enforce a patent + (such as an express permission to practice a patent or covenant not to + sue for patent infringement). To "grant" such a patent license to a + party means to make such an agreement or commitment not to enforce a + patent against the party. + + If you convey a covered work, knowingly relying on a patent license, + and the Corresponding Source of the work is not available for anyone + to copy, free of charge and under the terms of this License, through a + publicly available network server or other readily accessible means, + then you must either (1) cause the Corresponding Source to be so + available, or (2) arrange to deprive yourself of the benefit of the + patent license for this particular work, or (3) arrange, in a manner + consistent with the requirements of this License, to extend the patent + license to downstream recipients. "Knowingly relying" means you have + actual knowledge that, but for the patent license, your conveying the + covered work in a country, or your recipient's use of the covered work + in a country, would infringe one or more identifiable patents in that + country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or + arrangement, you convey, or propagate by procuring conveyance of, a + covered work, and grant a patent license to some of the parties + receiving the covered work authorizing them to use, propagate, modify + or convey a specific copy of the covered work, then the patent license + you grant is automatically extended to all recipients of the covered + work and works based on it. + + A patent license is "discriminatory" if it does not include within + the scope of its coverage, prohibits the exercise of, or is + conditioned on the non-exercise of one or more of the rights that are + specifically granted under this License. You may not convey a covered + work if you are a party to an arrangement with a third party that is + in the business of distributing software, under which you make payment + to the third party based on the extent of your activity of conveying + the work, and under which the third party grants, to any of the + parties who would receive the covered work from you, a discriminatory + patent license (a) in connection with copies of the covered work + conveyed by you (or copies made from those copies), or (b) primarily + for and in connection with specific products or compilations that + contain the covered work, unless you entered into that arrangement, + or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting + any implied license or other defenses to infringement that may + otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a + covered work so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you may + not convey it at all. For example, if you agree to terms that obligate you + to collect a royalty for further conveying from those to whom you convey + the Program, the only way you could satisfy both those terms and this + License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have + permission to link or combine any covered work with a work licensed + under version 3 of the GNU Affero General Public License into a single + combined work, and to convey the resulting work. The terms of this + License will continue to apply to the part which is the covered work, + but the special requirements of the GNU Affero General Public License, + section 13, concerning interaction through a network will apply to the + combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of + the GNU 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 that a certain numbered version of the GNU General + Public License "or any later version" applies to it, you have the + option of following the terms and conditions either of that numbered + version or of any later version published by the Free Software + Foundation. If the Program does not specify a version number of the + GNU General Public License, you may choose any version ever published + by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future + versions of the GNU General Public License can be used, that proxy's + public statement of acceptance of a version permanently authorizes you + to choose that version for the Program. + + Later license versions may give you additional or different + permissions. However, no additional obligations are imposed on any + author or copyright holder as a result of your choosing to follow a + later version. + + 15. Disclaimer of Warranty. + + 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. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS + 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. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided + above cannot be given local legal effect according to their terms, + reviewing courts shall apply local law that most closely approximates + an absolute waiver of all civil liability in connection with the + Program, unless a warranty or assumption of liability accompanies a + copy of the Program in return for a fee. + + 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 + state 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 a brief idea of what it does.> + Copyright (C) <year> <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 3 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, see <http://www.gnu.org/licenses/>. + + Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short + notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program 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, your program's commands + might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, + if any, to sign a "copyright disclaimer" for the program, if necessary. + For more information on this, and how to apply and follow the GNU GPL, see + <http://www.gnu.org/licenses/>. + + The GNU 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 instead of this License. But first, please read + <http://www.gnu.org/philosophy/why-not-lgpl.html>. Modified: trunk/src/site/rst/listStats.rst =================================================================== --- trunk/src/site/rst/listStats.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/listStats.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -102,4 +102,4 @@ * 2008: 2479 * 2009: 4348 -Total : 12009 \ No newline at end of file +Total : 12009 Modified: trunk/src/site/rst/news.rst =================================================================== --- trunk/src/site/rst/news.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/news.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -31,7 +31,7 @@ 2012 ---- -- ** *6-7 décembre 2012* : Séminaire Utilisateurs ISIS-Fish - Nantes, FRANCE, INSCRIPTION_ ** +- ***6-7 décembre 2012* : Séminaire Utilisateurs ISIS-Fish - Nantes, FRANCE, INSCRIPTION_** - *17-21 septembre 212* : `Conference annuelle du CIEM - Bergen`_ , Norvège - *4-8 juin 2012* : `Ecole Chercheur 2012`_ Analyse de sensibilité, Atelier ISIS-Fish (Lyon) - *23-26 avril 2012* : Participation à la réunion de démarrage du projet européen MYFISH_ , Vigo ESPAGNE @@ -84,4 +84,4 @@ .. _Conference annuelle du CIEM - Halifax: http://www.ices.dk/iceswork/asc/2008/index.asp .. _Groupe de travail CIEM: http://www.ices.dk/workinggroups/ViewWorkingGroup.aspx?ID=345 .. _Mexico: http://reseau-mexico.fr/welcome -.. _Forum Halieumétrique 2011: http://halieutique.agrocampus-ouest.fr/afh/index.html \ No newline at end of file +.. _Forum Halieumétrique 2011: http://halieutique.agrocampus-ouest.fr/afh/index.html Modified: trunk/src/site/rst/othertools.rst =================================================================== --- trunk/src/site/rst/othertools.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/othertools.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -43,4 +43,4 @@ .. _Utilisation-Installation de Netbeans: tools/netbeans.html .. _Eclipse: http://www.eclipse.org .. _Netbeans: http://www.netbeans.org/ -.. _Notepad++: http://notepad-plus-plus.org/download/ \ No newline at end of file +.. _Notepad++: http://notepad-plus-plus.org/download/ Modified: trunk/src/site/rst/presentation.rst =================================================================== --- trunk/src/site/rst/presentation.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/presentation.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -51,4 +51,4 @@ * Irin (Institut de Recherche en Informatique de Nantes) * Cogitec ( http://www.cogitec.fr ) - * Code Lutin ( http://www.codelutin.com ) \ No newline at end of file + * Code Lutin ( http://www.codelutin.com ) Modified: trunk/src/site/rst/publications.rst =================================================================== --- trunk/src/site/rst/publications.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/publications.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -32,16 +32,16 @@ ===== ======================================================================================================================================================================================================================================================================================================================================================================================================================================================== ============================================================================================== =========================================================== Année Publication Téléchargement Publication originale ===== ======================================================================================================================================================================================================================================================================================================================================================================================================================================================== ============================================================================================== =========================================================== -2011 **Hussein, C.**, M.Verdoit-Jarraya, J.Pastor, A.Ibrahim, G.Saragoni, D.Pelletier, S. Mahévas, P.Lenfant, 2011. 'Assessing the impact of artisanal and recreational fishing and protection on a white seabream (Diplodus sargussargus) population in the north-western Mediterranean Sea using a simulation model. Part2: Sensitivity analysis and management measures.' **Fisheries Research** 108, Issue 1, Pages 174-183 `Ici <https://w3.ifremer.fr/archimer/doc/00030/14115/11337.pdf>`_ `Fisheries research <http://www.journals.elsevier.com/fisheries-research/>`_ -2011 **Hussein, C.**, M.Verdoit-Jarraya, J.Pastor, A.Ibrahim, G.Saragoni, D.Pelletier, S. Mahévas, P.Lenfant (2011) 'Assessing the impact of artisanal and recreational fishing and protection on a white seabream (Diplodus sargussargus) population in the north-western Mediterranean Sea using a simulation model. Part1: Parameterization and simulations.' **Fisheries Research** 108, Issue 1, Pages 163-173 `Ici <https://w3.ifremer.fr/archimer/doc/00030/14114/11351.pdf>`_ `Fisheries research <http://www.journals.elsevier.com/fisheries-research/>`_ -2011 **Marchal, P.**, Little, L.R., and Thébaud, O., 2011. 'Quota allocation in mixed-fisheries: a bioeconomic modelling approach applied to the Channel flatfish fisheries.' **ICES Journal of Marine Science**, 68, 1580–1591. `Ici <https://w3.ifremer.fr/archimer/doc/00044/15492/12971.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ -2010 **Lehuta, S.**, Mahévas, S., Petitgas, P. et Pelletier, D., 2010. 'Combining sensitivity and uncertainty analysis to evaluate the impact of management measures with ISIS–Fish: marine protected areas for the Bay of Biscay anchovy(Engraulis encrasicolus) fishery. **ICES journal of Marine science** 67:1063-1075. `Ici <http://archimer.ifremer.fr/doc/00011/12234/9281.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ -2009 **Marchal, P.**, Francis, C., Lallemand, P., Lehuta, S., Mahévas, S., Stokes, K. & Vermard,Y., 2009. 'Catch-quota balancing in mixed-fisheries: a bio-economic modelling approach applied to the New Zealand hoki (Macruronus novaezelandiae) fishery' . **Aquatic Living Resource** 22:483-498. `Ici <http://archimer.ifremer.fr/doc/00000/11168/7521.pdf>`_ `ALR <http://www.alr-journal.org/>`_ -2009 **Pelletier, D.** , Mahévas, S., Drouineau, H., Vermard, Y., Thebaud, O., Guyader,O. & Poussin, B., 2009. 'Evaluation of the bioeconomic sustainability of multi-species multi-fleet fisheries under a wide range of policy options using ISIS-Fish.' **Ecological Modelling** 220 (7): pp. 1013-1033. `Ici <http://archimer.ifremer.fr/doc/2009/publication-6782.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ -2009 **Kraus, G.** , Pelletier, D., Dubreuil, J., Moellmann, C., Hinrichsen, H., Bastardie, F., Vermard,Y. & Mahévas, S., 2009. 'A model-based evaluation of Marine Protected Areas as fishery management tool for a stock facing strong environmental variability - the example of Eastern Baltic cod (Gadus morhua callarias L.).' **ICES Journal of Marine Science** 66: pp. 109-121. `Ici <http://archimer.ifremer.fr/doc/2009/publication-6094.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ -2006 **Drouineau, H.** , S. Mahévas, D. Pelletier, B. Beliaeff. 'Assessing the impact of different management options using ISIS-Fish: the French Merluccius merluccius – Nephrops norvegicus mixed fishery of the Bay of Biscay.' **Aquat. Living Resour.** 19, 15–29 `Ici <http://archimer.ifremer.fr/doc/2006/publication-1340.pdf>`_ `ALR <http://www.alr-journal.org/>`_ -2005 **Pelletier, D.** & S. Mahévas. 'Fisheries simulation models for evaluating the impact of management policies, with emphasis on marine protected areas.' **Fish and Fisheries** ; 6 (4) : 307-349. `Ici <http://archimer.ifremer.fr/doc/2005/publication-1031.pdf>`_ `Fish and Fisheries <http://www.blackwellpublishing.com/>`_ -2004 **Mahévas, S.** & D. Pelletier, 2004. 'ISIS-Fish, a generic and spatially-explicit simulation tool for evaluating the impact of management measures on fisheries dynamics.' **Ecological Modelling** 171, 65-84. `Ici <http://archimer.ifremer.fr/doc/2004/publication-1133.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ +2011 **Hussein, C.**, M.Verdoit-Jarraya, J.Pastor, A.Ibrahim, G.Saragoni, D.Pelletier, S. Mahévas, P.Lenfant, 2011. 'Assessing the impact of artisanal and recreational fishing and protection on a white seabream (Diplodus sargussargus) population in the north-western Mediterranean Sea using a simulation model. Part2: Sensitivity analysis and management measures.' **Fisheries Research** 108, Issue 1, Pages 174-183 `Ici <https://w3.ifremer.fr/archimer/doc/00030/14115/11337.pdf>`__ `Fisheries research <http://www.journals.elsevier.com/fisheries-research/>`_ +2011 **Hussein, C.**, M.Verdoit-Jarraya, J.Pastor, A.Ibrahim, G.Saragoni, D.Pelletier, S. Mahévas, P.Lenfant (2011) 'Assessing the impact of artisanal and recreational fishing and protection on a white seabream (Diplodus sargussargus) population in the north-western Mediterranean Sea using a simulation model. Part1: Parameterization and simulations.' **Fisheries Research** 108, Issue 1, Pages 163-173 `Ici <https://w3.ifremer.fr/archimer/doc/00030/14114/11351.pdf>`__ `Fisheries research <http://www.journals.elsevier.com/fisheries-research/>`_ +2011 **Marchal, P.**, Little, L.R., and Thébaud, O., 2011. 'Quota allocation in mixed-fisheries: a bioeconomic modelling approach applied to the Channel flatfish fisheries.' **ICES Journal of Marine Science**, 68, 1580–1591. `Ici <https://w3.ifremer.fr/archimer/doc/00044/15492/12971.pdf>`__ `sciencedirect <http://www.sciencedirect.com/>`_ +2010 **Lehuta, S.**, Mahévas, S., Petitgas, P. et Pelletier, D., 2010. 'Combining sensitivity and uncertainty analysis to evaluate the impact of management measures with ISIS–Fish: marine protected areas for the Bay of Biscay anchovy(Engraulis encrasicolus) fishery. **ICES journal of Marine science** 67:1063-1075. `Ici <http://archimer.ifremer.fr/doc/00011/12234/9281.pdf>`__ `sciencedirect <http://www.sciencedirect.com/>`_ +2009 **Marchal, P.**, Francis, C., Lallemand, P., Lehuta, S., Mahévas, S., Stokes, K. & Vermard,Y., 2009. 'Catch-quota balancing in mixed-fisheries: a bio-economic modelling approach applied to the New Zealand hoki (Macruronus novaezelandiae) fishery' . **Aquatic Living Resource** 22:483-498. `Ici <http://archimer.ifremer.fr/doc/00000/11168/7521.pdf>`__ `ALR <http://www.alr-journal.org/>`_ +2009 **Pelletier, D.** , Mahévas, S., Drouineau, H., Vermard, Y., Thebaud, O., Guyader,O. & Poussin, B., 2009. 'Evaluation of the bioeconomic sustainability of multi-species multi-fleet fisheries under a wide range of policy options using ISIS-Fish.' **Ecological Modelling** 220 (7): pp. 1013-1033. `Ici <http://archimer.ifremer.fr/doc/2009/publication-6782.pdf>`__ `sciencedirect <http://www.sciencedirect.com/>`_ +2009 **Kraus, G.** , Pelletier, D., Dubreuil, J., Moellmann, C., Hinrichsen, H., Bastardie, F., Vermard,Y. & Mahévas, S., 2009. 'A model-based evaluation of Marine Protected Areas as fishery management tool for a stock facing strong environmental variability - the example of Eastern Baltic cod (Gadus morhua callarias L.).' **ICES Journal of Marine Science** 66: pp. 109-121. `Ici <http://archimer.ifremer.fr/doc/2009/publication-6094.pdf>`__ `sciencedirect <http://www.sciencedirect.com/>`_ +2006 **Drouineau, H.** , S. Mahévas, D. Pelletier, B. Beliaeff. 'Assessing the impact of different management options using ISIS-Fish: the French Merluccius merluccius – Nephrops norvegicus mixed fishery of the Bay of Biscay.' **Aquat. Living Resour.** 19, 15–29 `Ici <http://archimer.ifremer.fr/doc/2006/publication-1340.pdf>`__ `ALR <http://www.alr-journal.org/>`_ +2005 **Pelletier, D.** & S. Mahévas. 'Fisheries simulation models for evaluating the impact of management policies, with emphasis on marine protected areas.' **Fish and Fisheries** ; 6 (4) : 307-349. `Ici <http://archimer.ifremer.fr/doc/2005/publication-1031.pdf>`__ `Fish and Fisheries <http://www.blackwellpublishing.com/>`_ +2004 **Mahévas, S.** & D. Pelletier, 2004. 'ISIS-Fish, a generic and spatially-explicit simulation tool for evaluating the impact of management measures on fisheries dynamics.' **Ecological Modelling** 171, 65-84. `Ici <http://archimer.ifremer.fr/doc/2004/publication-1133.pdf>`__ `sciencedirect <http://www.sciencedirect.com/>`_ 2001 **Pelletier, D.** , S. Mahévas, B. Poussin, J. Bayon, P. André and J.C. Royer. 2001. 'A conceptual model for evaluating the impact of spatial management measures on the dynamics of a mixed fishery', pp. 53-66 In : G. H. Kruse, N. Bez, T. Booth, M. Dorn, S. Hills, R. Lipcius, D. Pelletier, C. Roy, S. Smith, & D. Witherell (eds), Spatial Processes and Management of Marine Populations. University of Alaska Sea Grant, AK-SG-00-04, Fairbanks ===== ======================================================================================================================================================================================================================================================================================================================================================================================================================================================== ============================================================================================== =========================================================== @@ -124,9 +124,9 @@ Période Etudiant Ecole Doctorale Titre Téléchargement ========= ========================== =========================================================================================== ================================================================================================================================================================================================= ============================================================= 2011 Hussein Chirine École Pratique des Hautes Études, Mention Systèmes Intégrés, Environnement et Biodiversité. Modélisation de l’impact de la pêche et de la protection sur une ressource exploitée : le sar commun, Diplodus sargus sargus (L., 1758) autour de la réserve naturelle marine de Cerbère-Banyuls. -2007-2010 Lehuta Sigrid « Vie, Agro, Santé » (VAS) Développement d’indicateurs de pêcheries pour évaluer l’impact de mesures de gestion. `Ici <http://archimer.ifremer.fr/doc/00025/13630/10712.pdf>`_ -2006-2009 Vermard Youen « Vie, Agro, Santé » (VAS) La compréhension des dynamiques de flottille permet-elle d'améliorer les scénarios de gestion ? `Ici <http://archimer.ifremer.fr/doc/00001/11256/7799.pdf>`_ -2004-2007 Drouineau Hilaire « Vie, Agro, Santé » (VAS) Le développement d’un modèle de dynamique de population structuré en longueur et spatialisé – application au Merlu (Merluccius merluccius) d’Atlantique Nord-Est. `Ici <http://archimer.ifremer.fr/doc/2008/these-3710.pdf>`_ +2007-2010 Lehuta Sigrid « Vie, Agro, Santé » (VAS) Développement d’indicateurs de pêcheries pour évaluer l’impact de mesures de gestion. `Ici <http://archimer.ifremer.fr/doc/00025/13630/10712.pdf>`__ +2006-2009 Vermard Youen « Vie, Agro, Santé » (VAS) La compréhension des dynamiques de flottille permet-elle d'améliorer les scénarios de gestion ? `Ici <http://archimer.ifremer.fr/doc/00001/11256/7799.pdf>`__ +2004-2007 Drouineau Hilaire « Vie, Agro, Santé » (VAS) Le développement d’un modèle de dynamique de population structuré en longueur et spatialisé – application au Merlu (Merluccius merluccius) d’Atlantique Nord-Est. `Ici <http://archimer.ifremer.fr/doc/2008/these-3710.pdf>`__ ========= ========================== =========================================================================================== ================================================================================================================================================================================================= ============================================================= Post-doctorats Modified: trunk/src/site/rst/research.rst =================================================================== --- trunk/src/site/rst/research.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/research.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/tools/eclipse.rst =================================================================== --- trunk/src/site/rst/tools/eclipse.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/tools/eclipse.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -115,4 +115,4 @@ Maintenant cliqué sur Debug en bas de la fenêtre, Eclipse doit se connecter à Isis. Il vous faut maintenant poser des points d'arret dans votre code pour qu'Eclipse arrete l'execution et que vous puissiez faire du pas a pas à -partir de ces lignes. \ No newline at end of file +partir de ces lignes. Modified: trunk/src/site/rst/tools/netbeans.rst =================================================================== --- trunk/src/site/rst/tools/netbeans.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/tools/netbeans.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v1/changelog.rst =================================================================== --- trunk/src/site/rst/v1/changelog.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v1/changelog.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v2/changelog.rst =================================================================== --- trunk/src/site/rst/v2/changelog.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v2/changelog.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v2/devel/index.rst =================================================================== --- trunk/src/site/rst/v2/devel/index.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v2/devel/index.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v2/index.rst =================================================================== --- trunk/src/site/rst/v2/index.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v2/index.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -240,4 +240,4 @@ * dans le tableau de population les longueurs min et max sont affichées si les classes sont en longueur * correction d'une erreur lors de la creation de la matrice de changement de classe pour une population en longueur n'ayant qu'un secteur de pop * amelioration du fichier java web start pour permettre d'avoir l'aide avec le javahelp - * amelioration du jar standalone pour avoir l'aide dedans \ No newline at end of file + * amelioration du jar standalone pour avoir l'aide dedans Modified: trunk/src/site/rst/v2/user/ECMAScript.rst =================================================================== --- trunk/src/site/rst/v2/user/ECMAScript.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v2/user/ECMAScript.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v2/user/ECMAScriptEdit.rst =================================================================== --- trunk/src/site/rst/v2/user/ECMAScriptEdit.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v2/user/ECMAScriptEdit.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v2/user/FAQ.rst =================================================================== --- trunk/src/site/rst/v2/user/FAQ.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v2/user/FAQ.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v2/user/Rules.rst =================================================================== --- trunk/src/site/rst/v2/user/Rules.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v2/user/Rules.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v2/user/ScriptHilaire.rst =================================================================== --- trunk/src/site/rst/v2/user/ScriptHilaire.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v2/user/ScriptHilaire.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -107,7 +107,7 @@ Opérations mathématiques et concaténations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Les opérations mathématiques classiques telles que +, -, *, / sont définies sur +Les opérations mathématiques classiques telles que +, -, \*, / sont définies sur les variables numériques, ainsi que l'opérateur % qui donne le reste de la division euclidienne @@ -128,7 +128,7 @@ a++; //a vaut 3 a--; //a vaut 2 -+= , -= , /= et *= prend la valeur de gauche y additionne (ou soustrait, ou ++= , -= , /= et \*= prend la valeur de gauche y additionne (ou soustrait, ou divise ou multiplie) la valeur de droite et affecte le résultat à la variable de gauche. Modified: trunk/src/site/rst/v2/user/SimulationLauncher.rst =================================================================== --- trunk/src/site/rst/v2/user/SimulationLauncher.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v2/user/SimulationLauncher.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v2/user/index.rst =================================================================== --- trunk/src/site/rst/v2/user/index.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v2/user/index.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/changeVersion.rst =================================================================== --- trunk/src/site/rst/v3/changeVersion.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/changeVersion.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -51,7 +51,7 @@ - fermez maintenant IsisFish-3.1.3 - renommez le dossier "isis-database-3" en "isis-database-3.1.3" (ce dossier est normalement situe dans votre repertoire - utilisateur, sous windows C:\Documents and settings\<user>\) + utilisateur, sous windows C:\Documents and settings\<user>\) Telechargement de la nouvelle version @@ -121,6 +121,6 @@ En particulier : - le manuel : -http://isis-fish.labs.libre-entreprise.org/wiki-moin/instance/cgi-bin/moin.c... + http://isis-fish.labs.libre-entreprise.org/wiki-moin/instance/cgi-bin/moin.c... - les changements : -http://isis-fish.labs.libre-entreprise.org/wiki-moin/instance/cgi-bin/moin.c... \ No newline at end of file + http://isis-fish.labs.libre-entreprise.org/wiki-moin/instance/cgi-bin/moin.c... Modified: trunk/src/site/rst/v3/changelog.rst =================================================================== --- trunk/src/site/rst/v3/changelog.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/changelog.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/devel/SyntaxeOption.rst =================================================================== --- trunk/src/site/rst/v3/devel/SyntaxeOption.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/devel/SyntaxeOption.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id: SyntaxeOption.rst 3124 2010-11-29 18:14:09Z chatellier $ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -46,7 +46,7 @@ # groupement d'arguments facultatifs balisé par [ ] # groupement d'arguments obligatoires balisé par < > -Les arguments à l'intérieur d'un groupement sont séparés par des |, cela veut +Les arguments à l'intérieur d'un groupement sont séparés par des \|, cela veut dire que pour un groupement donné, un seul de ses arguments doit être trouvé dans une ligne de commande. @@ -241,4 +241,4 @@ listSimulation(--listSimulation, -l) list all simulation available localy resetConfig(--resetConfig) Reset user configuration ui(--ui) not launch user interface [true|false] -ssh-key-file(--ssh-key-file, -k) change private ssh key file path \ No newline at end of file +ssh-key-file(--ssh-key-file, -k) change private ssh key file path Modified: trunk/src/site/rst/v3/devel/index.rst =================================================================== --- trunk/src/site/rst/v3/devel/index.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/devel/index.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/devel/isis-architecture.rst =================================================================== --- trunk/src/site/rst/v3/devel/isis-architecture.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/devel/isis-architecture.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/devel/usbkey.rst =================================================================== --- trunk/src/site/rst/v3/devel/usbkey.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/devel/usbkey.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -54,4 +54,4 @@ vcs.protocol=svn vcs.username=anonymous compilation.directory=isis-build - monitoring.directory=isis-monitoring \ No newline at end of file + monitoring.directory=isis-monitoring Modified: trunk/src/site/rst/v3/index.rst =================================================================== --- trunk/src/site/rst/v3/index.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/index.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/AnalysePlan.rst =================================================================== --- trunk/src/site/rst/v3/user/AnalysePlan.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/AnalysePlan.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/ExternalScriptEditor.rst =================================================================== --- trunk/src/site/rst/v3/user/ExternalScriptEditor.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/ExternalScriptEditor.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/FAQ.rst =================================================================== --- trunk/src/site/rst/v3/user/FAQ.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/FAQ.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/Historique.rst =================================================================== --- trunk/src/site/rst/v3/user/Historique.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/Historique.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/Installation.rst =================================================================== --- trunk/src/site/rst/v3/user/Installation.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/Installation.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/Introduction.rst =================================================================== --- trunk/src/site/rst/v3/user/Introduction.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/Introduction.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/LaunchOption.rst =================================================================== --- trunk/src/site/rst/v3/user/LaunchOption.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/LaunchOption.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id: LaunchOption.rst 3508 2011-10-28 14:27:34Z echatellier $ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -64,7 +64,7 @@ '*' indique de mettre tous les éléments de ce type. Pour les formules il faut mettre devant le nom le type de la formule, par -exemple: 'Growth/TheGrowth' ou 'NaturalDeathRate/*' +exemple: 'Growth/TheGrowth' ou 'NaturalDeathRate/\*' Action sur le repository local ------------------------------ Modified: trunk/src/site/rst/v3/user/UserInterface.rst =================================================================== --- trunk/src/site/rst/v3/user/UserInterface.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/UserInterface.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/addSshKey.rst =================================================================== --- trunk/src/site/rst/v3/user/addSshKey.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/addSshKey.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/index.rst =================================================================== --- trunk/src/site/rst/v3/user/index.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/index.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/inputs.rst =================================================================== --- trunk/src/site/rst/v3/user/inputs.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/inputs.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id: inputs.rst 3124 2010-11-29 18:14:09Z chatellier $ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -230,32 +230,32 @@ étendue de chaque maille en longitude (valeur réelle) #. liste des cartes : TODO #. **ajouter une carte** : - Si vous désirez changer la carte par défaut pour une carte plus - précise, cliquez sur Ajouter carte et sélectionnez la carte à - ajouter grâce au menu défilant. - Il n'est nécessaire que d'ajouter la carte au format shp mais par - contre les deux cartes shp et ssx doivent être situées dans le - même dossier + Si vous désirez changer la carte par défaut pour une carte plus + précise, cliquez sur Ajouter carte et sélectionnez la carte à + ajouter grâce au menu défilant. + Il n'est nécessaire que d'ajouter la carte au format shp mais par + contre les deux cartes shp et ssx doivent être situées dans le + même dossier #. **supprimer la carte** : - Pour supprimer une carte précdemment ajoutée. + Pour supprimer une carte précdemment ajoutée. #. **commentaires** : - Des informations complémentaires sur la région peuvent être ajoutées - grâce aux encadrés **Commentaires**. Elles seront sauvegarder en même temps - que la region. + Des informations complémentaires sur la région peuvent être ajoutées + grâce aux encadrés **Commentaires**. Elles seront sauvegarder en même temps + que la region. #. **ajouter un fichier de mailles** : - Un fichier contenant des mailles prédéfinies peut aussi être chargé. - Cliquez sur **...*** + Un fichier contenant des mailles prédéfinies peut aussi être chargé. + Cliquez sur **...*** #. **sauver** la région : - Une fois que les frontières de la région ont été définies (la carte - et le fichier de mailles prédéfinies ajoutées si nécessaire), cliquez - sur **sauver**. + Une fois que les frontières de la région ont été définies (la carte + et le fichier de mailles prédéfinies ajoutées si nécessaire), cliquez + sur **sauver**. #. **annuler** : Pour annuler les modifications efféctuées et revenir à la dernière version enregistrée. #. **vérifier** : Pour vérifier la cohérence de la pêcherie. #. **continuer** vers les **mailles** : - A la fin de ce stade, la région ainsi qu'une grille de mailles ont été crées. + A la fin de ce stade, la région ainsi qu'une grille de mailles ont été crées. Afin de continuer la paramétrisation, cliquez sur ** Continuer vers les mailles ** ou sélectionner l'onglet ** Mailles ** dans le menu de gauche. @@ -270,12 +270,12 @@ en cochant la case **Terre**. #. **maille** dans la navigation : - On peut sélectionner une maille à partir de cette zone. Les autres zones - seront alors mises à jour avec les données de cette maille. + On peut sélectionner une maille à partir de cette zone. Les autres zones + seront alors mises à jour avec les données de cette maille. #. **maille** dans liste : - On peut sélectionner une maille à partir de cette liste déroulante des noms - des mailles de la région. Les autres zones seront alors mises à jour avec les - données de cette maille. + On peut sélectionner une maille à partir de cette liste déroulante des noms + des mailles de la région. Les autres zones seront alors mises à jour avec les + données de cette maille. #. **maille** dans carte : On peut enfin sélectionner une maille en la sélectionnant sur la carte. Les autres zones seront alors mises à jour avec les données de cette maille. @@ -876,19 +876,19 @@ d'édition. Chaque commentaire est lié à une population, il est ainsi possible d'ajouter un commentaire pour chaque population préalablement définie. #. **save as model** pour équation de reproduction : - pour sauver une équation de type reproduction dans les scripts d'IsisFish (formules/reproduction TODO) - Si la fonction créée peut a priori être réutilisée pour d'autres population - il peut être utile de la sauver comme modèle en utilisant ce bouton. + pour sauver une équation de type reproduction dans les scripts d'IsisFish (formules/reproduction TODO) + Si la fonction créée peut a priori être réutilisée pour d'autres population + il peut être utile de la sauver comme modèle en utilisant ce bouton. #. **open editor** pour équation de reproduction - pour ouvrir l'éditeur d'équation de reproduction (voir figure - input_XX_equationReproduction). + pour ouvrir l'éditeur d'équation de reproduction (voir figure + input_XX_equationReproduction). #. **sauver** - sauver les modifications effectuées. + sauver les modifications effectuées. #. **annuler** - annuler les modifications effectuées et revenir à la dernière version - sauvegardée.. + annuler les modifications effectuées et revenir à la dernière version + sauvegardée.. -remarque : Si la seule relation disponible est une relation Stock/Recrutement, +Remarque : Si la seule relation disponible est une relation Stock/Recrutement, il suffit de saisir cette relation dans l'équation de reproduction et de mettre la mortalité naturelle de la classe naissance ainsi que le nombre de mois entre la reproduction et le recrutement à zéro. @@ -953,10 +953,10 @@ d'édition. Chaque commentaire est lié à une population, il est ainsi possible d'ajouter un commentaire pour chaque population préalablement définie. #. **sauver** : - sauver les modifications. + sauver les modifications. #. **annuler** : - annuler les modifications effectuées et revenir à la dernière version - enregistrée.. + annuler les modifications effectuées et revenir à la dernière version + enregistrée.. Remarque : Il n'y a pas de test sur les valeurs saisies, faire attention à saisir un coefficient pour les migrations et les émigrations et un nombre pour @@ -996,10 +996,10 @@ d'édition. Chaque commentaire est lié à une population, il est ainsi possible d'ajouter un commentaire pour chaque population préalablement définie. #. **sauver** : - sauver les modifications sur les émigrations. + sauver les modifications sur les émigrations. #. **annuler** : - annuler les modifications effectuées et revenir à la dernière version - enregistrée. + annuler les modifications effectuées et revenir à la dernière version + enregistrée. onglet **Saisie des migrations de populations** (Immigration) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1034,10 +1034,10 @@ d'édition. Chaque commentaire est lié à une population, il est ainsi possible d'ajouter un commentaire pour chaque population préalablement définie. #. **sauver** : - sauver les modifications sur les immigrations. + sauver les modifications sur les immigrations. #. **annuler** : - annuler les modifications effectuées et revenir à la dernière version - enregistrée. + annuler les modifications effectuées et revenir à la dernière version + enregistrée. onglet **Saisie des migrations de populations** (par équation) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1098,7 +1098,7 @@ #. **caractéristiques** : pour renseigner les caratéristiques générales de l'engin. #. **sélectivité** : pour renseigner les caractéristisques de sélectivité de - l'engin (assocation equation de sélectivite - pouplation). + l'engin (assocation equation de sélectivite - pouplation). **caractéristiques d'un engin** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1133,17 +1133,17 @@ Pour permettre de saisir des commentaires propres à cet engin. Ils seront sauvegarder en base lors de la sauvegarde de l'engin. #. **sauver** : - sauver les modifications apportés sur l'engin. + sauver les modifications apportés sur l'engin. #. **annuler** : - annuler les modifications effectuées depuis la dernière suavegarde. + annuler les modifications effectuées depuis la dernière suavegarde. #. **supprimer** : - pour supprimer un engin de la pêcherie. Attention cette opération est - irréversible, une fois supprimé, l'engin n'est pas récupérable. + pour supprimer un engin de la pêcherie. Attention cette opération est + irréversible, une fois supprimé, l'engin n'est pas récupérable. #. **engins dans la navigation** : - positionnement de l'engin dans les objets de la pêcherie. + positionnement de l'engin dans les objets de la pêcherie. #. **continuer** vers les métiers : - Une fois le paramétrage de l'engin terminé, continuer vers la prochaine étape - de la configuration de la pêcherie : les métiers. + Une fois le paramétrage de l'engin terminé, continuer vers la prochaine étape + de la configuration de la pêcherie : les métiers. **sélectivité** ~~~~~~~~~~~~~~~ @@ -1176,17 +1176,17 @@ #. **ajouter** : Permet d'ajouter une asosciation équation de sélectivité - population. #. **liste ajoutés** : - On retrouve ici l'ensemble des associations équations de sélectivité - pouplation - ajoutés dans la pêcherie pour cet engin. + On retrouve ici l'ensemble des associations équations de sélectivité - pouplation + ajoutés dans la pêcherie pour cet engin. #. **supprimer** : - Pour supprimer une asosciation équation de sélectivité- population - précédemment ajouté à l'engin. + Pour supprimer une asosciation équation de sélectivité- population + précédemment ajouté à l'engin. #. **sauver** : - sauver les modifications. + sauver les modifications. #. **annuler** : - annuler les modifications effectuées. + annuler les modifications effectuées. #. **engins dans la navigation** : - position de l'engin dans l'arborescence de naivgation des objets de la pêcherie. + position de l'engin dans l'arborescence de naivgation des objets de la pêcherie. #. **continuer** vers les métiers Une fois le paramétrage de l'engin terminé, continuer vers la prochaine étape de la configuration de la pêcherie : les métiers. @@ -1195,6 +1195,7 @@ ========================= Trois différentes feuilles de saisie sont disponibles afin de décrire les métiers: + #. **caractéristiques** : où le métier est décrit. #. **Saison-Zones** : où les saisons où sont spécifiées les saisons et zones correspondant à la description du métier. @@ -1224,17 +1225,17 @@ Chaque commentaire est lié à un métier, il est ainsi possible d'ajouter un commentaire pour chaque métier préalablement défini. #. **sauver** : - Pour sauvegarder ce métier en base. -#. **annuler ** : - Pour annuler toutes les modifications et revenir à la dernière sauvegarde. + Pour sauvegarder ce métier en base. +#. **annuler** : + Pour annuler toutes les modifications et revenir à la dernière sauvegarde. #. **supprimer** : - Permet de supprimer un métrier de la pêcherie. Attention cette opération est - irréversible, une fois le métier supprimé, il ne sera plus récupérable. + Permet de supprimer un métrier de la pêcherie. Attention cette opération est + irréversible, une fois le métier supprimé, il ne sera plus récupérable. #. **métier** dans la zone de navigation : - Positionnement du métier dans la navigation des objets de la pêcherie. + Positionnement du métier dans la navigation des objets de la pêcherie. #. **continuer** vers les types de trajets : - Une fois terminée la configuration des métiers, on passe à la prochaine étape - de la saisie, à savoir configuration des types de trajets (ou marées). + Une fois terminée la configuration des métiers, on passe à la prochaine étape + de la saisie, à savoir configuration des types de trajets (ou marées). **Saison - zones** @@ -1243,37 +1244,37 @@ .. image:: images/input_24_inputMetiersSeasonZone.png #. **nouveau** : - Toujours commencer par ajouter un nouvelle association saison-zone. Une fois - celle-ci ajoutée, une nouvelle entrée est ajouté dans la liste de sélection - des saisons. + Toujours commencer par ajouter un nouvelle association saison-zone. Une fois + celle-ci ajoutée, une nouvelle entrée est ajouté dans la liste de sélection + des saisons. #. **sélection saison** : - Dans cette liste déroulante sont représentées les associations saisons-zones - ajoutées pour ce métier. + Dans cette liste déroulante sont représentées les associations saisons-zones + ajoutées pour ce métier. #. **définition saison** : - Définir un ensemble de mois durant lesquels le métier est pratiqué en utilisant - le curseur et les cellules jaunes/bleue (jaune: le mois est inclus dans la - saison, bleu: il ne l'est pas). + Définir un ensemble de mois durant lesquels le métier est pratiqué en utilisant + le curseur et les cellules jaunes/bleue (jaune: le mois est inclus dans la + saison, bleu: il ne l'est pas). #. **zones sélectionnées** : - Dans cette liste, on retrouve l'ensemble des zones de la pêcherie. - Sélectionner les Zones dans lesquelles le métier est pratiqué pendant la - saison définie parmi les zones prédéfinies. + Dans cette liste, on retrouve l'ensemble des zones de la pêcherie. + Sélectionner les Zones dans lesquelles le métier est pratiqué pendant la + saison définie parmi les zones prédéfinies. #. **commentaires** : Des informations complémentaires peuvent être ajoutées grâce à cette zone. Chaque commentaire est lié à une saison, il est ainsi possible d'ajouter un commentaire pour chaque saison préalablement définie. #. **sauver** : - Pour sauvegarder en base, les modifications apportées à l'écran. -#. **annuler ** : - Pour annuler les modifications depuis la dernière sauvegarde. + Pour sauvegarder en base, les modifications apportées à l'écran. +#. **annuler** : + Pour annuler les modifications depuis la dernière sauvegarde. #. **supprimer** : - Permet de supprimer une association Saison-Zone pour le métier en cours de modification. - Attention, cette opération est irréversible, une fois supprimée, l'association - n'est plus récupérable. + Permet de supprimer une association Saison-Zone pour le métier en cours de modification. + Attention, cette opération est irréversible, une fois supprimée, l'association + n'est plus récupérable. #. **métier** dans la zone de navigation : - Positionnement du métier dans la navigation des objets de la pêcherie. + Positionnement du métier dans la navigation des objets de la pêcherie. #. **continuer** vers les types de trajets : - Une fois terminée la configuration des métiers, on passe à la prochaine étape - de la saisie, à savoir configuration des types de trajets (ou marées). + Une fois terminée la configuration des métiers, on passe à la prochaine étape + de la saisie, à savoir configuration des types de trajets (ou marées). **espèces capturables** ~~~~~~~~~~~~~~~~~~~~~~~ @@ -1295,33 +1296,33 @@ #. **sélection équation Facteur de ciblage** Dans cette liste déroulante, on retrouve l'ensemble des facteurs cibles. Il faut en sélectionner une. -#. **éditeur équation Facteur ** +#. **éditeur équation Facteur** Pour éditer une équation de **facteur cible** sans utiliser l'éditeur externe d'équation. -#. **sauver comme modèle ** +#. **sauver comme modèle** Permet de sauvegarder l'équation saisie dans la zone précédente en tant que modèle et la rendre ains réutilisable. -#. **ouvrir dans l'éditeur ** +#. **ouvrir dans l'éditeur** Permet d'ouvrir l'éditeur externe d'équation de facteur cible. -#. **espèce principale pour le métier ** +#. **espèce principale pour le métier** Permet de spécifier si l'espèce actuellement sélectionnée est une capture principale pour ce métier. #. **ajouter** : - Une fois sélectionnée la saison, l'espèce et le facteur cible, on appuie sur - ce bouton afin d'ajouter l'association. Elle sera alors ajoutée dans la table - juste en dessous. + Une fois sélectionnée la saison, l'espèce et le facteur cible, on appuie sur + ce bouton afin d'ajouter l'association. Elle sera alors ajoutée dans la table + juste en dessous. #. **espèces ajoutées** : - On retrouve ici l'ensemble des associations ajoutées pour ce métier. - Tip : en cliquant sur la cellule facteur cible d'une des entrées l'éditeur - d'équations externe s'ouvre avec l'équation correspondante. + On retrouve ici l'ensemble des associations ajoutées pour ce métier. + Tip : en cliquant sur la cellule facteur cible d'une des entrées l'éditeur + d'équations externe s'ouvre avec l'équation correspondante. #. **sauver** : - Pour sauvegarder en base, les modifications apportés à l'écran. -#. **annuler ** : - Pour annuler les modifications depuis la dernière sauvegarde. + Pour sauvegarder en base, les modifications apportés à l'écran. +#. **annuler** : + Pour annuler les modifications depuis la dernière sauvegarde. #. **supprimer** : - Permet de supprimer une association Saison-Zone pour le métier en cours. - Attention, cette opération est irréversible, une fois supprimée, l'association - n'est plus récupérable. + Permet de supprimer une association Saison-Zone pour le métier en cours. + Attention, cette opération est irréversible, une fois supprimée, l'association + n'est plus récupérable. #. **continuer** vers les types de trajets : Une fois terminée la configuration des métiers, on passe à la prochaine étape de la saisie, à savoir configuration des types de trajets (ou marées). @@ -1345,7 +1346,7 @@ #. **durée** du trajet : Pour indiquer le nombre de jours en mer par marée. #. **temp minimal entre deux voyages** : - Pour indiquer la durée minimale entre deux voyages pour ce type de trajet. + Pour indiquer la durée minimale entre deux voyages pour ce type de trajet. #. **commentaires** : Des informations complémentaires peuvent être ajoutées grâce à cette zone. Chaque commentaire est lié à un type de marée, il est ainsi possible d'ajouter @@ -1411,6 +1412,7 @@ ============================ Deux onglets permettent de décrire les flottilles: + #. **Caractéristiques** qui permet de décrire les caractéristiques de la flottile #. **DescriptonEffortParMétier** qui permet de détailler les différents métiers possibles et les coûts associés. @@ -1466,27 +1468,27 @@ #. **ajouter** : On ajoute les différents métiers susceptibles d'être opérés lors d'une marée en sélecionnant le métier dans la liste des différents métier. -#. **opération de pêche ** : +#. **opération de pêche** : Pour définir le nombre d'opération de pêche par jour pour ce métier et cette flotille. -#. **durée de la pêche ** : +#. **durée de la pêche** : Pour définir la durée d'une opération de pêche en heure pour ce métier et cette flotille. -#. **nombre d'engins par opération ** : +#. **nombre d'engins par opération** : Pour indiquer le nombre d'engins à utiliser par opération de pêche pour ce métier et cette flotille. -#. **taille de l'équipage ** : +#. **taille de l'équipage** : Pour indiquer la taille de l'équipage d'une pêche pour ce métier et cette flotille. -#. **coût unitaire de la pêche ** : +#. **coût unitaire de la pêche** : Pour indiquer le coût unitaire de la pêche, à savoir le carburant, l'huile et glace pour un bateau de cette flotille pratiquant ce métier. -#. **salaire d'équipage fixe ** : +#. **salaire d'équipage fixe** : Pour indiquer la part fixe du salaire de l'équipage de cette flotille pratiquant ce métier (en euros par mois). -#. **coût de l'alimentation pour l'équipage ** : +#. **coût de l'alimentation pour l'équipage** : Pour indiquer le coût de l'alimentation pour l'équipage pour un bateau de cette flotille pratiquant ce métier. -#. **taux de partage de l'équipage ** : +#. **taux de partage de l'équipage** : Pour indiquer le Part variable du salaire de l'équipage pour un bateau de cette flotille pratiquant ce métier. #. **coût de maintenance de l'engin** : @@ -1496,7 +1498,7 @@ #. **coût de revient à terre** : Pour renseigner le coût de débarquement (taux) lié au métier et au port de la stratégie. -#. **autres coûts ** : +#. **autres coûts** : Pour indiquer les autres coûts d'exploitation de cette flotille pratiquant ce métier (en euros par heure). #. **sauver** : Modified: trunk/src/site/rst/v3/user/isisFishData.rst =================================================================== --- trunk/src/site/rst/v3/user/isisFishData.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/isisFishData.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/result.rst =================================================================== --- trunk/src/site/rst/v3/user/result.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/result.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id: result.rst 3124 2010-11-29 18:14:09Z chatellier $ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -54,25 +54,25 @@ .. image:: images/result_01.png #. **choix des résultats à afficher** : en sélectionnant l'un des radio boutons - on change les données de la zone centrale et sur la gauche. + on change les données de la zone centrale et sur la gauche. Par défaut, on arrive sur la page de résumé comme indiqué dans le figure ci-dessus. #. **liste déroulante des matrices à afficher**. TODO à revoir. #. **liste des exports** ce menu permet de sauvegarder un des exports de la simulation; on sélectionnant un des export, une boite de dialogue apparaît pour vous demander un chemin où sauvegarder le fichier. -#. ** liste des données de la dimension temps **, on sélectionner les tranches - qui nous interessent. -#. ** liste des données de la dimension 1**, on sélectionner les plages qui - nous interessent. -#. ** liste des données de la dimension 2**, on sélectionner les plages qui - nous interessent. +#. **liste des données de la dimension temps**, on sélectionner les tranches + qui nous interessent. +#. **liste des données de la dimension 1**, on sélectionner les plages qui + nous interessent. +#. **liste des données de la dimension 2**, on sélectionner les plages qui + nous interessent. #. **activer les ?** TODO à revoir #. **activer les ?** TODO à revoir #. **activer les ?** TODO à revoir #. **activer les ?** TODO à revoir #. Une fois tous les dimensions sélectionnées, on appuye ici pour afficher - les rapports (voir figure suivante). + les rapports (voir figure suivante). #. Le résumé de la simulation ouverte (unqiuement visible dans la vue résumé). description de la vue graphe @@ -86,7 +86,7 @@ #. On bascule en mode graphe. #. dans la zone centrale, sont affichés les résultats sélectionnés. #. **liste déroulante** des types de graphiques disponibles. On sélectionne et - les données apparaissent sous une nouvelle forme. + les données apparaissent sous une nouvelle forme. #. On peut dans cet zone, **configurer les graphiques générés**. #. appuyez ici pour **mettre en application vos modifications**. @@ -98,7 +98,7 @@ #. pour passer en mode **carte** #. la zone centrale contient la carte de la pêcherie, avec les données - sélectionnées dans les listes de gauche. TODO Comment ça marche? + sélectionnées dans les listes de gauche. TODO Comment ça marche? description de la vue données ----------------------------- @@ -109,6 +109,4 @@ #. pour passer en mode **données** #. la zone centrale contient la matrice des données sélectionnées. #. il est possible d'exporter ces données sous la forme d'un fichier au format - CSV. Un dialogue vous demandera d'indiquer le chemin où sauvegarder le fichier. - - + CSV. Un dialogue vous demandera d'indiquer le chemin où sauvegarder le fichier. Modified: trunk/src/site/rst/v3/user/scripts.rst =================================================================== --- trunk/src/site/rst/v3/user/scripts.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/scripts.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v3/user/simulations.rst =================================================================== --- trunk/src/site/rst/v3/user/simulations.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v3/user/simulations.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id: simulations.rst 3124 2010-11-29 18:14:09Z chatellier $ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -112,20 +112,20 @@ les simulations existantes localement (en supprimant tout filtre précemment saisi). #. **Nom de la simulation** Pour saisir le nom d'une nouvelle simulation. - + Si vous charger une ancienne simulation, le nom de celle-ci sera renseignée ici. - - (*tip) On peut très facilement créer une nouvelle simulation à partir d'une ancienne en la chargeant et en changeant son nom. + + (\*tip) On peut très facilement créer une nouvelle simulation à partir d'une ancienne en la chargeant et en changeant son nom. #. **Description** Pour saisir la description d'une nouvelle simulation. - + Si vous charger une ancienne simulation, la description de celle-ci sera renseignée ici. #. **Region** Pour choisir la région associée à la simulation. - + Le chargement de la région renseignera les zones de stratégies et de populations. - - (*tip) commencer toujours par charger la région avant de renseigner les règles + + (\*tip) commencer toujours par charger la région avant de renseigner les règles car celles-ci sont liées aux données de la région chargée. #. **Stratégies** Une fois une région chargée, on retrouve ici la liste des stratégies connues de la pêcherie. @@ -133,27 +133,27 @@ #. **Populations** Une fois une région chargée, on retrouve ici la liste des populations connues de la pêcherie. - + La sélection d'une population, remplit les données à saisir de cette population dans la zone (9). - + La population utilisé par le simulateur sera celle sélectionnée dans cette liste. #. **Données d'une population** Une fois une population sélectionné, apparaît ici la matrice des données à saisir sur la population. #. **Liste des règles disponibles localement** Il s'agit de la liste des règles connues par IsisFish (voir section script). - - (*tip) en survolant les règles dans la liste, une info bulle apparaît en affichant la description de la règle (voir section script). + + (\*tip) en survolant les règles dans la liste, une info bulle apparaît en affichant la description de la règle (voir section script). #. **Liste des règles ajoutées** Contient la liste des règles que vous avez ajoutées. - + La sélection d'une des règles ajoutées, remplit la zone (15) des paramètres de configuration de la règle. - + Toutes les règles ajoutées dans cette liste seront utilisées par le simulateur. - - (*tip) en survolant les règles dans la liste, une info bulle apparaît en + + (\*tip) en survolant les règles dans la liste, une info bulle apparaît en affichant la description de la règle (voir section script). #. **Ajouter une règle** Permet d'ajouter la règle sélectionné dans la liste déroulante (10). @@ -168,8 +168,8 @@ #. **Paramètres d'un règle ajoutée** Une fois une règle ajoutée sélectionnée dans la liste (11), apparaissent ici ses paramètres. - - (*tip) en survolant les nom des paramètres, une info bulle apparaît en + + (\*tip) en survolant les nom des paramètres, une info bulle apparaît en affichant la documentation du paramètre de la règle (voir section script @Doc). #. **Nombre d'années** Pour indiquer le nombre d'années à utiliser par le simulateur. @@ -181,21 +181,21 @@ #. **Utiliser un script de pré-simulation** Permet d'utiliser (ou pas) un script de pré simulation. L'onglet 'pré-simulation' est activé ou désactivé par ce controle. - + Pour ajouter un script de pré-simulation, la case à cocher doit être activée, on bascule alors dans l'onglet 'Script de pré-simulation' où l'on saisit le script à exécuter avant la simulation. - + Pour ne plus utiliser un script de pré-simulation, il faut désactiver la case à cocher. L'onglet 'pré-simulation' est alors déactivé. #. **Utiliser le plan d'analyse** Permet d'utiliser (ou pas) un plan d'analyse sur la simulation. L'onglet **analyse de sensibilité** est activé ou désactivé par ce controle. - + Pour utiliser un plan d'analyse, la case à cocher doit être activée, on bascule alors dans l'onglet **analyse de sensibilité** (qui est alors activé) où l'on paramètre l'analyse. - + Pour ne plus utiliser un plan d'analyse, il faut désactiver la case à cocher. L'onglet **analyse de sensibilité** est alors désactivé. #. **Exporter uniquement des simulations** @@ -224,16 +224,16 @@ .. image:: images/simulation_04_tabAnalyzePlan.png #. **Liste des plan existants localement** - + Contient la liste de tous les plan d'analyse connus par IsisFish (voir section script). - - (*tip) en survolant les plans d'analyse dans la liste, une info bulle apparaît en affichant la description de la règle (voir section script @Doc). + + (\*tip) en survolant les plans d'analyse dans la liste, une info bulle apparaît en affichant la description de la règle (voir section script @Doc). #. **Liste des plan d'analyse ajoutés** Contient la liste des plans d'analyse que vous avez ajoutée. La sélection d'un des plans d'analyse ajoutés, remplit la zone (6) des paramètres de configuration de ce plan d'analyse. Toutes les plan d'analyse ajoutés dans cette liste seront utilisés par le simulateur. - (*tip) en survolant les plans d'analyse dans la liste, une info bulle apparaît en affichant la description du plan (voir section script). + (\*tip) en survolant les plans d'analyse dans la liste, une info bulle apparaît en affichant la description du plan (voir section script). #. **Ajouter un plan d'analyse** Permet d'ajouter le plan d'analyse sélectionné dans la liste déroulante (1). Une fois ajoutée, la règle apparaît dans la zone (2). @@ -247,7 +247,7 @@ #. **Paramètres d'un plan d'analyse ajouté** Une fois un paln d'analyse ajouté et sélectionné dans la liste (2), apparaissent ici ses paramètres à renseigner. - (*tip) en survolant les nom des paramètres, une info bulle apparaît en affichant la documentation du paramètre (voir section script @Doc) + (\*tip) en survolant les nom des paramètres, une info bulle apparaît en affichant la documentation du paramètre (voir section script @Doc) #. **Retour aux paramètres** Une fois, les plan d'analyse configurés, cliquer ici pour retourner à l'onglet **Paramètre** et continuer la configuration de votre simulation. @@ -263,7 +263,7 @@ #. **chemin du répertoire** : chemin de répertoire où exporter les résultats (voir configuration) #. **...** : pour rechercher un répertoire en local, où l'on veut exporter les résultats. -#. **sauvegarder pour prochaine simulation ** : pour sauvegarder le choix des +#. **sauvegarder pour prochaine simulation** : pour sauvegarder le choix des résultats à exporter ainsi que le répertoire où exporter pour une prochaine simulation. onglet Choix de résultats @@ -273,7 +273,7 @@ #. **résultats disponibles** : liste des résultats disponibles pour la simulation. On sélectionne dans cette liste, ceux que l'on veut traiter. TODO lien avec les exports -#. **sauvegarder pour prochaine simulation ** : pour sauvegarder le choix des +#. **sauvegarder pour prochaine simulation** : pour sauvegarder le choix des résultats à traiter pour une prochaine simulation. onglet Paramètres avancés Modified: trunk/src/site/rst/v4/devel/architecture.rst =================================================================== --- trunk/src/site/rst/v4/devel/architecture.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/devel/architecture.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/devel/architectureMexico.rst =================================================================== --- trunk/src/site/rst/v4/devel/architectureMexico.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/devel/architectureMexico.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/devel/architectureResult.rst =================================================================== --- trunk/src/site/rst/v4/devel/architectureResult.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/devel/architectureResult.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/devel/index.rst =================================================================== --- trunk/src/site/rst/v4/devel/index.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/devel/index.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/index.rst =================================================================== --- trunk/src/site/rst/v4/index.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/index.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/API.rst =================================================================== --- trunk/src/site/rst/v4/user/API.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/API.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -46,4 +46,4 @@ .. _Javadoc Nuiton-Matrix: http://maven-site.nuiton.org/nuiton-matrix/nuiton-matrix/apidocs/index.html .. _MatrixND: http://maven-site.nuiton.org/nuiton-matrix/nuiton-matrix/apidocs/org/nuiton/... .. _Javadoc Nuiton-Utils: http://maven-site.nuiton.org/nuiton-utils/nuiton-utils/apidocs/index.html -.. _Javadoc Nuiton-j2r: http://maven-site.nuiton.org/nuiton-j2r/apidocs/index.html \ No newline at end of file +.. _Javadoc Nuiton-j2r: http://maven-site.nuiton.org/nuiton-j2r/apidocs/index.html Modified: trunk/src/site/rst/v4/user/FAQ.rst =================================================================== --- trunk/src/site/rst/v4/user/FAQ.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/FAQ.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/caparmor.rst =================================================================== --- trunk/src/site/rst/v4/user/caparmor.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/caparmor.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/changements40.rst =================================================================== --- trunk/src/site/rst/v4/user/changements40.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/changements40.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/installation.rst =================================================================== --- trunk/src/site/rst/v4/user/installation.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/installation.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/installationr.rst =================================================================== --- trunk/src/site/rst/v4/user/installationr.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/installationr.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/isisFishModel.rst =================================================================== --- trunk/src/site/rst/v4/user/isisFishModel.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/isisFishModel.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/migrationv3v4.rst =================================================================== --- trunk/src/site/rst/v4/user/migrationv3v4.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/migrationv3v4.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -130,4 +130,4 @@ group.getMaturityOgive(); Par contre pour modifier une valeur, il faut utiliser la population : -pop.setMaturityOgiveEquation(equation); \ No newline at end of file +pop.setMaturityOgiveEquation(equation); Modified: trunk/src/site/rst/v4/user/scripts.rst =================================================================== --- trunk/src/site/rst/v4/user/scripts.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/scripts.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -74,19 +74,15 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Sigrid V 3.3.0.8 , Plan d'analyse pour la pecherie anchois : modifie les regles -de gestion a chaque simulation `Dossier contenant tous les fichiers nécessaires à ce plan`_ +de gestion a chaque simulation `Dossier contenant tous les fichiers nécessaires à ce plan <../downloads/PlanModifRules.zip>`__ -.. _Dossier contenant tous les fichiers nécessaires à ce plan: ../downloads/PlanModifRules.zip - Plan qui modifie regle de gestion et parametres / modify rules and parameters ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Sigrid V 3.3.0.8 , Plan d'analyse pour la pecherie anchois : modifie les regles de gestion, et des parametres (equations et nb de jours d'inactivite) a chaque -simulation `Dossier contenant tous les fichiers nécessaires à ce plan`_ +simulation `Dossier contenant tous les fichiers nécessaires à ce plan <../downloads/PlanRulesParam.zip>`__ -.. _Dossier contenant tous les fichiers nécessaires à ce plan: ../downloads/PlanRulesParam.zip - Règles de gestion ----------------- Modified: trunk/src/site/rst/v4/user/scriptsR.rst =================================================================== --- trunk/src/site/rst/v4/user/scriptsR.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/scriptsR.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/tutorials/firstLaunch.rst =================================================================== --- trunk/src/site/rst/v4/user/tutorials/firstLaunch.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/tutorials/firstLaunch.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/tutorials/parameterising.rst =================================================================== --- trunk/src/site/rst/v4/user/tutorials/parameterising.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/tutorials/parameterising.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/tutorials/simulationPlan.rst =================================================================== --- trunk/src/site/rst/v4/user/tutorials/simulationPlan.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/tutorials/simulationPlan.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/tutorials/useAPI.rst =================================================================== --- trunk/src/site/rst/v4/user/tutorials/useAPI.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/tutorials/useAPI.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/tutorials/utilCaparmor.rst =================================================================== --- trunk/src/site/rst/v4/user/tutorials/utilCaparmor.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/tutorials/utilCaparmor.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/tutorials.rst =================================================================== --- trunk/src/site/rst/v4/user/tutorials.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/tutorials.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/usermanual/GUI.rst =================================================================== --- trunk/src/site/rst/v4/user/usermanual/GUI.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/usermanual/GUI.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -206,4 +206,4 @@ Lors du lancement de l'analyse de sensibilité, automatiquement la date courante sera ajouté au nom de l'analyse. Le nom de chaque simulation est terminée par _ -suivi du numéro de la simulation dans l'analyse de sensibilité. \ No newline at end of file +suivi du numéro de la simulation dans l'analyse de sensibilité. Modified: trunk/src/site/rst/v4/user/usermanual/analysisPlan.rst =================================================================== --- trunk/src/site/rst/v4/user/usermanual/analysisPlan.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/usermanual/analysisPlan.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/usermanual/inputs.rst =================================================================== --- trunk/src/site/rst/v4/user/usermanual/inputs.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/usermanual/inputs.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -1555,4 +1555,4 @@ #. **Sauver** : Pour sauvegarder les modifications effectués sur cet écran. #. **Annuler** : - Pour annuler les modifications effectués sur cet écran. \ No newline at end of file + Pour annuler les modifications effectués sur cet écran. Modified: trunk/src/site/rst/v4/user/usermanual/introduction.rst =================================================================== --- trunk/src/site/rst/v4/user/usermanual/introduction.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/usermanual/introduction.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -130,4 +130,4 @@ population, chaque activité de pêche et chaque mesure de gestion. Au sein de chaque zone et pour chaque saison, l'effort de pêche d'une activité particulière, ou l'abondance d'une population, sont supposées -homogènes et uniformément distribuées. \ No newline at end of file +homogènes et uniformément distribuées. Modified: trunk/src/site/rst/v4/user/usermanual/launcher.rst =================================================================== --- trunk/src/site/rst/v4/user/usermanual/launcher.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/usermanual/launcher.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -329,4 +329,4 @@ TODO Après cette description détaillé de tout la configuration, un petit tuto pour -réaliser ''en trois clics'' une simulation. \ No newline at end of file +réaliser ''en trois clics'' une simulation. Modified: trunk/src/site/rst/v4/user/usermanual/queue.rst =================================================================== --- trunk/src/site/rst/v4/user/usermanual/queue.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/usermanual/queue.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -96,4 +96,4 @@ courriel. #. **corps du message** : corps du courriel à envoyer. #. **envoyer** : pour envoyer le courriel. -#. **annuler** : pour annuler l'envoie de courriel et revenir à la console de log. \ No newline at end of file +#. **annuler** : pour annuler l'envoie de courriel et revenir à la console de log. Modified: trunk/src/site/rst/v4/user/usermanual/results.rst =================================================================== --- trunk/src/site/rst/v4/user/usermanual/results.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/usermanual/results.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -107,4 +107,4 @@ #. il est possible d'exporter ces données sous la forme d'un fichier au format CSV. Un dialogue vous demandera d'indiquer le chemin où sauvegarder le fichier. - \ No newline at end of file + Modified: trunk/src/site/rst/v4/user/usermanual/scripts.rst =================================================================== --- trunk/src/site/rst/v4/user/usermanual/scripts.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/usermanual/scripts.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -299,4 +299,4 @@ .. image:: script_11_verifSyntax_ko.png -après une vérification qui a échoué \ No newline at end of file +après une vérification qui a échoué Modified: trunk/src/site/rst/v4/user/usermanual/sensitivity.rst =================================================================== --- trunk/src/site/rst/v4/user/usermanual/sensitivity.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/usermanual/sensitivity.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -5,11 +5,11 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 1999 - 2010 Ifremer, Code Lutin +.. * Copyright (C) 1999 - 2012 Ifremer, Code Lutin, Chatellier Eric .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - @@ -652,8 +652,8 @@ - objet 3 : isis.simule - objet 4 : call_method - objet 5 : analysis_result (objet R contenant les résultats de l'analyse, dans -le cas d'un résultat calculé par une aov, l'objet est une liste contenant l'aov -et les indices de sensibilité) + le cas d'un résultat calculé par une aov, l'objet est une liste contenant l'aov + et les indices de sensibilité) isis.methodAnalyse est enregistré dans R de la manière suivante : nomdel'analyse_0.nomduresultat.isis.methodAnalyse (tous les espaces sont enlevés @@ -663,4 +663,4 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! N'oubliez pas que vous pouvez obtenir tous les objets de la session R en -utilisant la fonction ls() dans R. \ No newline at end of file +utilisant la fonction ls() dans R. Modified: trunk/src/site/rst/v4/user/usermanual.rst =================================================================== --- trunk/src/site/rst/v4/user/usermanual.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/usermanual.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/rst/v4/user/warning.rst =================================================================== --- trunk/src/site/rst/v4/user/warning.rst 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/rst/v4/user/warning.rst 2012-11-07 11:33:53 UTC (rev 101) @@ -9,7 +9,7 @@ .. * %% .. * 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 +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/site_en.xml 2012-11-07 11:33:53 UTC (rev 101) @@ -1,69 +1,77 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - IsisFish - - $Id: site_en.xml 3124 2010-11-29 18:14:09Z chatellier $ - $HeadURL$ - %% - Copyright (C) 1999 - 2011 Ifremer, Code Lutin, Chatellier Eric - %% - 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, see - <http://www.gnu.org/licenses/gpl-2.0.html>. - #L% - --> +<!-- #%L IsisFish $Id: site_en.xml 3124 2010-11-29 18:14:09Z chatellier $ + $HeadURL$ %% Copyright (C) 1999 - 2011 Ifremer, Code Lutin, Chatellier Eric + %% 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 3 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, see <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% --> <project name="Isis-fish"> -<!-- <publishDate format="dd/MM/yyyy"/>--> -<publishDate position="none"/> -<version position="none"/> + <publishDate position="none" /> + <version position="none" /> -<bannerLeft> + <bannerLeft> <src>images/isislogo.png</src> <href>http://www.isis-fish.org</href> -</bannerLeft> + </bannerLeft> -<bannerRight> + <bannerRight> <src>images/ifremer.png</src> -</bannerRight> + </bannerRight> -<poweredBy> - <logo href="http://argouml.tigris.org/" img="/images/argouml-logo.png" name="ArgoUML"/> - <logo href="http://docutils.sourceforge.net/rst.html" img="/images/restructuredtext-logo.png" name="reStructuredText"/> - <logo href="http://topia.labs.libre-entreprise.org/" img="/images/topia-logo.png" name="ToPIA"/> -</poweredBy> + <!-- <poweredBy> + <logo href="http://argouml.tigris.org/" img="/images/argouml-logo.png" + name="ArgoUML" /> + <logo href="http://docutils.sourceforge.net/rst.html" img="/images/restructuredtext-logo.png" + name="reStructuredText" /> + <logo href="http://topia.labs.libre-entreprise.org/" img="/images/topia-logo.png" + name="ToPIA" /> + </poweredBy> --> -<body> + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + <links> - <item name="Ifremer" href="http://www.ifremer.fr/"/> - <!--item name="Site scientifique" href="http://www.ifremer.fr/isis-fish/index.html"/--> - <item name="[fr" href="http://www.isis-fish.org/index.html"/> - <item name="en]" href="http://www.isis-fish.org/en/index.html"/> + <item name="Ifremer" href="http://www.ifremer.fr" /> + <item name="CodeLutin" href="http://www.codelutin.com"/> + <item name="[fr" href="http://www.isis-fish.org/index.html" /> + <item name="en]" href="http://www.isis-fish.org/en/index.html" /> </links> <menu name="ISIS-Fish"> - <item name="Presentation" href="index.html"/> - <item name="Roadmap" href="http://forge.codelutin.com/projects/isis-fish/roadmap"/> - <item name="Download" href="download.html"/> - <item name="Publications" href="publications.html"/> - <item name="Research projects" href="research.html"/> - <item name="License" href="license.html"/> - <item name="Contact/Assistance" href="contact.html"/> + <item name="Presentation" href="index.html" /> + <item name="Roadmap" + href="http://forge.codelutin.com/projects/isis-fish/roadmap" /> + <item name="Download" href="download.html" /> + <item name="Publications" href="publications.html" /> + <item name="Research projects" href="research.html" /> + <item name="License" href="license.html" /> + <item name="Contact/Assistance" href="contact.html" /> </menu> - ${reports} + <footer> + <script type="text/javascript" src="http://code.jquery.com/jquery-1.8.2.min.js"></script> + <script type="text/javascript" src="../js/maven-isisfish.js"></script> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}' /> + </footer> -</body> + </body> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-11-07 09:43:58 UTC (rev 100) +++ trunk/src/site/site_fr.xml 2012-11-07 11:33:53 UTC (rev 101) @@ -10,7 +10,7 @@ %% 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 + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,15 +20,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <project name="Isis-fish"> -<!-- <publishDate format="dd/MM/yyyy"/>--> - <publishDate position="none"/> - <version position="none"/> + <publishDate position="none"/> + <version position="none"/> <bannerLeft> <src>images/isislogo.png</src> @@ -39,16 +38,21 @@ <src>images/ifremer.png</src> </bannerRight> - <poweredBy> + <!-- <poweredBy> <logo href="http://argouml.tigris.org/" img="/images/argouml-logo.png" name="ArgoUML"/> <logo href="http://docutils.sourceforge.net/rst.html" img="/images/restructuredtext-logo.png" name="reStructuredText"/> <logo href="http://topia.labs.libre-entreprise.org/" img="/images/topia-logo.png" name="ToPIA"/> - </poweredBy> + </poweredBy> --> <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + <links> - <item name="Ifremer" href="http://www.ifremer.fr/"/> - <!--item name="Site scientifique" href="http://www.ifremer.fr/isis-fish/index.html"/--> + <item name="Ifremer" href="http://www.ifremer.fr"/> + <item name="CodeLutin" href="http://www.codelutin.com"/> <item name="[fr" href="http://www.isis-fish.org/index.html"/> <item name="en]" href="http://www.isis-fish.org/en/index.html"/> </links> @@ -106,7 +110,19 @@ <item name="Manuel développeur" href="v4/devel/index.html"/> </menu> - ${reports} - + <footer> + <script type="text/javascript" src="http://code.jquery.com/jquery-1.8.2.min.js"></script> + <script type="text/javascript" src="js/maven-isisfish.js"></script> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}' /> + </footer> </body> </project>