Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8410] trunk/soft/fudaa-mascaret
|
From: <bma...@us...> - 2013-05-18 20:10:48
|
Revision: 8410
http://sourceforge.net/p/fudaa/svn/8410
Author: bmarchan
Date: 2013-05-18 20:10:45 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermReader.java
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermWriter.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermReader.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermReader.java 2013-05-16 21:48:56 UTC (rev 8409)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermReader.java 2013-05-18 20:10:45 UTC (rev 8410)
@@ -62,7 +62,7 @@
CtuluLibMessage.println("numSectionOrigine=",numSectionOrigine);
int[] numSectionFin = readIntegerRecord();
CtuluLibMessage.println("numSectionFin=",numSectionFin);
- ArrayList nomsVarIndependanteTemps = new ArrayList(4);
+ ArrayList<String> nomsVarIndependanteTemps = new ArrayList<String>(4);
String nomVar=null;
while (!NOM_FIN.equals(nomVar)) {
nomVar = readStringRecord();
@@ -79,7 +79,7 @@
for (int i = 0; i < nbVarIndependanteTemps; i++) {
valeurVarIndependante[i] = readFloatRecord();
}
- ArrayList nomsVarDependanteTemps = new ArrayList();
+ ArrayList<String> nomsVarDependanteTemps = new ArrayList<String>();
nomVar="";
while (!NOM_FIN.equals(nomVar)) {
nomVar = readStringRecord();
@@ -91,8 +91,7 @@
int nbVarDependanteTemps=nomsVarDependanteTemps.size();
CtuluLibMessage.println("lecture donn\xE9es temporelles (passe 1)");
int nbPasTemps = 0;
- int isAvailable;
- while((isAvailable=is_.available())>10) {
+ while(is_.available()>10) {
is_.readRecord(); // numPasTemps
nbPasTemps++;
is_.readRecord(); // Temps
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermWriter.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermWriter.java 2013-05-16 21:48:56 UTC (rev 8409)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermWriter.java 2013-05-18 20:10:45 UTC (rev 8410)
@@ -62,8 +62,8 @@
writeIntegerRecord(numSectionFin); // fin bief
// Ecriture des noms des variables ind\xE9pendante du temps
- ArrayList indicesVarIndependantTps=new ArrayList();
- ArrayList indicesVarDependantTps=new ArrayList();
+ ArrayList<Integer> indicesVarIndependantTps=new ArrayList<Integer>();
+ ArrayList<Integer> indicesVarDependantTps=new ArrayList<Integer>();
int nbVarTotal = sres.variables.length;
ecritureNomsVarIndepTps(sres, indicesVarIndependantTps,
indicesVarDependantTps, nbVarTotal);
@@ -85,8 +85,8 @@
int nbCasierLiaison = sres.resultatsBiefs.length;
writeIntegerRecord(nbCasierLiaison); // fin section
// Ecriture des noms des variables ind\xE9pendante du temps
- ArrayList indicesVarIndependantTps=new ArrayList();
- ArrayList indicesVarDependantTps=new ArrayList();
+ ArrayList<Integer> indicesVarIndependantTps=new ArrayList<Integer>();
+ ArrayList<Integer> indicesVarDependantTps=new ArrayList<Integer>();
int nbVarTotal = sres.variables.length;
ecritureNomsVarIndepTps(sres, indicesVarIndependantTps,
indicesVarDependantTps, nbVarTotal);
@@ -113,7 +113,7 @@
}
private void ecritureValeursDepTps(SResultatsTemporelSpatial sres,
- ArrayList indicesVarDependantTps,
+ ArrayList<Integer> indicesVarDependantTps,
int nbVarDependantTps) throws IOException {
for (int i = 0; i < sres.pasTemps.length; i++) {
writeIntegerRecord(i+1, i+1);
@@ -121,7 +121,7 @@
writeFloatRecord(tps,tps);
writeIntegerRecord(nbSectionTotal_,nbSectionTotal_);
for (int j = 0; j < nbVarDependantTps; j++) {
- int indiceVar = ((Integer)indicesVarDependantTps.get(j)).intValue();
+ int indiceVar = indicesVarDependantTps.get(j).intValue();
float[] valeurs = getValeursVar(indiceVar,i,sres.resultatsBiefs);
writeFloatRecord(valeurs);
}
@@ -129,10 +129,10 @@
}
private void ecritureNomsvarDepTps(SResultatsTemporelSpatial sres,
- ArrayList indicesVarDependantTps,
+ ArrayList<Integer> indicesVarDependantTps,
int nbVarDependantTps) throws IOException {
for (int i = 0; i < nbVarDependantTps; i++) {
- int indiceVar = ((Integer)indicesVarDependantTps.get(i)).intValue();
+ int indiceVar = indicesVarDependantTps.get(i).intValue();
String nomVar = sres.variables[indiceVar].nomCourt;
writeStringRecord(to4Char(nomVar));
}
@@ -140,7 +140,7 @@
}
private void ecritureValeursIndepTps(SResultatsTemporelSpatial sres,
- ArrayList indicesVarIndependantTps) throws
+ ArrayList<Integer> indicesVarIndependantTps) throws
IOException {
writeIntegerRecord(nbSectionTotal_,nbSectionTotal_); // NbSecEff, NbSecEff
// D'abord \xE9criture des abscisses
@@ -149,15 +149,15 @@
// Ensuite \xE9criture des autres variables
int nbVarIndependantTps = indicesVarIndependantTps.size();
for (int i = 0; i < nbVarIndependantTps; i++) {
- int indiceVar = ((Integer)indicesVarIndependantTps.get(i)).intValue();
+ int indiceVar = indicesVarIndependantTps.get(i).intValue();
float[] valeurs = getValeursVar(indiceVar,0,sres.resultatsBiefs);
writeFloatRecord(valeurs);
}
}
private void ecritureNomsVarIndepTps(SResultatsTemporelSpatial sres,
- ArrayList indicesVarIndependantTps,
- ArrayList indicesVarDependantTps,
+ ArrayList<Integer> indicesVarIndependantTps,
+ ArrayList<Integer> indicesVarDependantTps,
int nbVarTotal) throws IOException {
writeStringRecord(to4Char("X")); // d'abord l'abscisse
for (int i = 0; i < nbVarTotal; i++) {
@@ -173,7 +173,7 @@
}
private void ecritureValeursIndepTpsCasierLiaison(SResultatsTemporelSpatial
- sres, ArrayList indicesVarIndependantTps) throws IOException {
+ sres, ArrayList<Integer> indicesVarIndependantTps) throws IOException {
int nbCasierLiaison = sres.resultatsBiefs.length;
writeIntegerRecord(nbCasierLiaison,nbCasierLiaison); // NbSecEff, NbSecEff
// D'abord \xE9criture des abscisses qui sont en fait des numeros de section.
@@ -186,7 +186,7 @@
for (int i = 0; i < nbVar; i++) {
for (int j = 0; j < nbCasierLiaison; j++) {
SResultatsTemporelSpatialBief resCasierLiaisoni = sres.resultatsBiefs[j];
- int indiceVar = ((Integer)indicesVarIndependantTps.get(i)).intValue();
+ int indiceVar = indicesVarIndependantTps.get(i).intValue();
float val = (float)resCasierLiaisoni.valeursVariables[indiceVar][0][0];
os_.writeReal(val);
}
@@ -195,7 +195,7 @@
}
private void ecritureValeursDepTpsCasierLiaison(SResultatsTemporelSpatial sres,
- ArrayList indicesVarIndependantTps, int nbVarDependantTps) throws IOException {
+ ArrayList<Integer> indicesVarIndependantTps, int nbVarDependantTps) throws IOException {
int nbCasierLiaison = sres.resultatsBiefs.length;
int nbVar = indicesVarIndependantTps.size();
int nbPasTps = sres.pasTemps.length;
@@ -207,7 +207,7 @@
for (int j = 0; j < nbVar; j++) {
for (int k = 0; k < nbCasierLiaison; k++) {
SResultatsTemporelSpatialBief resCasierLiaisoni = sres.resultatsBiefs[k];
- int indiceVar = ((Integer)indicesVarIndependantTps.get(j)).intValue();
+ int indiceVar = indicesVarIndependantTps.get(j).intValue();
float val = (float)resCasierLiaisoni.valeursVariables[indiceVar][i][0];
os_.writeReal(val);
}
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-05-16 21:48:56 UTC (rev 8409)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2013-05-18 20:10:45 UTC (rev 8410)
@@ -148,7 +148,7 @@
static {
isApp_.name = "Fudaa-Mascaret";
isApp_.version = "3.1.6";
- isApp_.date = "16-05-2013";
+ isApp_.date = "17-05-2013";
isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2013";
// isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
isApp_.contact = "http://www.openmascaret.org/";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
