[Fudaa-svn-commit] SF.net SVN: fudaa:[4295] branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa /dodico/telemac/io/ScopeStructure.java

[<had...@us...>]

Revision: 4295
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4295&view=rev
Author:   hadouxad
Date:     2008-12-11 18:44:43 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
corrections bugs

Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java

Modified: branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java	2008-12-11 09:14:38 UTC (rev 4294)
+++ branches/Prepro-0.92-SNAPSHOT/dodico/src/org/fudaa/dodico/telemac/io/ScopeStructure.java	2008-12-11 18:44:43 UTC (rev 4295)
@@ -474,7 +474,7 @@
     
     
     public EvolutionReguliere[] returnEvolReguliere() {
-      EvolutionReguliere[] evolReg = new EvolutionReguliere[getNbSeparator() * getNbVariables()];
+      EvolutionReguliere[] evolReg = new EvolutionReguliere[getNbSeparator() * (getNbVariables()-1)];
 
       // -- on parcours tous les pas de temps --//
       for (int h = 0; h < getNbSeparator(); h++) {
@@ -482,11 +482,11 @@
         String pdt = getSeparator(h);
         
       // -- on parcours toutes les variables et non les x --//
-      for (int i = 1; i < getNbVariables(); i++) {
-        String nomVar = getVariable(i);
+      for (int i = 0; i < getNbVariables()-1; i++) {
+        String nomVar = getVariable(i+1);
 
         List<Double> listeX = getAllX(pdt);
-        List<Double> listeY = getListValueForVariableForSeparator(pdt, i);
+        List<Double> listeY = getListValueForVariableForSeparator(pdt, i+1);
 
         double[] tabX = new double[listeX.size()];
         double[] tabY = new double[listeY.size()];
@@ -511,12 +511,13 @@
      * @return
      */
     public EvolutionReguliere[] returnEvolRegulierePourTemporelles() {
-        EvolutionReguliere[] evolReg = new EvolutionReguliere[getNbVariables()];
+        EvolutionReguliere[] evolReg = new EvolutionReguliere[getNbVariables()-1];
 
                 
         // -- on parcours toutes les variables et non les x, on a une seule variable --//
-        for (int i = 1; i < getNbVariables(); i++) {
-          String nomVar = getVariable(i);
+        for (int i = 0; i < getNbVariables()-1; i++) {
+        //-- on recupere les variables i+1 car la var 0 = les X --//  
+        String nomVar = getVariable(i+1);
 
           List<Double> listeTOTALX =new ArrayList<Double>();
           List<Double> listeTOTALY = new ArrayList<Double>();
@@ -526,7 +527,7 @@
         	  //on recupere les x de ce separator
         	  List<Double> listX=getListValueForVariableForSeparator(getSeparator(k), 0);
         	  //on recupere les y de la variable de la courbe
-        	  List<Double> listY=getListValueForVariableForSeparator(getSeparator(k), i);
+        	  List<Double> listY=getListValueForVariableForSeparator(getSeparator(k), i+1);
         	  
         	  //on ajoute tout cela au x et y totaux
         	  listeTOTALX.addAll(listX);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.