Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer
In directory sc8-pr-cvs1:/tmp/cvs-serv3398/dodico/src/org/fudaa/dodico/navmer
Modified Files:
ClientNavmer.java DResultatsNavmer.java DParametresNavmer.java
DCalculNavmer.java
Log Message:
suppression des variables inutiles
Index: ClientNavmer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/ClientNavmer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClientNavmer.java 29 Jan 2003 12:14:41 -0000 1.1
--- ClientNavmer.java 18 Mar 2003 13:12:29 -0000 1.2
***************
*** 41,50 ****
public static void main(String[] argv)
{
- //Structures necessaires au test
- SParametresINI initialisation;
- SCoefficientsNavire scoefnav;
- SResultatsDAT[] sdata = new SResultatsDAT[2];
- SIndexZonesCourant sidxzonescourant;
- SZoneCourant[] szonescourant;
ICalculNavmer nv = null;
--- 41,44 ----
Index: DResultatsNavmer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/DResultatsNavmer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DResultatsNavmer.java 29 Jan 2003 12:14:41 -0000 1.1
--- DResultatsNavmer.java 18 Mar 2003 13:12:29 -0000 1.2
***************
*** 103,107 ****
SResultatsDAT sdata = null;
double d;
- SParametresProgramme prog;
SCinematiqueNavire cinematique;
SOrdreNavire ord;
--- 103,106 ----
Index: DParametresNavmer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/DParametresNavmer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DParametresNavmer.java 29 Jan 2003 12:14:41 -0000 1.1
--- DParametresNavmer.java 18 Mar 2003 13:12:29 -0000 1.2
***************
*** 588,618 ****
//On crée des string à partir des infos receuillies
! String line1 = new String(paramprog.periodeSortieResultats + "," + entete.tempsFin
! + "," + paramprog.periodePriseEnCompteEtat + ",\n");
! String line2 = new String(paramcin.cap + "," + paramcin.x + "," + paramcin.y
+ "," + paramcin.vitesseLongitudinale + "," + paramcin.vitesseLaterale
+ "," + paramcin.vitesseRotationnelle + "," + _Initialisation.entete.navire
! + "," + _Initialisation.entete.port + ",\n");
! String line3 = new String(1 + "," + paramcom.gouvernail
+ "," + paramcom.nombreToursBabord + "," + paramcom.nombreToursTribord
+ "," + paramcom.pasHeliceBabord + "," + paramcom.pasHeliceTribord
+ "," + paramcom.anglePropulseurAvant + "," + paramcom.forcePropulseurAvant
+ "," + paramcom.anglePropulseurArriere + "," + paramcom.forcePropulseurArriere
! + ",\n");
! String line4 = new String(1 + "," + paramordre.gouvernail + "," + paramordre.nombreToursBabord
+ "," + paramordre.nombreToursTribord + "," + paramordre.pasHeliceBabord
+ "," + paramordre.pasHeliceTribord + "," + paramordre.anglePropulseurAvant
+ "," + paramordre.forcePropulseurAvant + "," + paramordre.anglePropulseurArriere
! + "," + paramordre.forcePropulseurArriere + ",\n");
int s = (paramenv.sens == true) ? 1 : 0;
! String line5 = new String(paramenv.profondeur + "," + paramenv.angleIncidenceVent
+ "," + paramenv.moduleVent + "," + paramenv.vitesseMoyenneX + ","
+ paramenv.vitesseMoyenneY + "," + paramenv.vitesseRotationnelleMoyenne
+ "," + paramenv.distanceBergeBabord + "," + paramenv.distanceBergeTribord
! + "," + s + ",\n");
int i;
--- 588,618 ----
//On crée des string à partir des infos receuillies
! String line1 = paramprog.periodeSortieResultats + "," + entete.tempsFin
! + "," + paramprog.periodePriseEnCompteEtat + ",\n";
! String line2 = paramcin.cap + "," + paramcin.x + "," + paramcin.y
+ "," + paramcin.vitesseLongitudinale + "," + paramcin.vitesseLaterale
+ "," + paramcin.vitesseRotationnelle + "," + _Initialisation.entete.navire
! + "," + _Initialisation.entete.port + ",\n";
! String line3 = 1 + "," + paramcom.gouvernail
+ "," + paramcom.nombreToursBabord + "," + paramcom.nombreToursTribord
+ "," + paramcom.pasHeliceBabord + "," + paramcom.pasHeliceTribord
+ "," + paramcom.anglePropulseurAvant + "," + paramcom.forcePropulseurAvant
+ "," + paramcom.anglePropulseurArriere + "," + paramcom.forcePropulseurArriere
! + ",\n";
! String line4 = 1 + "," + paramordre.gouvernail + "," + paramordre.nombreToursBabord
+ "," + paramordre.nombreToursTribord + "," + paramordre.pasHeliceBabord
+ "," + paramordre.pasHeliceTribord + "," + paramordre.anglePropulseurAvant
+ "," + paramordre.forcePropulseurAvant + "," + paramordre.anglePropulseurArriere
! + "," + paramordre.forcePropulseurArriere + ",\n";
int s = (paramenv.sens == true) ? 1 : 0;
! String line5 = paramenv.profondeur + "," + paramenv.angleIncidenceVent
+ "," + paramenv.moduleVent + "," + paramenv.vitesseMoyenneX + ","
+ paramenv.vitesseMoyenneY + "," + paramenv.vitesseRotationnelleMoyenne
+ "," + paramenv.distanceBergeBabord + "," + paramenv.distanceBergeTribord
! + "," + s + ",\n";
int i;
Index: DCalculNavmer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/DCalculNavmer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DCalculNavmer.java 29 Jan 2003 12:14:41 -0000 1.1
--- DCalculNavmer.java 18 Mar 2003 13:12:29 -0000 1.2
***************
*** 55,75 ****
/**
- * Affecte la valeur Progression de DCalculNavmer object
- *
- * @param op La nouvelle valeur Progression
- * @param pc La nouvelle valeur Progression
- */
- private synchronized void setProgression(String op, int pc)
- {
- if(op == null)
- {
- op = "";
- }
- strOperation_.operation = op;
- strOperation_.pourcentage = pc;
- }
-
-
- /**
* retourne la valeur ExecPath de DCalculNavmer object
*
--- 55,58 ----
***************
*** 153,159 ****
String os = System.getProperty("os.name");
- String drive;
String path = cheminServeur();
- String fichier = "navmer" + c.numero();
try
{
--- 136,140 ----
***************
*** 192,201 ****
}
! param[0] = new String(path + nomexec);
}
else
{
! param[0] = new String(execPath_);
path = (new File(param[0])).getAbsolutePath();
--- 173,182 ----
}
! param[0] = path + nomexec;
}
else
{
! param[0] = execPath_;
path = (new File(param[0])).getAbsolutePath();
***************
*** 203,211 ****
//fichier de description du navire
! param[1] = new String(path + "N" + numeroSession_ + ".nav");
//fichier ini:ordres
! param[2] = new String(path + "I" + numeroSession_ + ".ini");
//fichier resultat:structures etat
! param[3] = new String(path + "D" + numeroSession_ + ".dat");
//Si prise en compte des courants
if(n == 5)
--- 184,192 ----
//fichier de description du navire
! param[1] = path + "N" + numeroSession_ + ".nav";
//fichier ini:ordres
! param[2] = path + "I" + numeroSession_ + ".ini";
//fichier resultat:structures etat
! param[3] =path + "D" + numeroSession_ + ".dat";
//Si prise en compte des courants
if(n == 5)
***************
*** 213,217 ****
System.out.println("--Prise en compte des courants--");
//fichier parametre:index zones courant
! param[4] = new String(path + "C" + numeroSession_);
}
--- 194,198 ----
System.out.println("--Prise en compte des courants--");
//fichier parametre:index zones courant
! param[4] = path + "C" + numeroSession_;
}
|
|
From: <de...@us...> - 2003-03-18 13:12:33
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure
In directory sc8-pr-cvs1:/tmp/cvs-serv3398/dodico/src/org/fudaa/dodico/mesure
Modified Files:
DEvolutionSerieIrreguliere.java
Log Message:
suppression des variables inutiles
Index: DEvolutionSerieIrreguliere.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/DEvolutionSerieIrreguliere.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DEvolutionSerieIrreguliere.java 29 Jan 2003 12:14:41 -0000 1.1
--- DEvolutionSerieIrreguliere.java 18 Mar 2003 13:12:29 -0000 1.2
***************
*** 122,126 ****
long[] u = instants_.instants();
int i;
! double r;
for(i = 0; i < u.length; i++)
--- 122,126 ----
long[] u = instants_.instants();
int i;
! // double r;
for(i = 0; i < u.length; i++)
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation
In directory sc8-pr-cvs1:/tmp/cvs-serv3398/dodico/src/org/fudaa/dodico/navigation
Modified Files:
DNavireType.java DGenerationJournaliereAleatoire.java
DEtudeNavigation.java
Log Message:
suppression des variables inutiles
Index: DNavireType.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DNavireType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DNavireType.java 29 Jan 2003 12:14:33 -0000 1.1
--- DNavireType.java 18 Mar 2003 13:12:29 -0000 1.2
***************
*** 176,184 ****
}
String type = _type.trim();
! if(_type.length() <= 0)
{
return;
}
! type_ = _type;
}
--- 176,184 ----
}
String type = _type.trim();
! if(type.length() <= 0)
{
return;
}
! type_ = type;
}
Index: DGenerationJournaliereAleatoire.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DGenerationJournaliereAleatoire.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DGenerationJournaliereAleatoire.java 29 Jan 2003 12:14:31 -0000 1.1
--- DGenerationJournaliereAleatoire.java 18 Mar 2003 13:12:29 -0000 1.2
***************
*** 177,193 ****
/**
- * Classe le tableau d'instants instantsGeneres_.
- */
- private void classer()
- {
- int nb = instantsGeneres_.length;
- for(int i = nb - 1; i >= 0; i--)
- {
- Arrays.sort(instantsGeneres_[i]);
- }
- }
-
-
- /**
* Genere que si des changements ont ete effectues. Si
* le nombre de serie a ete modifie, les instants sont completes ou en partie
--- 177,180 ----
Index: DEtudeNavigation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DEtudeNavigation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DEtudeNavigation.java 29 Jan 2003 12:14:33 -0000 1.1
--- DEtudeNavigation.java 18 Mar 2003 13:12:29 -0000 1.2
***************
*** 71,91 ****
}
-
- /**
- * teste de validite sur _navire.
- *
- * @param _navire
- * @return "" si ok
- */
- private String NavireTypeValide(INavireType _navire)
- {
- if(null == _navire)
- {
- return "Navire non existant!";
- }
- return _navire.valide();
- }
-
-
/**
* @return nom_
--- 71,74 ----
|
|
From: <de...@us...> - 2003-03-18 13:10:43
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques In directory sc8-pr-cvs1:/tmp/cvs-serv2143/dodico/src/org/fudaa/dodico/mathematiques Modified Files: DVecteurReel.java CMathComplexe.java DMatriceComplexe.java DVecteur.java CMathReel.java DMatriceReel.java DMatrice.java DFonctionReel.java DMathematiques.java DFonction.java DVecteurComplexe.java Log Message: *** keyword substitution change *** Index: DVecteurReel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DVecteurReel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: CMathComplexe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/CMathComplexe.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: DMatriceComplexe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DMatriceComplexe.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: DVecteur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DVecteur.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: CMathReel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/CMathReel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DMatriceReel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DMatriceReel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DMatrice.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DMatrice.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DFonctionReel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DFonctionReel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: DMathematiques.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DMathematiques.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DFonction.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DFonction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DVecteurComplexe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DVecteurComplexe.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques
In directory sc8-pr-cvs1:/tmp/cvs-serv1304/dodico/src/org/fudaa/dodico/mathematiques
Modified Files:
CMathComplexe.java DMatriceComplexe.java DFonctionReel.java
DVecteurComplexe.java
Log Message:
suppression des variables inutiles
Index: CMathComplexe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/CMathComplexe.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CMathComplexe.java 29 Jan 2003 12:14:18 -0000 1.1
--- CMathComplexe.java 18 Mar 2003 13:09:26 -0000 1.2
***************
*** 43,47 ****
public static final String enChaine(SComplexe _c)
! { return new String(_c.re+"+"+_c.im+"i"); }
public static SComplexe creeComplexe(Complex _c)
--- 43,47 ----
public static final String enChaine(SComplexe _c)
! { return _c.re+"+"+_c.im+"i"; }
public static SComplexe creeComplexe(Complex _c)
Index: DMatriceComplexe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DMatriceComplexe.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DMatriceComplexe.java 29 Jan 2003 12:14:18 -0000 1.1
--- DMatriceComplexe.java 18 Mar 2003 13:09:26 -0000 1.2
***************
*** 190,194 ****
public SComplexe[] ligne(int _i)
{
! Complex el;
int nc=nbColonnes();
SComplexe[] res=new SComplexe[nc];
--- 190,194 ----
public SComplexe[] ligne(int _i)
{
! // Complex el;
int nc=nbColonnes();
SComplexe[] res=new SComplexe[nc];
Index: DFonctionReel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DFonctionReel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DFonctionReel.java 29 Jan 2003 12:14:18 -0000 1.1
--- DFonctionReel.java 18 Mar 2003 13:09:26 -0000 1.2
***************
*** 42,46 ****
{
DFonctionReel c=new DFonctionReel();
! c.formule(new String(form));
c.variables((String[])varsStr.clone());
return c;
--- 42,46 ----
{
DFonctionReel c=new DFonctionReel();
! c.formule(form);
c.variables((String[])varsStr.clone());
return c;
Index: DVecteurComplexe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DVecteurComplexe.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DVecteurComplexe.java 29 Jan 2003 12:14:18 -0000 1.1
--- DVecteurComplexe.java 18 Mar 2003 13:09:26 -0000 1.2
***************
*** 135,139 ****
public SComplexe[] coordonnees()
{
! Complex el;
int taille=v_.dimension();
SComplexe[] res=new SComplexe[taille];
--- 135,139 ----
public SComplexe[] coordonnees()
{
! // Complex el;
int taille=v_.dimension();
SComplexe[] res=new SComplexe[taille];
|
|
From: <de...@us...> - 2003-03-18 13:01:31
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret In directory sc8-pr-cvs1:/tmp/cvs-serv28121/dodico/src/org/fudaa/dodico/mascaret Modified Files: MascaretClient.java CConversionHydraulique1d.java DParametresMascaret.java ServeurMascaret.java DResultatsMascaret.java DCalculMascaret.java EdamoxWriter.java Log Message: *** keyword substitution change *** Index: MascaretClient.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: CConversionHydraulique1d.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/CConversionHydraulique1d.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DParametresMascaret.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: ServeurMascaret.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/ServeurMascaret.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DResultatsMascaret.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DResultatsMascaret.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DCalculMascaret.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: EdamoxWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/EdamoxWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 |
|
From: <de...@us...> - 2003-03-18 13:00:03
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret
In directory sc8-pr-cvs1:/tmp/cvs-serv27145a/dodico/src/org/fudaa/dodico/mascaret
Modified Files:
EdamoxWriter.java
Log Message:
le line separator est desormais
obtenu a partir de DodicoLib
Index: EdamoxWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/EdamoxWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EdamoxWriter.java 29 Jan 2003 12:14:38 -0000 1.1
--- EdamoxWriter.java 18 Mar 2003 12:59:59 -0000 1.2
***************
*** 14,17 ****
--- 14,19 ----
import java.lang.reflect.*;
+ import org.fudaa.dodico.commun.DodicoLib;
+
/**
* @version $Revision$ $Date$ by $Author$
***************
*** 24,28 ****
protected Object [] descriptionChamp;
! private static String lineSeparator = System.getProperty("line.separator");
private static final int IRIEN = Integer.MIN_VALUE;
--- 26,30 ----
protected Object [] descriptionChamp;
! private static String lineSeparator = DodicoLib.LINE_SEP;
private static final int IRIEN = Integer.MIN_VALUE;
|
|
From: <de...@us...> - 2003-03-18 12:53:22
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/lido
In directory sc8-pr-cvs1:/tmp/cvs-serv23265/dodico/src/org/fudaa/dodico/lido/conversion/lido
Modified Files:
CConversionHydraulique1dSNG.java
CConversionHydraulique1dEXT.java
Log Message:
suppression des variables inutiles
Index: CConversionHydraulique1dSNG.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/lido/CConversionHydraulique1dSNG.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CConversionHydraulique1dSNG.java 29 Jan 2003 12:14:35 -0000 1.1
--- CConversionHydraulique1dSNG.java 18 Mar 2003 12:53:19 -0000 1.2
***************
*** 56,60 ****
sng.nbMaxParam=5;
sng.nbValTD=20;
- Vector vsings=new Vector();
for(int i=0; i<sings.length; i++) {
int type=typeLoiSNG(sings[i]);
--- 56,59 ----
Index: CConversionHydraulique1dEXT.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/lido/CConversionHydraulique1dEXT.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CConversionHydraulique1dEXT.java 29 Jan 2003 12:14:35 -0000 1.1
--- CConversionHydraulique1dEXT.java 18 Mar 2003 12:53:19 -0000 1.2
***************
*** 45,51 ****
((IParametresLido)calculLido_.parametres(connexion_)).parametresEXT(ext);
}
! System.err.println("ecritEXT");
! IEtude1d etude=calculHydraulique1d_.etude();
!
ext.laisses=new SParametresLaisseLigneEXT[0];
--- 45,49 ----
((IParametresLido)calculLido_.parametres(connexion_)).parametresEXT(ext);
}
! System.err.println("ecritEXT");
ext.laisses=new SParametresLaisseLigneEXT[0];
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido
In directory sc8-pr-cvs1:/tmp/cvs-serv23265/dodico/src/org/fudaa/dodico/lido
Modified Files:
DResultatsLido.java LidoClientTexte.java DCalculLido.java
DParametresLido.java
Log Message:
suppression des variables inutiles
Index: DResultatsLido.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/DResultatsLido.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DResultatsLido.java 29 Jan 2003 12:14:26 -0000 1.1
--- DResultatsLido.java 18 Mar 2003 12:53:19 -0000 1.2
***************
*** 15,19 ****
import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
import org.fudaa.dodico.calcul.*;
import org.fudaa.dodico.corba.calcul.*;
--- 15,19 ----
import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
import org.fudaa.dodico.calcul.*;
[...2020 lines suppressed...]
! catch (Exception e)
! {
! if (f == null)
throw new IOException(e.getMessage());
! throw new IOException(e.getMessage() + ": ligne " + f.getLineNumber());
}
f.close();
! return results;
}
! public static void ecritResultatsERN(File fichier, SResultatsERN resultsERN)
! throws IOException
! {
! //FortranWriter frsn = new FortranWriter(new FileWriter(fichier));
! FileWriter frsn = new FileWriter(fichier);
! System.out.println("Creation du fichier " + fichier.getName());
frsn.write(resultsERN.contenu, 0, resultsERN.contenu.length());
frsn.close();
}
! }
Index: LidoClientTexte.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/LidoClientTexte.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LidoClientTexte.java 29 Jan 2003 12:14:25 -0000 1.1
--- LidoClientTexte.java 18 Mar 2003 12:53:19 -0000 1.2
***************
*** 54,58 ****
SParametresCAL cal = new SParametresCAL();
SParametresCLM clm = new SParametresCLM();
! SParametresFIC fic = new SParametresFIC();
SParametresLIG lig = new SParametresLIG();
SParametresPRO pro = new SParametresPRO();
--- 54,58 ----
SParametresCAL cal = new SParametresCAL();
SParametresCLM clm = new SParametresCLM();
! // SParametresFIC fic = new SParametresFIC();
SParametresLIG lig = new SParametresLIG();
SParametresPRO pro = new SParametresPRO();
***************
*** 63,77 ****
DParametresLido pFic = new DParametresLido();
! DResultatsLido rFic = null;
System.out.println("Donnez le nom du nouveau fichier d'etude: ") ;
BufferedReader bEtu = new BufferedReader(new InputStreamReader(System.in));
! String nomEtu = new String(bEtu.readLine()) ;
System.out.println("Donnez le nom du nouveau fichier profil: ") ;
BufferedReader bPro = new BufferedReader(new InputStreamReader(System.in));
! String nomPro = new String(bPro.readLine()) ;
System.out.println("Donnez le nom du nouveau fichier archive(permet de reprendre le calcul ulterieurement): ") ;
BufferedReader bSto = new BufferedReader(new InputStreamReader(System.in));
! String nomSto = new String(bSto.readLine()) ;
pFic.parametresFIC(new SParametresFIC());
--- 63,77 ----
DParametresLido pFic = new DParametresLido();
! // DResultatsLido rFic = null;
System.out.println("Donnez le nom du nouveau fichier d'etude: ") ;
BufferedReader bEtu = new BufferedReader(new InputStreamReader(System.in));
! String nomEtu = bEtu.readLine() ;
System.out.println("Donnez le nom du nouveau fichier profil: ") ;
BufferedReader bPro = new BufferedReader(new InputStreamReader(System.in));
! String nomPro = bPro.readLine() ;
System.out.println("Donnez le nom du nouveau fichier archive(permet de reprendre le calcul ulterieurement): ") ;
BufferedReader bSto = new BufferedReader(new InputStreamReader(System.in));
! String nomSto = bSto.readLine();
pFic.parametresFIC(new SParametresFIC());
Index: DCalculLido.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/DCalculLido.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DCalculLido.java 29 Jan 2003 12:14:25 -0000 1.1
--- DCalculLido.java 18 Mar 2003 12:53:19 -0000 1.2
***************
*** 81,85 ****
SResultatsRSN rsn=null;
String os=System.getProperty("os.name");
- String drive;
String path=cheminServeur();
--- 81,84 ----
***************
*** 88,92 ****
setProgression("Ecriture des fichiers paramètres", 0);
System.out.println("Ecriture des fichiers parametres");
! File fic60=getFichier(c, ".60");
File ficCAL=getFichier(c, ".cal");
File ficLIG=getFichier(c, ".lig");
--- 87,91 ----
setProgression("Ecriture des fichiers paramètres", 0);
System.out.println("Ecriture des fichiers parametres");
! // File fic60=getFichier(c, ".60");
File ficCAL=getFichier(c, ".cal");
File ficLIG=getFichier(c, ".lig");
Index: DParametresLido.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/DParametresLido.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DParametresLido.java 29 Jan 2003 12:14:26 -0000 1.1
--- DParametresLido.java 18 Mar 2003 12:53:19 -0000 1.2
***************
*** 461,465 ****
int fmt3 [];
int fmt4 [] = new int [] {5};
! int fmt5 [];//= new int [] {10,10,10,10,10};
for(int i=0; i<3; i++) {
--- 461,465 ----
int fmt3 [];
int fmt4 [] = new int [] {5};
! // int fmt5 [];//= new int [] {10,10,10,10,10};
for(int i=0; i<3; i++) {
***************
*** 935,940 ****
if( params.status==true ) {
System.out.println("Creation du fichier "+ fichier.getName());
- String separation=new String("------------------------------------------------------------------------");
- int fmtw []=new int [] {72};
// Evaluation de NS3 en fonction de ktype (IDSING(1))
--- 935,938 ----
***************
*** 1437,1442 ****
int fmt2 [] = new int [] {8,5,8,5};
int fmt3 [];
! int fmt4 [] = new int [] {5};
! int fmt5 [];
params.titreLIG = new String [3];
--- 1435,1439 ----
int fmt2 [] = new int [] {8,5,8,5};
int fmt3 [];
!
params.titreLIG = new String [3];
***************
*** 1785,1789 ****
String os=System.getProperty("os.name");
String path=System.getProperty("FUDAA_SERVEUR");
- String drive;
if( (path==null)||path.equals("") ) path="serveurs"+File.separator+"lido";
if( !path.endsWith(File.separator) ) path+=File.separator;
--- 1782,1785 ----
***************
*** 1944,1948 ****
for(int i=0; i<2; i++) {
frzo.readFields(fmt);
! params.titreRZO[i] = new String();
params.titreRZO[i] = frzo.stringField(0);
--- 1940,1944 ----
for(int i=0; i<2; i++) {
frzo.readFields(fmt);
! //params.titreRZO[i] = new String();
params.titreRZO[i] = frzo.stringField(0);
***************
*** 2044,2048 ****
// initialisation par defaut pour permettre aux structures, et champs d'etres serialisees
params.singularites = new SParametresSingBlocSNG [0];
! params.titre = new String();
FortranReader fsng = new FortranReader(new FileReader(fichier));
--- 2040,2044 ----
// initialisation par defaut pour permettre aux structures, et champs d'etres serialisees
params.singularites = new SParametresSingBlocSNG [0];
! params.titre = "";
FortranReader fsng = new FortranReader(new FileReader(fichier));
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d In directory sc8-pr-cvs1:/tmp/cvs-serv21309/dodico/src/org/fudaa/dodico/hydraulique1d Modified Files: CGlobal.java DBief.java DHydraulique1d.java DBarragePrincipal.java DLigneEauPoint.java DProfil.java DMaillage.java DConditionsInitiales.java DLigneEauInitiale.java DResultatsTemporelSpatialBief.java DZonePlanimetrage.java DResultatsGeneraux.java DSite.java DResultatsBief.java DSectionCalculeePasTemps.java DSingularite.java DDefinitionSectionsParSeriesUnitaire.java DZone.java DResultatsBiefPasTemps.java DExtremite.java DOptionsListing.java DDefinitionSections.java DParametresReprise.java Identifieur.java DParametresStockage.java DNoeud.java DDefinitionSectionsParSections.java DSectionCalculee.java DEtude1d.java DParametresTailleMaxFichier.java DLaisse.java DCalculHydraulique1d.java DLimite.java DInformationTemps.java DDefinitionSectionsParSeries.java DZoneFrottement.java DLoiHydraulique.java DParametresGeneraux.java DReseau.java DParametresTemporels.java DResultatsTemporelSpatial.java DDonneesHydrauliques.java DParametresResultats.java DDescriptionVariable.java Log Message: *** keyword substitution change *** Index: CGlobal.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/CGlobal.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DBief.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DBief.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DHydraulique1d.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DHydraulique1d.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DBarragePrincipal.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DBarragePrincipal.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLigneEauPoint.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLigneEauPoint.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DProfil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DProfil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DMaillage.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DMaillage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DConditionsInitiales.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DConditionsInitiales.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLigneEauInitiale.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLigneEauInitiale.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DResultatsTemporelSpatialBief.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsTemporelSpatialBief.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DZonePlanimetrage.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DZonePlanimetrage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DResultatsGeneraux.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsGeneraux.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DSite.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DResultatsBief.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsBief.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSectionCalculeePasTemps.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DSectionCalculeePasTemps.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSingularite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DSingularite.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DDefinitionSectionsParSeriesUnitaire.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDefinitionSectionsParSeriesUnitaire.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DZone.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DZone.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DResultatsBiefPasTemps.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsBiefPasTemps.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DExtremite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DExtremite.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DOptionsListing.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DOptionsListing.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DDefinitionSections.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDefinitionSections.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: DParametresReprise.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresReprise.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: Identifieur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/Identifieur.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DParametresStockage.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresStockage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DNoeud.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DNoeud.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DDefinitionSectionsParSections.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDefinitionSectionsParSections.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSectionCalculee.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DSectionCalculee.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DEtude1d.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DEtude1d.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DParametresTailleMaxFichier.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresTailleMaxFichier.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLaisse.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLaisse.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DCalculHydraulique1d.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DCalculHydraulique1d.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLimite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLimite.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DInformationTemps.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DInformationTemps.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DDefinitionSectionsParSeries.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDefinitionSectionsParSeries.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DZoneFrottement.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DZoneFrottement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLoiHydraulique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLoiHydraulique.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DParametresGeneraux.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresGeneraux.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DReseau.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DReseau.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DParametresTemporels.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresTemporels.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DResultatsTemporelSpatial.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsTemporelSpatial.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DDonneesHydrauliques.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDonneesHydrauliques.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DParametresResultats.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresResultats.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DDescriptionVariable.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDescriptionVariable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-03-18 12:50:58
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi In directory sc8-pr-cvs1:/tmp/cvs-serv21309/dodico/src/org/fudaa/dodico/hydraulique1d/loi Modified Files: DLoiHydrogramme.java DLoiOuvertureVanne.java DLoiSeuil.java DLoiGeometrique.java DLoiLimniHydrogramme.java DLoiTarage.java DLoiRegulation.java DLoiLimnigramme.java Log Message: *** keyword substitution change *** Index: DLoiHydrogramme.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiHydrogramme.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLoiOuvertureVanne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiOuvertureVanne.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLoiSeuil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiSeuil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLoiGeometrique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiGeometrique.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLoiLimniHydrogramme.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiLimniHydrogramme.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLoiTarage.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiTarage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLoiRegulation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiRegulation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DLoiLimnigramme.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiLimnigramme.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite In directory sc8-pr-cvs1:/tmp/cvs-serv21309/dodico/src/org/fudaa/dodico/hydraulique1d/singularite Modified Files: DSeuilTarageAval.java DSeuilLoi.java DDeversoirComportementZCoefQ.java DSeuilLimniAmont.java DBarrage.java DPerteCharge.java DSeuilVanne.java DDeversoirComportementLoi.java DApport.java DSeuil.java DSeuilGeometrique.java DSeuilTranscritique.java DSeuilDenoye.java DSeuilNoye.java DDeversoir.java DSeuilTarageAmont.java Log Message: *** keyword substitution change *** Index: DSeuilTarageAval.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilTarageAval.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSeuilLoi.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilLoi.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DDeversoirComportementZCoefQ.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DDeversoirComportementZCoefQ.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSeuilLimniAmont.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilLimniAmont.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DBarrage.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DBarrage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DPerteCharge.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DPerteCharge.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSeuilVanne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilVanne.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DDeversoirComportementLoi.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DDeversoirComportementLoi.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DApport.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DApport.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSeuil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSeuilGeometrique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilGeometrique.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSeuilTranscritique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilTranscritique.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSeuilDenoye.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilDenoye.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSeuilNoye.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilNoye.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DDeversoir.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DDeversoir.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DSeuilTarageAmont.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilTarageAmont.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-03-18 12:48:16
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d
In directory sc8-pr-cvs1:/tmp/cvs-serv20463/dodico/src/org/fudaa/dodico/hydraulique1d
Modified Files:
DDefinitionSections.java
Log Message:
modification de la methode initialise :elle ne fait rien !
Index: DDefinitionSections.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDefinitionSections.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DDefinitionSections.java 29 Jan 2003 12:14:19 -0000 1.1
--- DDefinitionSections.java 18 Mar 2003 12:48:09 -0000 1.2
***************
*** 24,30 ****
public void initialise(IObjet _o)
{
! if(_o instanceof IDefinitionSections) {
! IDefinitionSections q=(IDefinitionSections)_o;
! }
}
--- 24,30 ----
public void initialise(IObjet _o)
{
! // if(_o instanceof IDefinitionSections) {
! // IDefinitionSections q=(IDefinitionSections)_o;
! // }
}
|
|
From: <de...@us...> - 2003-03-18 12:43:39
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa In directory sc8-pr-cvs1:/tmp/cvs-serv17699/dodico/src/org/fudaa/dodico/hiswa Modified Files: HiswaClientLocal.java HiswaClient.java HiswaWriter.java DCalculHiswa.java DParametresHiswa.java HiswaTestParser.java DResultatsHiswa.java ServeurHiswa.java hiswa.jj Log Message: *** keyword substitution change *** Index: HiswaClientLocal.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/HiswaClientLocal.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: HiswaClient.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/HiswaClient.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: HiswaWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/HiswaWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DCalculHiswa.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/DCalculHiswa.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: DParametresHiswa.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/DParametresHiswa.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: HiswaTestParser.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/HiswaTestParser.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: DResultatsHiswa.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/DResultatsHiswa.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: ServeurHiswa.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/ServeurHiswa.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: hiswa.jj =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/hiswa.jj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-03-18 12:43:38
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser In directory sc8-pr-cvs1:/tmp/cvs-serv17699/dodico/src/org/fudaa/dodico/hiswa/parser Modified Files: TokenMgrError.java HiswaParserTokenManager.java ASCII_UCodeESC_CharStream.java HiswaParserConstants.java HiswaParser.java Token.java ParseException.java Log Message: *** keyword substitution change *** Index: TokenMgrError.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/TokenMgrError.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: HiswaParserTokenManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/HiswaParserTokenManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: ASCII_UCodeESC_CharStream.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/ASCII_UCodeESC_CharStream.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: HiswaParserConstants.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/HiswaParserConstants.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: HiswaParser.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/HiswaParser.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: Token.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/Token.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: ParseException.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/ParseException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa
In directory sc8-pr-cvs1:/tmp/cvs-serv16187/dodico/src/org/fudaa/dodico/hiswa
Modified Files:
HiswaClientLocal.java HiswaClient.java DCalculHiswa.java
HiswaTestParser.java DResultatsHiswa.java
Log Message:
ajout commentaires
suprression des variables inutiles
Index: HiswaClientLocal.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/HiswaClientLocal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HiswaClientLocal.java 29 Jan 2003 12:14:39 -0000 1.1
--- HiswaClientLocal.java 18 Mar 2003 12:41:17 -0000 1.2
***************
*** 34,38 ****
hs = ICalculHiswaHelper.narrow(new DCalculHiswa().tie());
System.out.println("Creation de la connexion");
! IUsine usine=CDodico.creeUsineLocale();
ServeurPersonne sp=new ServeurPersonne("test-personne-hiswa", "test-organisme-hiswa");
--- 34,38 ----
hs = ICalculHiswaHelper.narrow(new DCalculHiswa().tie());
System.out.println("Creation de la connexion");
! // IUsine usine=CDodico.creeUsineLocale();
ServeurPersonne sp=new ServeurPersonne("test-personne-hiswa", "test-organisme-hiswa");
***************
*** 282,290 ****
boolean dept = false;
boolean vel = false;
! int nVel = 0;
boolean force = false;
! int nForce = 0;
boolean transp = false;
! int nTransp = 0;
boolean dirspr = false;
boolean dissip = false;
--- 282,290 ----
boolean dept = false;
boolean vel = false;
! // int nVel = 0;
boolean force = false;
! // int nForce = 0;
boolean transp = false;
! //int nTransp = 0;
boolean dirspr = false;
boolean dissip = false;
Index: HiswaClient.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/HiswaClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HiswaClient.java 29 Jan 2003 12:14:39 -0000 1.1
--- HiswaClient.java 18 Mar 2003 12:41:17 -0000 1.2
***************
*** 39,43 ****
else System.out.println("connexion etablie...");
System.out.println("Creation de la connexion");
! IUsine usine=CDodico.creeUsineLocale();
ServeurPersonne sp=new ServeurPersonne("test-personne-hiswa", "test-organisme-hiswa");
--- 39,43 ----
else System.out.println("connexion etablie...");
System.out.println("Creation de la connexion");
! // IUsine usine=CDodico.creeUsineLocale();
ServeurPersonne sp=new ServeurPersonne("test-personne-hiswa", "test-organisme-hiswa");
Index: DCalculHiswa.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/DCalculHiswa.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DCalculHiswa.java 29 Jan 2003 12:14:39 -0000 1.1
--- DCalculHiswa.java 18 Mar 2003 12:41:17 -0000 1.2
***************
*** 91,95 ****
String os=System.getProperty("os.name");
- String drive;
String path=cheminServeur();
--- 91,94 ----
Index: HiswaTestParser.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/HiswaTestParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HiswaTestParser.java 29 Jan 2003 12:14:39 -0000 1.1
--- HiswaTestParser.java 18 Mar 2003 12:41:17 -0000 1.2
***************
*** 35,39 ****
hs = ICalculHiswaHelper.narrow(new DCalculHiswa().tie());
System.out.println("Creation de la connexion");
! IUsine usine=CDodico.creeUsineLocale();
ServeurPersonne sp=new ServeurPersonne("test-personne-hiswa", "test-organisme-hiswa");
--- 35,39 ----
hs = ICalculHiswaHelper.narrow(new DCalculHiswa().tie());
System.out.println("Creation de la connexion");
! // IUsine usine=CDodico.creeUsineLocale();
ServeurPersonne sp=new ServeurPersonne("test-personne-hiswa", "test-organisme-hiswa");
Index: DResultatsHiswa.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/DResultatsHiswa.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DResultatsHiswa.java 29 Jan 2003 12:14:39 -0000 1.1
--- DResultatsHiswa.java 18 Mar 2003 12:41:17 -0000 1.2
***************
*** 108,114 ****
int n = 0;
int lig = 0;
! int i = 0; // sert pour les boucles
int nbData = 0; // nb de Noeuds
! String str = new String(); // field
--- 108,114 ----
int n = 0;
int lig = 0;
! // int i = 0; // sert pour les boucles
int nbData = 0; // nb de Noeuds
! String str; // field
***************
*** 444,448 ****
if (!( ftot==null)) {
! String str = new String();
do {
ftot.readFields() ;
--- 444,448 ----
if (!( ftot==null)) {
! String str;
do {
ftot.readFields() ;
|
|
From: <de...@us...> - 2003-03-18 12:41:21
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv16187/dodico/src/org/fudaa/dodico/hiswa/parser
Modified Files:
TokenMgrError.java HiswaParserTokenManager.java
HiswaParser.java
Log Message:
ajout commentaires
suprression des variables inutiles
Index: TokenMgrError.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/TokenMgrError.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TokenMgrError.java 29 Jan 2003 12:14:43 -0000 1.1
--- TokenMgrError.java 18 Mar 2003 12:41:17 -0000 1.2
***************
*** 108,112 ****
* Note: You can customize the lexical error message by modifying this method.
*/
! private static final String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
return("Lexical error at line " +
errorLine + ", column " +
--- 108,112 ----
* Note: You can customize the lexical error message by modifying this method.
*/
! private static final String LexicalError(boolean EOFSeen, /*int lexState,*/ int errorLine, int errorColumn, String errorAfter, char curChar) {
return("Lexical error at line " +
errorLine + ", column " +
***************
*** 141,146 ****
}
! public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
! this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
}
}
--- 141,146 ----
}
! public TokenMgrError(boolean EOFSeen/*, int lexState*/, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
! this(LexicalError(EOFSeen/*, lexState*/, errorLine, errorColumn, errorAfter, curChar), reason);
}
}
Index: HiswaParserTokenManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/HiswaParserTokenManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HiswaParserTokenManager.java 29 Jan 2003 12:14:43 -0000 1.1
--- HiswaParserTokenManager.java 18 Mar 2003 12:41:17 -0000 1.2
***************
*** 52,68 ****
} while (start++ != end);
}
! private final void jjCheckNAddStates(int start)
! {
! jjCheckNAdd(jjnextStates[start]);
! jjCheckNAdd(jjnextStates[start + 1]);
! }
private final int jjMoveNfa_1(int startState, int curPos)
{
- int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 3;
int i = 1;
jjstateSet[0] = startState;
! int j, kind = 0x7fffffff;
for (;;)
{
--- 52,68 ----
} while (start++ != end);
}
! //private final void jjCheckNAddStates(int start)
! //{
! // jjCheckNAdd(jjnextStates[start]);
! // jjCheckNAdd(jjnextStates[start + 1]);
! //}
!
private final int jjMoveNfa_1(int startState, int curPos)
{
int startsAt = 0;
jjnewStateCnt = 3;
int i = 1;
jjstateSet[0] = startState;
! int kind = 0x7fffffff;
for (;;)
{
***************
*** 99,103 ****
else if (curChar < 128)
{
! long l = 1L << (curChar & 077);
MatchLoop: do
{
--- 99,103 ----
else if (curChar < 128)
{
! // long l = 1L << (curChar & 077);
MatchLoop: do
{
***************
*** 111,118 ****
{
int hiByte = (int)(curChar >> 8);
! int i1 = hiByte >> 6;
! long l1 = 1L << (hiByte & 077);
! int i2 = (curChar & 0xff) >> 6;
! long l2 = 1L << (curChar & 077);
MatchLoop: do
{
--- 111,118 ----
{
int hiByte = (int)(curChar >> 8);
! // int i1 = hiByte >> 6;
! // long l1 = 1L << (hiByte & 077);
! // int i2 = (curChar & 0xff) >> 6;
! // long l2 = 1L << (curChar & 077);
MatchLoop: do
{
***************
*** 638,647 ****
private final int jjMoveNfa_0(int startState, int curPos)
{
! int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 285;
int i = 1;
jjstateSet[0] = startState;
! int j, kind = 0x7fffffff;
for (;;)
{
--- 638,647 ----
private final int jjMoveNfa_0(int startState, int curPos)
{
! // int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 285;
int i = 1;
jjstateSet[0] = startState;
! int kind = 0x7fffffff;
for (;;)
{
***************
*** 4212,4216 ****
error_after = curPos <= 1 ? "" : input_stream.GetImage();
}
! throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
}
}
--- 4212,4216 ----
error_after = curPos <= 1 ? "" : input_stream.GetImage();
}
! throw new TokenMgrError(EOFSeen/*, curLexState*/, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
}
}
Index: HiswaParser.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/HiswaParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HiswaParser.java 29 Jan 2003 12:14:43 -0000 1.1
--- HiswaParser.java 18 Mar 2003 12:41:17 -0000 1.2
***************
*** 366,370 ****
final public void hiswaInput() throws ParseException {
! String s;
label_2:
while (true) {
--- 366,370 ----
final public void hiswaInput() throws ParseException {
! // String s;
label_2:
while (true) {
***************
*** 568,572 ****
final public void set() throws ParseException {
! Token set, n,cfae=null;
double nb; //pour convertir le string en entier
int i=0; // indice du tableau
--- 568,572 ----
final public void set() throws ParseException {
! Token set, n=null;
double nb; //pour convertir le string en entier
int i=0; // indice du tableau
***************
*** 3119,3123 ****
final public void plot() throws ParseException {
Token plot, sname, file=null, fname=null, title=null, option=null, option1=null, n=null;
! Token option2=null, option3=null, scale=null, dist=null, symsiz=null, places=null, lines=null;
double nb;
int indice=0; // indice de liste
--- 3119,3123 ----
final public void plot() throws ParseException {
Token plot, sname, file=null, fname=null, title=null, option=null, option1=null, n=null;
! Token option2=null, option3=null, /*scale=null, dist=null,*/ symsiz=null, places=null, lines=null;
double nb;
int indice=0; // indice de liste
***************
*** 3793,3797 ****
private int jj_la;
public boolean lookingAhead = false;
! private boolean jj_semLA;
private int jj_gen;
final private int[] jj_la1 = new int[191];
--- 3793,3797 ----
private int jj_la;
public boolean lookingAhead = false;
! // private boolean jj_semLA;
private int jj_gen;
final private int[] jj_la1 = new int[191];
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie
In directory sc8-pr-cvs1:/tmp/cvs-serv15143/dodico/src/org/fudaa/dodico/geometrie
Modified Files:
DPoint.java DPolyligne.java DSpatialFini.java DSpatial.java
DSpatialInfini.java DLineaire.java DGrilleReguliere.java
DGrille.java DPonctuelFini.java DPolyedre.java
DVolumiqueFini.java DGrilleIrreguliere.java DVolumique.java
DSurfaceComposee.java DSphere.java DTriangle.java
DGeometrie.java DLineaireFini.java SPointVecteur.java
DSurfacique.java DPonctuel.java DPolygone.java
DSurfaciqueFini.java DBoite.java
Log Message:
*** keyword substitution change ***
Index: DPoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPoint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DPolyligne.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolyligne.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DPolyligne.java 29 Jan 2003 12:14:27 -0000 1.1
--- DPolyligne.java 18 Mar 2003 12:39:43 -0000 1.2
***************
*** 59,64 ****
public String toString()
{
! String r = "DPolyligne(" + points_.taille() + " points)";
! return r;
}
--- 59,63 ----
public String toString()
{
! return "DPolyligne(" + points_.taille() + " points)";
}
Index: DSpatialFini.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSpatialFini.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DSpatial.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSpatial.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DSpatialInfini.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSpatialInfini.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DLineaire.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DLineaire.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DGrilleReguliere.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrilleReguliere.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DGrille.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrille.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DPonctuelFini.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPonctuelFini.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DPolyedre.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolyedre.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DVolumiqueFini.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DVolumiqueFini.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DGrilleIrreguliere.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrilleIrreguliere.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DGrilleIrreguliere.java 29 Jan 2003 12:14:27 -0000 1.1
--- DGrilleIrreguliere.java 18 Mar 2003 12:39:43 -0000 1.2
***************
*** 79,83 ****
tailleY = y_.length;
}
! return new String( "DGrilleIrreguliere(" + tailleX + ", " + tailleY + ")" );
}
--- 79,83 ----
tailleY = y_.length;
}
! return "DGrilleIrreguliere(" + tailleX + ", " + tailleY + ")";
}
Index: DVolumique.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DVolumique.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DSurfaceComposee.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfaceComposee.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DSurfaceComposee.java 29 Jan 2003 12:14:27 -0000 1.1
--- DSurfaceComposee.java 18 Mar 2003 12:39:43 -0000 1.2
***************
*** 63,67 ****
public String toString()
{
! return new String("DSurfaceComposee(pos: " + positives_ + ",neg: " + negatives_ + ")");
}
--- 63,67 ----
public String toString()
{
! return "DSurfaceComposee(pos: " + positives_ + ",neg: " + negatives_ + ")";
}
Index: DSphere.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSphere.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DSphere.java 29 Jan 2003 12:14:27 -0000 1.1
--- DSphere.java 18 Mar 2003 12:39:43 -0000 1.2
***************
*** 53,57 ****
public String toString()
{
! return new String("DSphere(" + centre_ + "," + rayon_ + ")");
}
--- 53,57 ----
public String toString()
{
! return "DSphere(" + centre_ + "," + rayon_ + ")";
}
Index: DTriangle.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DTriangle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DTriangle.java 29 Jan 2003 12:14:27 -0000 1.1
--- DTriangle.java 18 Mar 2003 12:39:43 -0000 1.2
***************
*** 52,56 ****
public String toString()
{
! return new String( "DTriangle(" + sommets_ + ")" );
}
--- 52,56 ----
public String toString()
{
! return "DTriangle(" + sommets_ + ")";
}
Index: DGeometrie.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGeometrie.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DLineaireFini.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DLineaireFini.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: SPointVecteur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/SPointVecteur.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DSurfacique.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfacique.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DPonctuel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPonctuel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DPolygone.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolygone.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DPolygone.java 29 Jan 2003 12:14:27 -0000 1.1
--- DPolygone.java 18 Mar 2003 12:39:43 -0000 1.2
***************
*** 59,63 ****
public String toString()
{
! return new String( "DPolygone(" + sommets_ + ")" );
}
--- 59,63 ----
public String toString()
{
! return "DPolygone(" + sommets_ + ")" ;
}
***************
*** 182,187 ****
return 0.;
}
! double base = Math.sqrt( ( coords[1][0] - coords[0][0] ) * ( coords[1][0] - coords[0][0] )
! + ( coords[1][1] - coords[0][1] ) * ( coords[1][1] - coords[0][1] ) );
// double hauteur=Math.sqrt(
// A FAIRE: bibliotheque?
--- 182,187 ----
return 0.;
}
! // double base = Math.sqrt( ( coords[1][0] - coords[0][0] ) * ( coords[1][0] - coords[0][0] )
! // + ( coords[1][1] - coords[0][1] ) * ( coords[1][1] - coords[0][1] ) );
// double hauteur=Math.sqrt(
// A FAIRE: bibliotheque?
Index: DSurfaciqueFini.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfaciqueFini.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DBoite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DBoite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
|
|
From: <de...@us...> - 2003-03-18 12:37:45
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geodesie In directory sc8-pr-cvs1:/tmp/cvs-serv13579/dodico/src/org/fudaa/dodico/geodesie Modified Files: SysGeodesiqueMercator.java Log Message: *** keyword substitution change *** Index: SysGeodesiqueMercator.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geodesie/SysGeodesiqueMercator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-03-18 11:04:46
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran
In directory sc8-pr-cvs1:/tmp/cvs-serv18675/dodico/src/org/fudaa/dodico/fortran
Modified Files:
FortranBinaryInputStream.java
Log Message:
ajout commentaires + optimisation
Index: FortranBinaryInputStream.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranBinaryInputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FortranBinaryInputStream.java 21 Feb 2003 16:00:38 -0000 1.2
--- FortranBinaryInputStream.java 18 Mar 2003 11:04:43 -0000 1.3
***************
*** 16,58 ****
* Une classe facilitant la lecture de fichiers binaires écrits par Fortran
* L'équivalence d'intructions entre Java et Fortran se fera de la manière
! * suivante :<BR><PRE>
* (en considérant i=integer/int, f=real/float, d=double precision/double et
! * s=character*()/String)
! * 1) Pour un fichier à acces séquentiel :
! * Fortran
! * open (unit=10,file='fichier.bin',access='sequentiel',form='unformatted')
! * read (unit=10) <i>,<f>,<d>,<s>
! * ...
! * close (unit=10)
! * Java
! * FortranBinaryInputStream in=
! * new FortranBinaryInputStream(new FileInputStream("fichier.bin"),true);
! * in.readRecord();
! * i=in.readInteger();
! * f=in.readReal();
! * d=in.readDoublePrecision();
! * s=in.readCharacter(s.length());
! * ...
! * in.close();
! * 2) Pour un fichier à acces direct :
! * Fortran
! * open (unit=10,file='fichier.bin',access='direct',recl=30,form='unformatted')
! * read (unit=10,rec=1) <i>,<f>,<d>,<s>
! * ...
! * close (unit=10)
! * Java
! * FortranBinaryInputStream in=
! * new FortranBinaryInputStream(new FileInputStream("fichier.bin"),false);
! * in.setRecordLength(30);
! * in.readRecord();
! * i=in.readInteger();
! * f=in.readReal();
! * d=in.readDoublePrecision();
! * s=in.readCharacter(s.length());
! * ...
! * in.close();
! * </PRE>
*
! * @version $Revision$ $Date$ by $Author$
* @author Bertrand Marchand
*/
--- 16,72 ----
* Une classe facilitant la lecture de fichiers binaires écrits par Fortran
* L'équivalence d'intructions entre Java et Fortran se fera de la manière
! * suivante :<BR>
* (en considérant i=integer/int, f=real/float, d=double precision/double et
! * s=character*()/String)<BR>
! * <br>
! * <b>1) Pour un fichier à acces séquentiel :</b><BR><BR>
! * <b>Fortran</b><BR>
! * <i>
! * open (unit=10,file='fichier.bin',access='sequentiel',form='unformatted')<BR>
! * read (unit=10)<BR>
! * ...<BR>
! * close (unit=10)<BR>
! * </i><BR><BR>
! *
! * <b>Java</b><BR>
! * <i>
! * FortranBinaryInputStream in=<BR>
! * new FortranBinaryInputStream(new FileInputStream("fichier.bin"),true);<BR>
! * in.readRecord();<BR>
! * i=in.readInteger();<BR>
! * f=in.readReal();<BR>
! * d=in.readDoublePrecision();<BR>
! * s=in.readCharacter(s.length());<BR>
! * ...<BR>
! * in.close();<BR>
! * </i>
! * <b>2) Pour un fichier à acces direct :</b><br/>
! * <b>Fortran</b><br/>
! * <i>
! * open (unit=10,file='fichier.bin',access='direct',recl=30,form='unformatted')<br/>
! * read (unit=10,rec=1) <br/>
! * ...<br/>
! * close (unit=10)<br/>
! * </i>
! * <br>
! * <b>Java</b><br>
! * FortranBinaryInputStream in=<br>
! * new FortranBinaryInputStream(new FileInputStream("fichier.bin"),false);<br>
! * in.setRecordLength(30);<br>
! * in.readRecord();<br>
! * i=in.readInteger();<br>
! * f=in.readReal();<br>
! * d=in.readDoublePrecision();<br>
! * s=in.readCharacter(s.length());<br>
! * ...<br>
! * in.close();<br>
*
! * Dans le cas acces sequentiel, un compteur permet de se positionner
! * dans le flux. Il faut faire attention lors de l'utilisation des methodes
! * mark et reset (par exemple) sur le inputstream donne en entree. le compteur
! * peut devenir faux.
! *
! *
! * @version $Id$
* @author Bertrand Marchand
*/
***************
*** 107,110 ****
--- 121,125 ----
* ATTENTION Different du cas acces direct.
* Renvoie la taille de l'enregistrement lu par le flux.
+ * see #getRecordLength()
*/
public int getSequentialRecordLength()
***************
*** 113,116 ****
--- 128,132 ----
}
+
/**
* Affectation de la longueur des enregistrements (pour les fichiers à accès
***************
*** 134,141 ****
*/
public String readCharacter(int _lgString) throws IOException {
- byte[] buf=new byte[_lgString];
currentPos_+=_lgString;
! read(buf);
! return new String(buf);
}
--- 150,155 ----
*/
public String readCharacter(int _lgString) throws IOException {
currentPos_+=_lgString;
! return super.readCharacter(_lgString);
}
***************
*** 261,264 ****
--- 275,280 ----
+
+
/**
***************
*** 279,281 ****
--- 295,306 ----
}
}
+ /**
+ * Renvoie la position courante dans le flux.
+ * @return long
+ */
+ public int getCurrentPosition()
+ {
+ return (int)currentPos_;
+ }
+
}
|
|
From: <de...@us...> - 2003-03-18 11:02:10
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran
In directory sc8-pr-cvs1:/tmp/cvs-serv17264/dodico/src/org/fudaa/dodico/fortran
Modified Files:
ConversionStringDouble.java
Log Message:
supression variale interne inutile
Index: ConversionStringDouble.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/ConversionStringDouble.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConversionStringDouble.java 21 Feb 2003 16:00:38 -0000 1.2
--- ConversionStringDouble.java 18 Mar 2003 11:02:05 -0000 1.3
***************
*** 25,29 ****
private double[] valeurs_;
private String[] chaines_;
- private int index_;
/**
--- 25,28 ----
|
|
From: <de...@us...> - 2003-03-18 11:00:37
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers In directory sc8-pr-cvs1:/tmp/cvs-serv16458/dodico/src/org/fudaa/dodico/fichiers Modified Files: MaillageCORELEBTH.java Log Message: *** keyword substitution change *** Index: MaillageCORELEBTH.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/MaillageCORELEBTH.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 |
|
From: <de...@us...> - 2003-03-18 10:59:38
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers
In directory sc8-pr-cvs1:/tmp/cvs-serv15902/dodico/src/org/fudaa/dodico/fichiers
Modified Files:
MaillageCORELEBTH.java
Log Message:
les extensions sont enregistrees dans des variables
Index: MaillageCORELEBTH.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/MaillageCORELEBTH.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MaillageCORELEBTH.java 29 Jan 2003 12:14:42 -0000 1.1
--- MaillageCORELEBTH.java 18 Mar 2003 10:59:34 -0000 1.2
***************
*** 46,60 ****
INoeud[] noeuds;
IElement[] elements;
racine=_fichier.getPath();
// Controle du nom de fichier donné
! if (racine.endsWith(".ele") ||
! racine.endsWith(".cor") ||
! racine.endsWith(".bth"))
racine=racine.substring(0,racine.lastIndexOf("."));
// Controle que les fichiers existent et qu'ils sont ouvrables en lecture
! String extension[]={".bth",".cor",".ele"};
for (int i=0; i<extension.length; i++) {
file=new File(racine+extension[i]);
--- 46,63 ----
INoeud[] noeuds;
IElement[] elements;
+ String eleExt=".ele";
+ String corExt=".cor";
+ String bthExt=".bth";
racine=_fichier.getPath();
// Controle du nom de fichier donné
! if (racine.endsWith(eleExt) ||
! racine.endsWith(corExt) ||
! racine.endsWith(bthExt))
racine=racine.substring(0,racine.lastIndexOf("."));
// Controle que les fichiers existent et qu'ils sont ouvrables en lecture
! String extension[]={bthExt,corExt,eleExt};
for (int i=0; i<extension.length; i++) {
file=new File(racine+extension[i]);
***************
*** 64,75 ****
// Lecture des coordonnées x,y des noeuds
! System.err.println("### Lecture "+racine+".cor");
! noeuds =lireFichierCOR(racine+".cor");
// Lecture de la coordonnée z des noeuds
! System.err.println("### Lecture "+racine+".bth");
! noeuds =lireFichierBTH(racine+".bth",noeuds);
// Lecture des élements
! System.err.println("### Lecture "+racine+".ele");
! elements=lireFichierELE(racine+".ele",noeuds);
IMaillage res=CDodico.findUsine().creeEfMaillage();
--- 67,78 ----
// Lecture des coordonnées x,y des noeuds
! System.err.println("### Lecture "+racine+corExt);
! noeuds =lireFichierCOR(racine+corExt);
// Lecture de la coordonnée z des noeuds
! System.err.println("### Lecture "+racine+bthExt);
! noeuds =lireFichierBTH(racine+bthExt,noeuds);
// Lecture des élements
! System.err.println("### Lecture "+racine+eleExt);
! elements=lireFichierELE(racine+eleExt,noeuds);
IMaillage res=CDodico.findUsine().creeEfMaillage();
***************
*** 92,98 ****
String racine; // racine des noms de fichier (sans extension)
File file;
- INoeud[] noeuds;
- IElement[] elements;
-
racine=_fichier.getPath();
--- 95,98 ----
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef
In directory sc8-pr-cvs1:/tmp/cvs-serv13782/dodico/src/org/fudaa/dodico/ef
Modified Files:
DMaillage.java DTrou.java DNoeud.java DParametresCalcul.java
DElement.java DArete.java DRegion.java
Log Message:
*** keyword substitution change ***
Index: DMaillage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DMaillage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DMaillage.java 29 Jan 2003 12:14:31 -0000 1.1
--- DMaillage.java 18 Mar 2003 10:56:57 -0000 1.2
***************
*** 179,183 ****
IArete[] ct;
IArete[] contour;
! IArete sArete;
int n;
int iSuivant;
--- 179,183 ----
IArete[] ct;
IArete[] contour;
! // IArete sArete;
int n;
int iSuivant;
Index: DTrou.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DTrou.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DNoeud.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DNoeud.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DParametresCalcul.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DParametresCalcul.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DElement.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DArete.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DArete.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: DRegion.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DRegion.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
|
|
From: <de...@us...> - 2003-03-18 10:57:00
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/serviceDunes
In directory sc8-pr-cvs1:/tmp/cvs-serv13782/dodico/src/org/fudaa/dodico/ef/serviceDunes
Modified Files:
DServiceDunes.java Convertisseur.java
Log Message:
*** keyword substitution change ***
Index: DServiceDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/serviceDunes/DServiceDunes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Index: Convertisseur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/serviceDunes/Convertisseur.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Convertisseur.java 29 Jan 2003 12:14:42 -0000 1.1
--- Convertisseur.java 18 Mar 2003 10:56:57 -0000 1.2
***************
*** 150,155 ****
int longueur = _points.length;
SPoint[] spoints = new SPoint[longueur];
-
- double[] p;
for(int i = longueur - 1; i >= 0; i--)
{
--- 150,153 ----
***************
*** 265,269 ****
int longueur = _trous.length;
STrou[] strou = new STrou[longueur];
- double[] p;
for(int i = longueur - 1; i >= 0; i--)
{
--- 263,266 ----
***************
*** 406,410 ****
IElement[] ielem = new IElement[longueur];
int pc = 0;
- int prec = 0;
for(int i = longueur - 1; i >= 0; i--)
{
--- 403,406 ----
|
