Changeset 70 for ether_eccad/trunk/ECCAD_INTERFACE/WEB-INF/src/org/medias/eccad/modele/ResultatStat.java

Timestamp:

04/26/10 19:12:49 (14 years ago)

Author:

cbipsl

Message:

maj eccad V3.2

File:

• ether_eccad/trunk/ECCAD_INTERFACE/WEB-INF/src/org/medias/eccad/modele/ResultatStat.java (modified) (4 diffs)

ether_eccad/trunk/ECCAD_INTERFACE/WEB-INF/src/org/medias/eccad/modele/ResultatStat.java

@@ -2 +2 @@
 
 import java.lang.Double;
-
-import org.medias.eccad.helpers.LoggerPerso;
-import org.medias.eccad.metier.statistique.ServiceStatistique;
+import java.math.BigDecimal;
 
 public class ResultatStat {
@@ -19 +17 @@
         }
 
-        public ResultatStat(String min, String max, String moyenne, String ecart, String somme) {
+        public ResultatStat(String min, String max, String moyenne, String ecart, String somme, String type) {
                 super();
                 
@@ -28 +26 @@
                 somme = fixeDecimal(somme);*/
                 
-                
-                
                 double minFloat = Double.parseDouble(min);
                 double maxFloat = Double.parseDouble(max);
                 double moyenneFloat = Double.parseDouble(moyenne);  
                 double ecartFloat = Double.parseDouble(ecart); 
-                double sommeFloat = Double.parseDouble(somme); 
+                double sommeFloat = Double.parseDouble(somme);
+                // On arrondit le min, le max et la somme si on attend des valeurs entiÚres en sortie
+                if (type.equals("positive integer")) {
+                        minFloat = (new BigDecimal(Math.round(minFloat))).doubleValue();
+                        maxFloat = (new BigDecimal(Math.round(maxFloat))).doubleValue();
+                        sommeFloat = (new BigDecimal(Math.round(sommeFloat))).doubleValue();
+                }
                 
-                
-                
-                min = (String)Double.toString(minFloat);
-                max = (String)Double.toString(maxFloat);
-                moyenne = (String)Double.toString(moyenneFloat);
-                ecart = (String)Double.toString(ecartFloat);
-                somme = (String)Double.toString(sommeFloat);
+                min = Double.toString(minFloat);
+                max = Double.toString(maxFloat);
+                moyenne = Double.toString(moyenneFloat);
+                ecart = Double.toString(ecartFloat);
+                somme = Double.toString(sommeFloat);
 
-                LoggerPerso.log(ResultatStat.class, LoggerPerso.DEBUG, "min : "+ min + fixeDecimal(moyenne));
+//              LoggerPerso.log(ResultatStat.class, LoggerPerso.DEBUG, "min : "+ min + "   max : "+ max + " - fixeDecimal : "+fixeDecimal(moyenne));
                 //min = fixeDecimal(min.toString());
                 
@@ -64 +64 @@
         
         private String fixeDecimal(String entree) {
-                LoggerPerso.log(ServiceStatistique.class, LoggerPerso.DEBUG, "entree 1 "+entree);
+//              LoggerPerso.log(ServiceStatistique.class, LoggerPerso.DEBUG, "entree 1 "+entree);
                 if (entree == null)
                         return "nc";
                 int index = entree.lastIndexOf(".");
                 int indexE = entree.lastIndexOf("E");
-                LoggerPerso.log(ServiceStatistique.class, LoggerPerso.DEBUG, "entree  --lll-->2 "+indexE+"  "+index+"  "+entree.length());
-                if ( indexE == -1 && index != -1 && entree.length() >= index + 5) {
-                        LoggerPerso.log(ServiceStatistique.class, LoggerPerso.DEBUG, "cas 1 entree");
-                        entree = entree.substring(0, entree.lastIndexOf(".")+5);
+//              LoggerPerso.log(ServiceStatistique.class, LoggerPerso.DEBUG, "entree  --lll-->2 "+indexE+"  "+index+"  "+entree.length());
+//              if ( indexE == -1 && index != -1 && entree.length() >= index + 5) {
+//                      entree = entree.substring(0, entree.lastIndexOf(".")+5);
+//              }
+//              else if ( indexE != -1 && index != -1 && entree.length() >= index + 5)
+//              {
+//                      String aEntree = entree;
+//                      LoggerPerso.log(ServiceStatistique.class, LoggerPerso.DEBUG, "aEntree "+aEntree.lastIndexOf("E")+"  "+aEntree.length()+"    "+aEntree.lastIndexOf("E")+"  "+aEntree.length());
+//                      aEntree = aEntree.substring(aEntree.lastIndexOf("E"), aEntree.lastIndexOf("E")+aEntree.length()-aEntree.lastIndexOf("E"));
+                        //entree = entree.substring(0, entree.lastIndexOf(".")+5)+aEntree;
+//                      entree = entree.substring(0, entree.substring(0 , entree.lastIndexOf("E")).length()) + aEntree;
+//              }
+                
+                // Le nombre a une virgule et pas de puissance de 10 (n=xx.xxx)
+                if (indexE == -1 && index != -1 && entree.length() >= index + 3) {
+                        entree = entree.substring(0,index+3);
                 }
-                else if ( indexE != -1 && index != -1 && entree.length() >= index + 5)
-                {
-                        LoggerPerso.log(ServiceStatistique.class, LoggerPerso.DEBUG, "cas 2 entree");
-                        String aEntree = entree;
-                        LoggerPerso.log(ServiceStatistique.class, LoggerPerso.DEBUG, "aEntree "+aEntree.lastIndexOf("E")+"  "+aEntree.length()+"    "+aEntree.lastIndexOf("E")+"  "+aEntree.length());
-                        aEntree=aEntree.substring(aEntree.lastIndexOf("E"), aEntree.lastIndexOf("E")+aEntree.length()-aEntree.lastIndexOf("E"));
-                        entree = entree.substring(0, entree.lastIndexOf(".")+5)+aEntree;
+                // Le nombre a une virgule et une puissance de 10 (n=xx.xxxExx)
+                else if ( indexE != -1 && index != -1 && entree.substring(0,indexE).length() >= index + 3) {
+                        entree = entree.substring(0,index+3)+entree.substring(indexE);
                 }
-                else {
-                        LoggerPerso.log(ServiceStatistique.class, LoggerPerso.DEBUG, "entree= "+entree);
-                }
-                
+//              LoggerPerso.log(ServiceStatistique.class, LoggerPerso.DEBUG, "entree "+entree);
                 return entree;
         }