diff --git a/.classpath b/.classpath index 7242b9c..4237c90 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,7 @@ + @@ -14,6 +15,7 @@ + diff --git a/.project b/.project index 3248a11..11c1ea6 100644 --- a/.project +++ b/.project @@ -21,5 +21,10 @@ 2 C:/Users/pabr6/eclipse-workspace/cXML + + resources + 2 + C:/Users/pabr6/git/analyseWriter/MEPTL/src/resources + diff --git a/analyseWriter.exe b/analyseWriter.exe index b6e0b2b..8fc32c8 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 67f0faf..fe129e8 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 0be1b74..2d33cfc 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,7 +1,3 @@ +/evaluer/ +/MEPTL/ /fenetres/ -/nofeedback.png -/nofeedback.svg -/nofeedbackmini.png -/nodetail.png -/nodetail.svg -/nodetailmini.png diff --git a/bin/MEPTL/rechercherUnNodeStudent.class b/bin/MEPTL/rechercherUnNodeStudent.class index 2b8fca8..32030f6 100644 Binary files a/bin/MEPTL/rechercherUnNodeStudent.class and b/bin/MEPTL/rechercherUnNodeStudent.class differ diff --git a/bin/doc1.html b/bin/doc1.html new file mode 100644 index 0000000..4dc4933 --- /dev/null +++ b/bin/doc1.html @@ -0,0 +1,19 @@ + + + + + + + + + + + + +

+Documentation analyseWriter

+ + \ No newline at end of file diff --git a/bin/evaluer/analyseLesNodesEnfants.class b/bin/evaluer/analyseLesNodesEnfants.class index fcaf7a1..cb882f8 100644 Binary files a/bin/evaluer/analyseLesNodesEnfants.class and b/bin/evaluer/analyseLesNodesEnfants.class differ diff --git a/bin/evaluer/analyseLesNodesPrincipaux.class b/bin/evaluer/analyseLesNodesPrincipaux.class index f724b9b..1e435e1 100644 Binary files a/bin/evaluer/analyseLesNodesPrincipaux.class and b/bin/evaluer/analyseLesNodesPrincipaux.class differ diff --git a/bin/fenetres/afficheText.class b/bin/fenetres/afficheText.class index 20bd666..42da05e 100644 Binary files a/bin/fenetres/afficheText.class and b/bin/fenetres/afficheText.class differ diff --git a/bin/fenetres/create$1.class b/bin/fenetres/create$1.class index 9fc96cc..2b631ba 100644 Binary files a/bin/fenetres/create$1.class and b/bin/fenetres/create$1.class differ diff --git a/bin/fenetres/create$10.class b/bin/fenetres/create$10.class index e4a0e12..d0b33c9 100644 Binary files a/bin/fenetres/create$10.class and b/bin/fenetres/create$10.class differ diff --git a/bin/fenetres/create$11.class b/bin/fenetres/create$11.class index 9b7571e..199c039 100644 Binary files a/bin/fenetres/create$11.class and b/bin/fenetres/create$11.class differ diff --git a/bin/fenetres/create$12.class b/bin/fenetres/create$12.class index 3316e9e..391f6a7 100644 Binary files a/bin/fenetres/create$12.class and b/bin/fenetres/create$12.class differ diff --git a/bin/fenetres/create$13.class b/bin/fenetres/create$13.class index 0843344..f84a9cc 100644 Binary files a/bin/fenetres/create$13.class and b/bin/fenetres/create$13.class differ diff --git a/bin/fenetres/create$2.class b/bin/fenetres/create$2.class index 28eec80..a922f67 100644 Binary files a/bin/fenetres/create$2.class and b/bin/fenetres/create$2.class differ diff --git a/bin/fenetres/create$3.class b/bin/fenetres/create$3.class index 4432757..eca9116 100644 Binary files a/bin/fenetres/create$3.class and b/bin/fenetres/create$3.class differ diff --git a/bin/fenetres/create$4.class b/bin/fenetres/create$4.class index c5d07ad..656ed44 100644 Binary files a/bin/fenetres/create$4.class and b/bin/fenetres/create$4.class differ diff --git a/bin/fenetres/create$5.class b/bin/fenetres/create$5.class index 046f4ab..21ee09b 100644 Binary files a/bin/fenetres/create$5.class and b/bin/fenetres/create$5.class differ diff --git a/bin/fenetres/create$6.class b/bin/fenetres/create$6.class index dc778d4..8965ebb 100644 Binary files a/bin/fenetres/create$6.class and b/bin/fenetres/create$6.class differ diff --git a/bin/fenetres/create$7.class b/bin/fenetres/create$7.class index 4102d6a..c239a8f 100644 Binary files a/bin/fenetres/create$7.class and b/bin/fenetres/create$7.class differ diff --git a/bin/fenetres/create$8.class b/bin/fenetres/create$8.class index 68034c6..5e4b791 100644 Binary files a/bin/fenetres/create$8.class and b/bin/fenetres/create$8.class differ diff --git a/bin/fenetres/create$9.class b/bin/fenetres/create$9.class index 814d1b4..636dcb5 100644 Binary files a/bin/fenetres/create$9.class and b/bin/fenetres/create$9.class differ diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class index 44adfc3..6a7675d 100644 Binary files a/bin/fenetres/create.class and b/bin/fenetres/create.class differ diff --git a/bin/fenetres/create_act/actOu.class b/bin/fenetres/create_act/actOu.class index 2d4d55d..ddac039 100644 Binary files a/bin/fenetres/create_act/actOu.class and b/bin/fenetres/create_act/actOu.class differ diff --git a/bin/fenetres/create_act/actPaste.class b/bin/fenetres/create_act/actPaste.class index 618494e..4cf09f8 100644 Binary files a/bin/fenetres/create_act/actPaste.class and b/bin/fenetres/create_act/actPaste.class differ diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class index 24e82db..8558f97 100644 Binary files a/bin/fenetres/evaluate$1.class and b/bin/fenetres/evaluate$1.class differ diff --git a/bin/fenetres/evaluate$10.class b/bin/fenetres/evaluate$10.class index 459565d..0a9b458 100644 Binary files a/bin/fenetres/evaluate$10.class and b/bin/fenetres/evaluate$10.class differ diff --git a/bin/fenetres/evaluate$11.class b/bin/fenetres/evaluate$11.class index 0106928..bb02936 100644 Binary files a/bin/fenetres/evaluate$11.class and b/bin/fenetres/evaluate$11.class differ diff --git a/bin/fenetres/evaluate$12.class b/bin/fenetres/evaluate$12.class index 968a40a..869226d 100644 Binary files a/bin/fenetres/evaluate$12.class and b/bin/fenetres/evaluate$12.class differ diff --git a/bin/fenetres/evaluate$13.class b/bin/fenetres/evaluate$13.class index 516adf9..89e3e9b 100644 Binary files a/bin/fenetres/evaluate$13.class and b/bin/fenetres/evaluate$13.class differ diff --git a/bin/fenetres/evaluate$14.class b/bin/fenetres/evaluate$14.class index 512ae5a..18cc46c 100644 Binary files a/bin/fenetres/evaluate$14.class and b/bin/fenetres/evaluate$14.class differ diff --git a/bin/fenetres/evaluate$15.class b/bin/fenetres/evaluate$15.class index 4f0486a..33bab56 100644 Binary files a/bin/fenetres/evaluate$15.class and b/bin/fenetres/evaluate$15.class differ diff --git a/bin/fenetres/evaluate$16.class b/bin/fenetres/evaluate$16.class index fa6b37c..8c5f77d 100644 Binary files a/bin/fenetres/evaluate$16.class and b/bin/fenetres/evaluate$16.class differ diff --git a/bin/fenetres/evaluate$17.class b/bin/fenetres/evaluate$17.class index 9baca4c..3586d3e 100644 Binary files a/bin/fenetres/evaluate$17.class and b/bin/fenetres/evaluate$17.class differ diff --git a/bin/fenetres/evaluate$18.class b/bin/fenetres/evaluate$18.class index d026832..b0ca861 100644 Binary files a/bin/fenetres/evaluate$18.class and b/bin/fenetres/evaluate$18.class differ diff --git a/bin/fenetres/evaluate$19.class b/bin/fenetres/evaluate$19.class index 8f61889..7807952 100644 Binary files a/bin/fenetres/evaluate$19.class and b/bin/fenetres/evaluate$19.class differ diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class index 943ca66..86a6209 100644 Binary files a/bin/fenetres/evaluate$2.class and b/bin/fenetres/evaluate$2.class differ diff --git a/bin/fenetres/evaluate$20.class b/bin/fenetres/evaluate$20.class index 3b00d7d..7fff336 100644 Binary files a/bin/fenetres/evaluate$20.class and b/bin/fenetres/evaluate$20.class differ diff --git a/bin/fenetres/evaluate$21.class b/bin/fenetres/evaluate$21.class index 73578ca..56859a7 100644 Binary files a/bin/fenetres/evaluate$21.class and b/bin/fenetres/evaluate$21.class differ diff --git a/bin/fenetres/evaluate$22.class b/bin/fenetres/evaluate$22.class index b07aaec..898bbe0 100644 Binary files a/bin/fenetres/evaluate$22.class and b/bin/fenetres/evaluate$22.class differ diff --git a/bin/fenetres/evaluate$23.class b/bin/fenetres/evaluate$23.class index 1a58816..00b1109 100644 Binary files a/bin/fenetres/evaluate$23.class and b/bin/fenetres/evaluate$23.class differ diff --git a/bin/fenetres/evaluate$24.class b/bin/fenetres/evaluate$24.class index b6e472c..48b3662 100644 Binary files a/bin/fenetres/evaluate$24.class and b/bin/fenetres/evaluate$24.class differ diff --git a/bin/fenetres/evaluate$25.class b/bin/fenetres/evaluate$25.class index 88cead4..01a59ef 100644 Binary files a/bin/fenetres/evaluate$25.class and b/bin/fenetres/evaluate$25.class differ diff --git a/bin/fenetres/evaluate$26.class b/bin/fenetres/evaluate$26.class index 4a6462b..d8e411f 100644 Binary files a/bin/fenetres/evaluate$26.class and b/bin/fenetres/evaluate$26.class differ diff --git a/bin/fenetres/evaluate$27.class b/bin/fenetres/evaluate$27.class index cc9e45b..9a093ed 100644 Binary files a/bin/fenetres/evaluate$27.class and b/bin/fenetres/evaluate$27.class differ diff --git a/bin/fenetres/evaluate$28.class b/bin/fenetres/evaluate$28.class index debd365..42f48f6 100644 Binary files a/bin/fenetres/evaluate$28.class and b/bin/fenetres/evaluate$28.class differ diff --git a/bin/fenetres/evaluate$29.class b/bin/fenetres/evaluate$29.class index feb1098..f6620a8 100644 Binary files a/bin/fenetres/evaluate$29.class and b/bin/fenetres/evaluate$29.class differ diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class index 10a566b..1495f1b 100644 Binary files a/bin/fenetres/evaluate$3.class and b/bin/fenetres/evaluate$3.class differ diff --git a/bin/fenetres/evaluate$30.class b/bin/fenetres/evaluate$30.class index 387baa6..b545570 100644 Binary files a/bin/fenetres/evaluate$30.class and b/bin/fenetres/evaluate$30.class differ diff --git a/bin/fenetres/evaluate$31.class b/bin/fenetres/evaluate$31.class index 22c62a3..d753242 100644 Binary files a/bin/fenetres/evaluate$31.class and b/bin/fenetres/evaluate$31.class differ diff --git a/bin/fenetres/evaluate$4.class b/bin/fenetres/evaluate$4.class index 6520988..bd06a1e 100644 Binary files a/bin/fenetres/evaluate$4.class and b/bin/fenetres/evaluate$4.class differ diff --git a/bin/fenetres/evaluate$5.class b/bin/fenetres/evaluate$5.class index c3daa88..c9be6a8 100644 Binary files a/bin/fenetres/evaluate$5.class and b/bin/fenetres/evaluate$5.class differ diff --git a/bin/fenetres/evaluate$6.class b/bin/fenetres/evaluate$6.class index 6639e58..9021303 100644 Binary files a/bin/fenetres/evaluate$6.class and b/bin/fenetres/evaluate$6.class differ diff --git a/bin/fenetres/evaluate$7.class b/bin/fenetres/evaluate$7.class index 7bddf00..64460b9 100644 Binary files a/bin/fenetres/evaluate$7.class and b/bin/fenetres/evaluate$7.class differ diff --git a/bin/fenetres/evaluate$8.class b/bin/fenetres/evaluate$8.class index 85930a3..81b358c 100644 Binary files a/bin/fenetres/evaluate$8.class and b/bin/fenetres/evaluate$8.class differ diff --git a/bin/fenetres/evaluate$9.class b/bin/fenetres/evaluate$9.class index 010c798..3f573d8 100644 Binary files a/bin/fenetres/evaluate$9.class and b/bin/fenetres/evaluate$9.class differ diff --git a/bin/fenetres/evaluate.class b/bin/fenetres/evaluate.class index 41c9c33..8f4f7d9 100644 Binary files a/bin/fenetres/evaluate.class and b/bin/fenetres/evaluate.class differ diff --git a/bin/licence.txt b/bin/licence.txt new file mode 100644 index 0000000..80e659d --- /dev/null +++ b/bin/licence.txt @@ -0,0 +1,674 @@ +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. \ No newline at end of file diff --git a/bin/list/listeAttributsAnalyseWriter.class b/bin/list/listeAttributsAnalyseWriter.class index 8a0f846..678f2c2 100644 Binary files a/bin/list/listeAttributsAnalyseWriter.class and b/bin/list/listeAttributsAnalyseWriter.class differ diff --git a/bin/nodetail.png b/bin/nodetail.png new file mode 100644 index 0000000..4228b4e Binary files /dev/null and b/bin/nodetail.png differ diff --git a/bin/nodetail.svg b/bin/nodetail.svg new file mode 100644 index 0000000..2c3b63a --- /dev/null +++ b/bin/nodetail.svg @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + ERR + + + + COR + + + + COR + + + + diff --git a/bin/nodetailmini.png b/bin/nodetailmini.png new file mode 100644 index 0000000..1d4032d Binary files /dev/null and b/bin/nodetailmini.png differ diff --git a/bin/nofeedback.png b/bin/nofeedback.png new file mode 100644 index 0000000..04ff0a4 Binary files /dev/null and b/bin/nofeedback.png differ diff --git a/bin/nofeedback.svg b/bin/nofeedback.svg new file mode 100644 index 0000000..c9fcd0e --- /dev/null +++ b/bin/nofeedback.svg @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + HTML + + + + + diff --git a/bin/nofeedbackmini.png b/bin/nofeedbackmini.png new file mode 100644 index 0000000..04ff0a4 Binary files /dev/null and b/bin/nofeedbackmini.png differ diff --git a/bin/resources/doc1.html b/bin/resources/doc1.html new file mode 100644 index 0000000..4dc4933 --- /dev/null +++ b/bin/resources/doc1.html @@ -0,0 +1,19 @@ + + + + + + + + + + + + +

+Documentation analyseWriter

+ + \ No newline at end of file diff --git a/src/MEPTL/rechercherUnNodeStudent.java b/src/MEPTL/rechercherUnNodeStudent.java index 9879e7c..31a27b4 100644 --- a/src/MEPTL/rechercherUnNodeStudent.java +++ b/src/MEPTL/rechercherUnNodeStudent.java @@ -64,13 +64,20 @@ public class rechercherUnNodeStudent { //*********************************** if(nodSujet.getAttributs().get("recherche_index")!=null){ nodStudent = findNodeParIndex(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a); - if(nodSujet.getAttributs().get("recherche_index").equalsIgnoreCase("true")) return nodStudent; +// System.out.println("Index sujet="+nodSujet.getAttributs().get("index")); +// if(nodStudent!=null) { +// System.out.println("Index student="+nodStudent.getAttributs().get("index")); +// System.out.println("taille child student="+nodStudent.getNodes().size()); +// }else { +// System.out.println("Index student=null"); +// } + if(nodSujet.getAttributs().get("recherche_index").equals("true")) return nodStudent; } //***************************************************************** //** Recherche le node text:p par les différents contenu du node ** //***************************************************************** - if(nameNode.equals("text:p")||nameNode.equals("text:span")) { + if(nameNode.equals("text:p")||nameNode.equals("text:span")||nameNode.equals("text:list")) { nodStudent = findLeNodeTextpParDesNodesEnfantsSpecifique(nameNode, nodSujet,nod0Student, nod1Student, nod2Student, a ); } @@ -324,6 +331,13 @@ public class rechercherUnNodeStudent { if(nod0Student!=null) if(nodStudent==null) nodStudent = nod0Student.retourneFirstEnfantsByNameNode1ContainNameNode2(nameNodeSujet,"text:creator"); } + if(nameNodeEnfantSujet.equals("text:note")) { + if(nod2Student!=null) if(nodStudent==null) nodStudent = nod2Student.retourneFirstEnfantsByNameNode1ContainNameNode2(nameNodeSujet,"text:note"); + if(nod1Student!=null) if(nodStudent==null) nodStudent = nod1Student.retourneFirstEnfantsByNameNode1ContainNameNode2(nameNodeSujet,"text:note"); + if(nod0Student!=null) if(nodStudent==null) nodStudent = nod0Student.retourneFirstEnfantsByNameNode1ContainNameNode2(nameNodeSujet,"text:note"); + } + + if(nodStudent!=null) return nodStudent; } diff --git a/src/evaluer/analyseLesNodesEnfants.java b/src/evaluer/analyseLesNodesEnfants.java index 54fc315..27f83e9 100644 --- a/src/evaluer/analyseLesNodesEnfants.java +++ b/src/evaluer/analyseLesNodesEnfants.java @@ -20,6 +20,7 @@ public class analyseLesNodesEnfants { * @param nodStudentParagraphes : node contenant l'ensemble des nodes styles de paragraphes de l'étudiant. * @param a : Objet de cXML.Run * @return le node pour analyse PourAnalyse + * @throws */ static public node nodeNext(node PourAnalyse, String nomDuNodePourAnalyse, node nod2Student, node nod1Student, node nodStudent, node nodSujet, node nodSujetParagraphs, node nodStudentParagraphes, node nodmenu,Run a) { node nodEnfantSujet = null; @@ -52,15 +53,20 @@ public class analyseLesNodesEnfants { //******************************** PourAnalyse = meptl.addNodeSautTitre(nodEnfantSujet, PourAnalyse,nodmenu,a); -// //******************* -// //** Le node ** -// //******************* -// if(nameNode.equals("OU")) { -// if(nodEnfantSujet.getNodes().size()>1) { -// PourAnalyse = NodeOu(j,nodEnfantSujet, PourAnalyse, nomDuNodePourAnalyse,nod2Student,nod1Student,nodStudent,nodSujet,nodSujetParagraphs,nodStudentParagraphes,nodmenu,a); -// } -// continue; -// } + //******************* + //** Le node ** + //******************* + if(nameNode.equals("OU")) { + if(nodEnfantSujet.getNodes().size()>1) { + try { + PourAnalyse = NodeOu(PourAnalyse, nomDuNodePourAnalyse,nod2Student,nod1Student,nodStudent, nodEnfantSujet,nodSujetParagraphs,nodStudentParagraphes,nodmenu,a); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + continue; + } + } + continue; + } //*************************************************** //** Recherche le node correspondant de l'étudiant ** @@ -72,7 +78,7 @@ public class analyseLesNodesEnfants { nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); } } - if(nodStudentCorrespondantAuNodSujet==null && nod1Student!=null) { + if(nodStudentCorrespondantAuNodSujet==null && nod1Student!=null ) { if(nod1Student.containElementByName(nameNode)) { nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); } @@ -178,67 +184,115 @@ public class analyseLesNodesEnfants { return PourAnalyse; } + /** + * + * @param j + * @param nodEnfantSujet + * @param PourAnalyse + * @param nomDuNodePourAnalyse + * @param nod2Student + * @param nod1Student + * @param nodStudent + * @param nodeOU + * @param nodSujetParagraphs + * @param nodStudentParagraphes + * @param nodmenu + * @param a + * @return + * @throws CloneNotSupportedException + */ + public static node NodeOu( node PourAnalyse, String nomDuNodePourAnalyse, node nod2Student, node nod1Student, node nodStudent, node nodeOU, node nodSujetParagraphs, node nodStudentParagraphes, node nodmenu,Run a) throws CloneNotSupportedException { + + node nodStudentCorrespondantAuNodSujet = null; + + int Pointgagner = 0; + int pointOu = 0; + int pointDebutInitialAvantOU = evaluation.getPointsClass(); + int pointTotalDebutInitialAvantOU = evaluation.getPointTotal(); + int PointTotalNouveau = evaluation.getPointTotal(); -// public static node NodeOu(Integer j , node nodEnfantSujet , node PourAnalyse, String nomDuNodePourAnalyse, node nod2Student, node nod1Student, node nodStudent, node nodSujet, node nodSujetParagraphs, node nodStudentParagraphes, node nodmenu,Run a) { -// -// node nodStudentCorrespondantAuNodSujet = null; -// -// for(int k = j+1 ; k < nodSujet.getNodes().size();k++ ) { -// -// nodEnfantSujet = nodSujet.getNodes().get(k); -// String nameNode = nodEnfantSujet.getNomElt(); -// -// //*************************************************** -// //** Recherche le node correspondant de l'étudiant ** -// //*************************************************** -// if(nodEnfantSujet.getAttributs().get("evaluer")!=null) { -// if(nodEnfantSujet.getAttributs().get("evaluer").equals("true")) { -// if(nod2Student!=null) { -// if(nod2Student.containElementByName(nameNode)) { -// nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); -// } -// } -// if(nodStudentCorrespondantAuNodSujet==null && nod1Student!=null) { -// if(nod1Student.containElementByName(nameNode)) { -// nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); -// } -// } -// if(nodStudentCorrespondantAuNodSujet==null && nodStudent!=null) { -// if(nodStudent.containElementByName(nameNode)) { -// nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); -// } -// } -// } -// } -// -// -// //************************************************************** -// //** Analyse attribut et contenu du node enfant de l'étudiant ** -// //************************************************************** -// PourAnalyse = evaluationAttribut.evalLesAttributEtContenuDuNode(nodStudentCorrespondantAuNodSujet, nodEnfantSujet, PourAnalyse, nomDuNodePourAnalyse,nameNode); -// -// //******************************* -// //** méthode analyseStyle=true ** -// //******************************* -// if(nameNode.contains("text:") && nodEnfantSujet.getAttributs().get("analyseStyle")!=null && nodSujetParagraphs!=null) { -// if(nodEnfantSujet.getAttributs().get("analyseStyle").equalsIgnoreCase("true")) { -// PourAnalyse = analyseStyle(PourAnalyse, nomDuNodePourAnalyse, nodEnfantSujet,nodStudentCorrespondantAuNodSujet, nodSujetParagraphs,nodStudentParagraphes, nodmenu, a); -// } -// } -// -// //************************************************************ -// //** Analyse les nodes enfants du node enfant - Récursivité ** -// //************************************************************ -// if(nodEnfantSujet!=null) { -// PourAnalyse = nodeNext(PourAnalyse, nomDuNodePourAnalyse, nodStudentCorrespondantAuNodSujet, nod2Student, nod1Student, nodEnfantSujet, nodSujetParagraphs, nodStudentParagraphes, nodmenu,a); -// } -// -// -// } -// -// -// return PourAnalyse; -// } + + node nodeFinalARetourner = PourAnalyse.clone(); + + // Le node OU est au rang j donc j+1 + for(int k = 0 ; k < nodeOU.getNodes().size();k++ ) { + + node RetourOU = PourAnalyse.clone(); + + node nodEnfantSujet = nodeOU.getNodes().get(k); + String nameNode = nodEnfantSujet.getNomElt(); + + //*************************************************** + //** Recherche le node correspondant de l'étudiant ** + //*************************************************** + if(nodEnfantSujet.getAttributs().get("evaluer")!=null) { + if(nodEnfantSujet.getAttributs().get("evaluer").equals("true")) { + if(nod2Student!=null) { + if(nod2Student.containElementByName(nameNode)) { + nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); + } + } + if(nodStudentCorrespondantAuNodSujet==null && nod1Student!=null) { + if(nod1Student.containElementByName(nameNode)) { + nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); + } + } + if(nodStudentCorrespondantAuNodSujet==null && nodStudent!=null) { + if(nodStudent.containElementByName(nameNode)) { + nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a); + } + } + } + } + + + //************************************************************** + //** Analyse attribut et contenu du node enfant de l'étudiant ** + //************************************************************** + RetourOU = evaluationAttribut.evalLesAttributEtContenuDuNode(nodStudentCorrespondantAuNodSujet, nodEnfantSujet, RetourOU, nomDuNodePourAnalyse,nameNode); + + //******************************* + //** méthode analyseStyle=true ** + //******************************* + if(nameNode.contains("text:") && nodEnfantSujet.getAttributs().get("analyseStyle")!=null && nodSujetParagraphs!=null) { + if(nodEnfantSujet.getAttributs().get("analyseStyle").equalsIgnoreCase("true")) { + RetourOU = analyseStyle(RetourOU, nomDuNodePourAnalyse, nodEnfantSujet,nodStudentCorrespondantAuNodSujet, nodSujetParagraphs,nodStudentParagraphes, nodmenu, a); + } + } + + //************************************************************ + //** Analyse les nodes enfants du node enfant - Récursivité ** + //************************************************************ + if(nodEnfantSujet!=null) { + RetourOU = nodeNext(RetourOU, nomDuNodePourAnalyse, nodStudentCorrespondantAuNodSujet, nod2Student, nod1Student, nodEnfantSujet, nodSujetParagraphs, nodStudentParagraphes, nodmenu,a); + } + + + Pointgagner = evaluation.getPointsClass(); + + if(Pointgagner>pointOu) { + pointOu = Pointgagner; + PointTotalNouveau = evaluation.getPointTotal(); + try { + nodeFinalARetourner = RetourOU.clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + } + + //RAZ des points + evaluation.setPointsClass(pointDebutInitialAvantOU); + evaluation.setPointTotal(pointTotalDebutInitialAvantOU); + + } + + // Place les points du OU qui correspond au node retour + evaluation.setPointsClass(pointOu); + evaluation.setPointTotal(PointTotalNouveau); + + // Retourne le node maximum de point gagné + return nodeFinalARetourner; + } diff --git a/src/evaluer/analyseLesNodesPrincipaux.java b/src/evaluer/analyseLesNodesPrincipaux.java index 85d00b2..09655f6 100644 --- a/src/evaluer/analyseLesNodesPrincipaux.java +++ b/src/evaluer/analyseLesNodesPrincipaux.java @@ -1186,12 +1186,12 @@ public class analyseLesNodesPrincipaux { //**************************************************************** int points = evaluation.getPointsClass()-pointDebut; int pointTotal = evaluation.getPointTotal()-pointTotalDebut; - double proportioncorrect = points/pointTotal; - - page.getAttributs().put("point", String.valueOf(evaluation.getPointsClass()-pointDebut)); - page.getAttributs().put("pointTotal", String.valueOf(evaluation.getPointTotal()-pointTotalDebut)); - page.getAttributs().put("proportioncorrect", String.valueOf(proportioncorrect)); + Double proportioncorrect = 0.0; + if(pointTotal>0) proportioncorrect = ( (double) points/ (double) pointTotal); + page.getAttributs().put("point", String.valueOf(points)); + page.getAttributs().put("pointTotal", String.valueOf(pointTotal)); + page.getAttributs().put("proportioncorrect", String.valueOf(proportioncorrect)); nodSpages.getNodes().add(page); } @@ -1202,6 +1202,8 @@ public class analyseLesNodesPrincipaux { nodSpages.getAttributs().put("pointgagner",String.valueOf(evaluation.getPointsClass())); nodSpages.getAttributs().put("pointtotal",String.valueOf(evaluation.getPointTotal())); nodSpages.getAttributs().put("proportioncorrect",String.valueOf(evaluation.getProportionCorrect())); + + nodSpages.setClose(true); return nodSpages; diff --git a/src/fenetres/afficheText.java b/src/fenetres/afficheText.java index a301c30..92bd5fa 100644 --- a/src/fenetres/afficheText.java +++ b/src/fenetres/afficheText.java @@ -8,9 +8,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; - import javax.swing.JEditorPane; - import MEPTL.commandes; import cXML.node; import calcul.calculIntervalleBaremeABCDE; @@ -60,6 +58,7 @@ public class afficheText extends JEditorPane { String imageEvalTextUserDefined= ""; String imageEnteteActive= ""; String imagePiedPageActive= ""; + String imageOU= ""; StringBuilder sb = new StringBuilder(); @@ -105,6 +104,7 @@ public class afficheText extends JEditorPane { if(nod.getAttributs().size()==1) sb.append("

L'ATTRIBUT DU NODE

"); if(nod.getAttributs().size()>1) sb.append("

LES ATTRIBUTS DU NODE

"); } + if(nod.getAttributs().size()<=0) { if(nod.getAttributs().size()==1) sb.append("

PAS D'ATTRIBUT DANS CE NODE

"); } @@ -119,7 +119,7 @@ public class afficheText extends JEditorPane { //permet le tri par ordre alphabétique des clés du dictionnaire Lesattributsdunode = Lesattributsdunode.stream().sorted().collect(Collectors.toList()); - if(nod.getAttributs().get("evaluer")!=null) if(nod.getAttributs().get("evaluer").equalsIgnoreCase("true")) { + if(nod.getAttributs().get("evaluer")!=null) if(nod.getAttributs().get("evaluer").equals("true")) { sb.append("
"); sb.append("
    "); sb.append("
  • Les attributs d'analyseWriter
    • "); @@ -133,8 +133,8 @@ public class afficheText extends JEditorPane { } } if(Lesattributsdunode.get(i).equals("titre")||Lesattributsdunode.get(i).equals("titre1")||Lesattributsdunode.get(i).equals("titre2")||Lesattributsdunode.get(i).equals("titre3")) { - if(nod.getAttributs().get(Lesattributsdunode.get(i)).length()>0) { - sb.append("
  • "+imageTitre + " " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); + if(nod.getAttributs().get(Lesattributsdunode.get(i)).length()>0) { + sb.append("
  • "+imageTitre + " " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); } } if(Lesattributsdunode.get(i).equals("saut") && nod.getAttributs().get(Lesattributsdunode.get(i)).equals("true")) { @@ -200,6 +200,10 @@ public class afficheText extends JEditorPane { if(Lesattributsdunode.get(i).equals("evalPiedPageActive") && !nod.getAttributs().get(Lesattributsdunode.get(i)).equals("0")) { sb.append("
  • "+imagePiedPageActive + " " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); } + if(Lesattributsdunode.get(i).equals("pointOuMax")) { + sb.append("
  • "+imageOU+ " " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); + } + // sb.append("
  • " + Lesattributsdunode.get(i) + "=\"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); @@ -239,7 +243,11 @@ public class afficheText extends JEditorPane { sb.append("
  • Les attributs de Writer
    • "); for(int i=0; i < Lesattributsdunode.size();i++) { if(!listeAttributsAnalyseWriter.isAttributAnalyseWriter(Lesattributsdunode.get(i))) { - sb.append("
  • " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); + if(!nod.getAttributs().get(Lesattributsdunode.get(i)).contains("‼")&&!nod.getAttributs().get(Lesattributsdunode.get(i)).contains("‽")) { + sb.append("
  • " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); + }else { + sb.append("
  • " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); + } } } sb.append("
"); @@ -263,7 +271,11 @@ public class afficheText extends JEditorPane { sb.append("
  • Les attributs de Writer
    • "); for(int i=0; i < Lesattributsdunode.size();i++) { if(!listeAttributsAnalyseWriter.isAttributAnalyseWriter(Lesattributsdunode.get(i))) { - sb.append("
  • " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); + if(!nod.getAttributs().get(Lesattributsdunode.get(i)).contains("‼")&&!nod.getAttributs().get(Lesattributsdunode.get(i)).contains("‽")) { + sb.append("
  • " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); + }else { + sb.append("
  • " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"
    • "); + } } } sb.append(""); @@ -276,7 +288,6 @@ public class afficheText extends JEditorPane { if(!nod.getNomElt().equals("fichier")&&!nod.getNomElt().equals("setting")&&!nod.getNomElt().equals("structurepage")) { if(!nod.retourneLesContenusEnfants("").isEmpty()) { sb.append("

    Contenu

    " + nod.retourneLesContenusEnfants2("").replace("'", "’") + "
    " ); //+ nod.retourneLesContenusEnfants("") - System.out.println(nod.retourneLesContenusEnfants2("").replace("'", "’")); } } @@ -286,7 +297,6 @@ public class afficheText extends JEditorPane { if(nod==null) { setText(""); } - } diff --git a/src/fenetres/create.java b/src/fenetres/create.java index e1ae703..a968f8e 100644 --- a/src/fenetres/create.java +++ b/src/fenetres/create.java @@ -29,7 +29,6 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; - import MEPTL.commandes; import MEPTL.ecritureSujet; import cXML.Run; @@ -83,6 +82,7 @@ import fenetres.create_act.actExpandNode; import fenetres.create_act.actNewFichierAnalyse; import fenetres.create_act.actNodeFichier; import fenetres.create_act.actOpen; +import fenetres.create_act.actOu; import fenetres.create_act.actPaste; import fenetres.create_act.actRechercheAnchorPageNumberFalse; import fenetres.create_act.actRechercheAnchorPageNumberTrue; @@ -127,6 +127,7 @@ public final class create extends JFrame { private static DefaultMutableTreeNode selectNode; private static afficheText textNodeSelect = new afficheText(); private JToolBar toolBarPrincipal; + // private toolBarRecherche bRecherche; @@ -141,6 +142,7 @@ public final class create extends JFrame { // private JPanel panel; private static create instance; + /** * Create the application. @@ -214,14 +216,11 @@ public final class create extends JFrame { panelPrincipal.setLayout(new GridLayout(1, 1, 0, 0)); panelPrincipal.add(toolBarPrincipal); - - if(commandes.fichierAnalyseValide) constructionTree(); + if(commandes.fichierAnalyseValide) constructionTree(); this.setExtendedState(MAXIMIZED_BOTH); - + ListenerAction(); - - } @@ -294,7 +293,6 @@ public final class create extends JFrame { mnManageTree.add(new actCollapseAll()); mnManageTree.add(new actCollapseNode()); - //Menu Saut niveau >1 JMenu mnSaut = new JMenu("Saut de ligne avant"); mnSaut.setIcon( new ImageIcon(create.class.getResource("/resources/sautmini.png"))); @@ -308,7 +306,6 @@ public final class create extends JFrame { mnSautNiveau1.add(new actsauttrue()); mnSautNiveau1.add(new actsautfalse()); - //Menu Titre niveau > 1 JMenu mnTitre = new JMenu("Titre"); mnTitre.setIcon( new ImageIcon(create.class.getResource("/resources/titremini.png"))); @@ -449,10 +446,10 @@ public final class create extends JFrame { mnEvaluerStylesParagraphes.setIcon(new ImageIcon(create.class.getResource("/resources/evaluertouslesstylesparagraphesmini.png"))); mnEvaluerStylesParagraphes.add( new actEvaluerTousLesStylesParagraphesTrue()); -// //Menu OU -// JMenu mnOu = new JMenu("Insérer un node OU."); -// mnOu.setIcon(new ImageIcon(create.class.getResource("/resources/oumini.png"))); -// mnOu.add( new actOu()); + //Menu OU + JMenu mnOu = new JMenu("Insérer un node OU."); + mnOu.setIcon(new ImageIcon(create.class.getResource("/resources/oumini.png"))); + mnOu.add( new actOu()); @@ -479,6 +476,8 @@ public final class create extends JFrame { if(nod.getLevel()==1 ) { mnPopupTree.addSeparator(); mnPopupTree.add(mnNiveau1); + mnPopupTree.addSeparator(); + mnPopupTree.add(mnOu); } //Pour les nodes de niveau supérieur à 1 @@ -530,8 +529,8 @@ public final class create extends JFrame { mnPopupTree.add(mnEvalNumeroAbsoluePage); mnPopupTree.addSeparator(); mnPopupTree.add(mnEvaluerStylesParagraphes); -// mnPopupTree.addSeparator(); -// mnPopupTree.add(mnOu); + mnPopupTree.addSeparator(); + mnPopupTree.add(mnOu); } if(nod.getNomElt().equals("text:user-defined") && nod.chemin().contains("structurepage")) { mnPopupTree.addSeparator(); @@ -547,6 +546,8 @@ public final class create extends JFrame { mnPopupTree.add(mnRechercheContenuPlusProcheVoisin); mnPopupTree.addSeparator(); mnPopupTree.add(mnAnalyseStyle); + mnPopupTree.addSeparator(); + mnPopupTree.add(mnOu); } mnPopupTree.addSeparator(); mnPopupTree.add(new actAttribut()); diff --git a/src/fenetres/create_act/actOu.java b/src/fenetres/create_act/actOu.java index e9fcf43..7a81e96 100644 --- a/src/fenetres/create_act/actOu.java +++ b/src/fenetres/create_act/actOu.java @@ -30,8 +30,10 @@ public class actOu extends AbstractAction{ node nodeOu = new node(); nodeOu.setNomElt("OU"); nod.getNodes().add(nodeOu); - nodeOu.setParent(nod); + nodeOu.getAttributs().put("pointOuMax","1"); + nodeOu.getAttributs().put("evaluer","true"); + nodeOu.setClose(true); DefaultMutableTreeNode node1 = new DefaultMutableTreeNode(nodeOu); nodMu.add(node1); diff --git a/src/fenetres/create_act/actPaste.java b/src/fenetres/create_act/actPaste.java index b2bc5ff..97563bf 100644 --- a/src/fenetres/create_act/actPaste.java +++ b/src/fenetres/create_act/actPaste.java @@ -43,7 +43,7 @@ public class actPaste extends AbstractAction{ try { paste = "" + c.getContents(null).getTransferData(DataFlavor.stringFlavor).toString().replace("\t","").replace("\r", "").replace("\n", ""); if (!paste.equals(initial)) { - node nodCopy =new node(paste); + node nodCopy = new node(paste); if(!nodCopy.getNomElt().isEmpty()) { TreePath path = fenetres.create.getTree().getSelectionPath(); @@ -51,7 +51,9 @@ public class actPaste extends AbstractAction{ node nod = (node) fenetres.create.getSelectNode().getUserObject(); DefaultMutableTreeNode nodeMu = fenetres.create.getSelectNode(); + nodCopy = MiseInformationDansLeNodeCopierColler(nodCopy,nod); nod.getNodes().add(nodCopy); + DefaultMutableTreeNode node1 = new DefaultMutableTreeNode(nodCopy); nodeMu.add(node1); @@ -81,7 +83,45 @@ public class actPaste extends AbstractAction{ } + /** + * + * @param nodePaste + * @param nodeParent + * @return + */ + private static node MiseInformationDansLeNodeCopierColler(node nodePaste, node nodeParent) { + nodePaste.setParent(nodeParent); + nodePaste.setLevel(nodeParent.getLevel()+1); + for(int i=0;i1) { + node nodChild = nodePaste.getNodes().get(i); + nodChild = MiseAJoutInfoChild(nodChild); + } + } + return nodePaste; + } + /** + * + * @param nodChild + * @return + */ + private static node MiseAJoutInfoChild(node nodChild) { + for(int i = 0 ; iLes fichiers des étudiants
    ne sont pas dans des dossiers nominatifs"); + chckbxfichiersEtudiants = new JCheckBox("Les fichiers des étudiants
    ne sont pas dans des dossiers nominatifs"); chckbxfichiersEtudiants.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { if(chckbxfichiersEtudiants.isSelected()) { @@ -317,15 +308,9 @@ public class evaluate extends JFrame { this.setExtendedState(MAXIMIZED_BOTH); - - - ListenerAction(); - refreshLabel(); setVisible(true); - - } @@ -392,6 +377,8 @@ public class evaluate extends JFrame { mnMenu_Informations.add(actTutoriels); mnMenu_Informations.addSeparator(); mnMenu_Informations.add( new actAbout() ); + mnMenu_Informations.addSeparator(); + mnMenu_Informations.add(actDocumentation); } @@ -931,7 +918,28 @@ public class evaluate extends JFrame { System.out.println( "Affiche les tutoriels." ); } }; - + + + + /** + * Affiche les tutoriels sur Youtube.
    + */ + private AbstractAction actDocumentation = new AbstractAction() { + + private static final long serialVersionUID = 1L; + + { + putValue( Action.NAME, "Documentation analyseWriter" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/documentationmini.png"))); + putValue(Action.LARGE_ICON_KEY, new ImageIcon(create.class.getResource("/resources/documentation.png"))); + putValue( Action.SHORT_DESCRIPTION, "Tutoriels" ); + } + + @Override public void actionPerformed( ActionEvent e ) { + + + }; + }; /** * Affiche le code XMl du fichier d'analyse diff --git a/src/list/listeAttributsAnalyseWriter.java b/src/list/listeAttributsAnalyseWriter.java index 8afdfba..fe9845f 100644 --- a/src/list/listeAttributsAnalyseWriter.java +++ b/src/list/listeAttributsAnalyseWriter.java @@ -70,6 +70,11 @@ public class listeAttributsAnalyseWriter { if(attribut.equals("progression")) return true; if(attribut.equals("version")) return true; + //Le node OU + if(attribut.equals("OU")) return true; + if(attribut.equals("pointOuMax")) return true; + + // if(attribut.equals("page_start:text_contenu_index")) return true; diff --git a/src/resources/doc1.html b/src/resources/doc1.html new file mode 100644 index 0000000..4dc4933 --- /dev/null +++ b/src/resources/doc1.html @@ -0,0 +1,19 @@ + + + + + + + + + + + + +

    +Documentation analyseWriter

    + + \ No newline at end of file