diff --git a/analyseWriter.exe b/analyseWriter.exe index ac74fc0..d97c455 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 0b30a60..a2991a1 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/MEPTL/meptl.class b/bin/MEPTL/meptl.class index dc67fe9..38d9222 100644 Binary files a/bin/MEPTL/meptl.class and b/bin/MEPTL/meptl.class differ diff --git a/bin/evaluer/evaluationAttribut.class b/bin/evaluer/evaluationAttribut.class index d0a0633..fd00d35 100644 Binary files a/bin/evaluer/evaluationAttribut.class and b/bin/evaluer/evaluationAttribut.class differ diff --git a/src/MEPTL/meptl.java b/src/MEPTL/meptl.java index 24e0a96..88fba23 100644 --- a/src/MEPTL/meptl.java +++ b/src/MEPTL/meptl.java @@ -2673,12 +2673,11 @@ public class meptl { if(LeStyleDefaut!=null) { node styleparagraphproperties = LeStyleDefaut.retourneFirstEnfantsByName("style:paragraph-properties"); if(styleparagraphproperties!=null) { - if(styleparagraphproperties.getAttributs().get("fo:margin-bottom")==null) LeStyleDefaut.getAttributs().put("fo:margin-bottom", "0"); - if(styleparagraphproperties.getAttributs().get("fo:margin-left")==null) LeStyleDefaut.getAttributs().put("fo:margin-left", "0"); - if(styleparagraphproperties.getAttributs().get("fo:margin-right")==null) LeStyleDefaut.getAttributs().put("fo:margin-right", "0"); - if(styleparagraphproperties.getAttributs().get("fo:margin-right")==null) LeStyleDefaut.getAttributs().put("fo:margin-right", "0"); - if(styleparagraphproperties.getAttributs().get("fo:margin-top")==null) LeStyleDefaut.getAttributs().put("fo:margin-top", "0"); - if(styleparagraphproperties.getAttributs().get("fo:text-indent")==null) LeStyleDefaut.getAttributs().put("fo:text-indent", "0"); + if(styleparagraphproperties.getAttributs().get("fo:margin-bottom")==null) styleparagraphproperties.getAttributs().put("fo:margin-bottom", "0"); + if(styleparagraphproperties.getAttributs().get("fo:margin-left")==null) styleparagraphproperties.getAttributs().put("fo:margin-left", "0"); + if(styleparagraphproperties.getAttributs().get("fo:margin-right")==null) styleparagraphproperties.getAttributs().put("fo:margin-right", "0"); + if(styleparagraphproperties.getAttributs().get("fo:margin-top")==null) styleparagraphproperties.getAttributs().put("fo:margin-top", "0"); + if(styleparagraphproperties.getAttributs().get("fo:text-indent")==null) styleparagraphproperties.getAttributs().put("fo:text-indent", "0"); } } diff --git a/src/evaluer/evaluationAttribut.java b/src/evaluer/evaluationAttribut.java index 020da43..347d624 100644 --- a/src/evaluer/evaluationAttribut.java +++ b/src/evaluer/evaluationAttribut.java @@ -661,7 +661,10 @@ public class evaluationAttribut { if(nodeStudentfereAvant==null) nodeStudentfereAvant = new node(); String A = nodeSujetfrereAvant.retourneLesContenusEnfants(""); String B = nodeStudentfereAvant.retourneLesContenusEnfants(""); - if(A.isEmpty() && B.isEmpty()) calcul++; + + if(A.isEmpty()) A = "Paragraphe vide"; + if(B.isEmpty()) B = "Paragraphe vide"; + if(!A.isEmpty() && !B.isEmpty()) if(cXML.StringSimilarity.similarity(A, B)>0.92) calcul++; if(calcul==1) {