fudaa-cvs-commit

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

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

Modified Files:
	CLTransitoireFileFormat.java CorEleBthReader.java 
	CorEleBthWriter.java CrbFileFormat.java INPWriter.java 
Log Message:
Maj version 0.04


Index: CLTransitoireFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CLTransitoireFileFormat.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CLTransitoireFileFormat.java	19 Dec 2003 12:10:37 -0000	1.6
--- CLTransitoireFileFormat.java	21 Jan 2004 10:59:10 -0000	1.7
***************
*** 9,12 ****
--- 9,13 ----
  package org.fudaa.dodico.reflux.io;
  import java.io.File;
+ import java.util.Map;
  
  import org.fudaa.dodico.commun.DodicoResource;
***************
*** 37,41 ****
    private CLTransitoireFileFormat() {
      super(1);
!     nom_= DodicoResource.getS("courbes transitoires (preflux, format binaire)");
      extensions_= new String[] { "clv" };
      ID_= "REFLUX_CLV";
--- 38,42 ----
    private CLTransitoireFileFormat() {
      super(1);
!     nom_= DodicoResource.getS("Reflux courbes transitoires (format binaire)");
      extensions_= new String[] { "clv" };
      ID_= "REFLUX_CLV";
***************
*** 95,99 ****
      public FileOperationSynthese readEvolutions(
        File _f,
!       ProgressionInterface _prog) {
          return read(_f, _prog);
      }
--- 96,100 ----
      public FileOperationSynthese readEvolutions(
        File _f,
!       ProgressionInterface _prog,Map _options) {
          return read(_f, _prog);
      }

Index: CorEleBthReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CorEleBthReader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CorEleBthReader.java	12 Dec 2003 10:30:54 -0000	1.12
--- CorEleBthReader.java	21 Jan 2004 10:59:10 -0000	1.13
***************
*** 289,293 ****
      } catch (EOFException _e) {
        if (CtuluLib.DEBUG)
!         System.out.println("Reading end");
      } catch (NumberFormatException fe) {
        DodicoAnalyze.manageException(fe, analyze_, eleIn_);
--- 289,293 ----
      } catch (EOFException _e) {
        if (CtuluLib.DEBUG)
!         CtuluLib.debug("Reading end");
      } catch (NumberFormatException fe) {
        DodicoAnalyze.manageException(fe, analyze_, eleIn_);
***************
*** 380,384 ****
      } catch (EOFException e) {
        if (CtuluLib.DEBUG)
!         System.out.println("Reading end");
      } catch (NumberFormatException fe) {
        DodicoAnalyze.manageException(fe, analyze_, corIn_);
--- 380,384 ----
      } catch (EOFException e) {
        if (CtuluLib.DEBUG)
!         CtuluLib.debug("Reading end");
      } catch (NumberFormatException fe) {
        DodicoAnalyze.manageException(fe, analyze_, corIn_);
***************
*** 441,445 ****
      } catch (EOFException e) {
        if (CtuluLib.DEBUG)
!         System.out.println("Reading end");
      } catch (NumberFormatException fe) {
        DodicoAnalyze.manageException(fe, analyze_, bthIn_);
--- 441,445 ----
      } catch (EOFException e) {
        if (CtuluLib.DEBUG)
!       CtuluLib.debug("Reading end");
      } catch (NumberFormatException fe) {
        DodicoAnalyze.manageException(fe, analyze_, bthIn_);

Index: CorEleBthWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CorEleBthWriter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CorEleBthWriter.java	12 Dec 2003 10:30:54 -0000	1.11
--- CorEleBthWriter.java	21 Jan 2004 10:59:10 -0000	1.12
***************
*** 288,293 ****
      int pas= (int) (nbLigne / step);
      int pMax= pas;
-     //Le nombre de ligne entiere a ecrire.
-     System.out.println(nbLigne);
      int index= 0;
      for (int numLigne= 0; numLigne < nbLigne; numLigne++) {
--- 288,291 ----

Index: CrbFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CrbFileFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CrbFileFormat.java	19 Dec 2003 12:10:37 -0000	1.1
--- CrbFileFormat.java	21 Jan 2004 10:59:10 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  package org.fudaa.dodico.reflux.io;
  import java.io.File;
+ import java.util.Map;
  
  import org.fudaa.dodico.commun.DodicoResource;
***************
*** 38,42 ****
    private CrbFileFormat() {
      super(1);
!     nom_= DodicoResource.getS("Fichier crb (preflux)");
      extensions_= new String[] { "crb" };
      ID_= "CRB";
--- 39,43 ----
    private CrbFileFormat() {
      super(1);
!     nom_= DodicoResource.getS("Reflux crb");
      extensions_= new String[] { "crb" };
      ID_= "CRB";
***************
*** 96,100 ****
      public FileOperationSynthese readEvolutions(
        File _f,
!       ProgressionInterface _prog) {
        return read(_f, _prog);
      }
--- 97,101 ----
      public FileOperationSynthese readEvolutions(
        File _f,
!       ProgressionInterface _prog,Map _options) {
        return read(_f, _prog);
      }

Index: INPWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/INPWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** INPWriter.java	19 Dec 2003 12:10:37 -0000	1.12
--- INPWriter.java	21 Jan 2004 10:59:10 -0000	1.13
***************
*** 863,866 ****
--- 863,868 ----
              }
            }
+           //le groupe 0 pour les T3 non solide avec frottement
+           else grpIdx.add(0);
          }
          if (groupeBord.size() > 0)