[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/mesure EvolutionReader.java,1.1,1.2

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure
In directory sc8-pr-cvs1:/tmp/cvs-serv14635/mesure

Modified Files:
	EvolutionReader.java 
Log Message:
Maj version 0.04


Index: EvolutionReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/EvolutionReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EvolutionReader.java	19 Dec 2003 12:10:37 -0000	1.1
--- EvolutionReader.java	21 Jan 2004 10:59:10 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  import java.io.IOException;
  import java.io.LineNumberReader;
+ import java.util.ArrayList;
  import java.util.StringTokenizer;
  
***************
*** 36,39 ****
--- 37,44 ----
    ReaderDelegate reader_;
    FileFormatVersion v_;
+   
+   public EvolutionReader() {
+     this(null);
+   }
    /**
     * 
***************
*** 48,89 ****
      if ((file_ == null) || (!file_.exists()))
        return new String[0][0];
!     String[][] r= null;
      try {
!       reader_.init();
!       int idx= 0;
        if (reader_.readLine()) {
!         if (reader_.name_ != null) {
!           idx++;
!           r= new String[4][reader_.vals_.length + 1];
!           for(int i=r[0].length-1;i>=0;i--){
!             r[0][i]=getName(i);
!           }
!         } else
!           r= new String[3][reader_.vals_.length + 1];
!         r[idx][0]= Double.toString(reader_.t_);
!         for (int i= 0; i < reader_.vals_.length; i++) {
!           r[idx][i + 1]= Double.toString(reader_.vals_[i]);
          }
!         idx++;
!       }
! 
!       if (reader_.readLine()) {
!         if (r == null)
!           r= new String[2][reader_.vals_.length + 1];
!         r[idx][0]= Double.toString(reader_.t_);
!         for (int i= 0; i < reader_.vals_.length; i++) {
!           r[idx][i + 1]= Double.toString(reader_.vals_[i]);
!           idx++;
          }
        }
!       if (reader_.readLine()) {
!         if (r == null)
!           r= new String[1][reader_.vals_.length + 1];
!         r[idx][0]= Double.toString(reader_.t_);
!         for (int i= 0; i < reader_.vals_.length; i++) {
!           r[idx][i + 1]= Double.toString(reader_.vals_[i]);
          }
-       }
  
      } catch (IOException _io) {} finally {
        try {
--- 53,90 ----
      if ((file_ == null) || (!file_.exists()))
        return new String[0][0];
!     ArrayList r= new ArrayList();
!     int nbEvol= -1;
!     String[] temp;
      try {
!       reader_.initReader();
        if (reader_.readLine()) {
!         nbEvol= reader_.vals_.length;
!         temp= new String[nbEvol + 1];
!         for (int i= nbEvol; i >= 0; i--) {
!           temp[i]= getName(i);
          }
!         r.add(temp);
!         temp= new String[nbEvol + 1];
!         temp[0]= Double.toString(reader_.t_);
!         for (int i= nbEvol-1; i >=0 ; i--) {
!           temp[i + 1]= Double.toString(reader_.vals_[i]);
          }
+         r.add(temp);
        }
!       for (int j= 3; j > 0; j--) {
!         if (reader_.readLine()) {
!           if (nbEvol < 0) {
!             nbEvol= reader_.vals_.length;
!           }
!           temp= new String[nbEvol + 1];
! 
!           temp[0]= Double.toString(reader_.t_);
!           for (int i= nbEvol - 1; i >= 0; i--) {
!             temp[i + 1]= Double.toString(reader_.vals_[i]);
!           }
!           r.add(temp);
          }
  
+       }
      } catch (IOException _io) {} finally {
        try {
***************
*** 93,113 ****
        }
      }
!     return r == null ? new String[0][0] : r;
!   }
!   
!   public String getName(int _idx){
!     if((reader_.name_!=null) && (_idx<reader_.name_.length-1)){
!       return reader_.name_[_idx+1];
      }
      else
!     return DodicoLib.getSansExtension(file_.getName())
!     + "-"
!     + CtuluLib.getString(_idx + 1);
    }
  
    private EvolutionReguliere[] readEvolutions() {
      EvolutionReguliere[] r= null;
      try {
!       reader_.init();
        while (reader_.hasNext()) {
          if (reader_.readLine()) {
--- 94,122 ----
        }
      }
!     String[][] rf= new String[r.size()][];
!     for(int i=r.size()-1;i>=0;i--){
!       DodicoLib._printObject(r.get(i), true);
!       temp=(String[])r.get(i);
!       rf[i]=temp;
      }
+     return rf;
+   }
+ 
+   public String getName(int _idx) {
+     if ((reader_.name_ != null) && (_idx < reader_.name_.length)) {
+       return reader_.name_[_idx];
+     } else if (_idx == 0)
+       return "t (sec)";
      else
!       return DodicoLib.getSansExtension(file_.getName())
!         + "-"
!         + CtuluLib.getString(_idx);
    }
  
    private EvolutionReguliere[] readEvolutions() {
+     
      EvolutionReguliere[] r= null;
      try {
!       reader_.initReader();
        while (reader_.hasNext()) {
          if (reader_.readLine()) {
***************
*** 115,120 ****
              r= new EvolutionReguliere[reader_.vals_.length];
              for (int i= reader_.vals_.length - 1; i >= 0; i--) {
!               r[i]=
!                 new H2dEvolution(getName(i));
              }
            }
--- 124,128 ----
              r= new EvolutionReguliere[reader_.vals_.length];
              for (int i= reader_.vals_.length - 1; i >= 0; i--) {
!               r[i]= new H2dEvolution(getName(i + 1));
              }
            }
***************
*** 153,157 ****
      double[] vals_;
      String[] name_;
!     public abstract void init() throws IOException;
      public abstract boolean readLine();
      public abstract boolean hasNext();
--- 161,170 ----
      double[] vals_;
      String[] name_;
!     public void initReader() throws IOException{
!       vals_=null;
!       name_=null;
!       init();
!     }
!     protected abstract void init() throws IOException;
      public abstract boolean readLine();
      public abstract boolean hasNext();
***************
*** 171,176 ****
        reader_= new LineNumberReader(new FileReader(file_));
        line_= reader_.readLine();
!       oneLineRead_=false;
      }
  
      public void close() throws IOException {
--- 184,191 ----
        reader_= new LineNumberReader(new FileReader(file_));
        line_= reader_.readLine();
!       vals_=null;
!       oneLineRead_= false;
      }
+     
  
      public void close() throws IOException {
***************
*** 196,202 ****
                  validLine= false;
                  //on suppose que la ligne représente les noms des courbes
!                 if( (name_ == null) && (!oneLineRead_)){
!                   name_=
!                     new String[vals_ == null ? nbToken : vals_.length+1];
                    name_[0]= temp;
                    int nb= name_.length;
--- 211,216 ----
                  validLine= false;
                  //on suppose que la ligne représente les noms des courbes
!                 if ((name_ == null) && (!oneLineRead_)) {
!                   name_= new String[vals_ == null ? nbToken : vals_.length + 1];
                    name_[0]= temp;
                    int nb= name_.length;
***************
*** 205,208 ****
--- 219,223 ----
                      name_[idx++]= t.nextToken();
                    }
+                   oneLineRead_=true;
                    return readLine();
                  }
***************
*** 228,232 ****
                if (validLine) {
                  line_= reader_.readLine();
!                 oneLineRead_=true;
                  return true;
                }
--- 243,247 ----
                if (validLine) {
                  line_= reader_.readLine();
!                 oneLineRead_= true;
                  return true;
                }
***************
*** 240,244 ****
            else
              line_= line_.trim();
- 
          }
        } catch (IOException e) {
--- 255,258 ----