Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5741] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2010-04-08 20:50:26
|
Revision: 5741
http://fudaa.svn.sourceforge.net/fudaa/?rev=5741&view=rev
Author: deniger
Date: 2010-04-08 20:50:20 +0000 (Thu, 08 Apr 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STOReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueProperties.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java 2010-04-07 07:57:36 UTC (rev 5740)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java 2010-04-08 20:50:20 UTC (rev 5741)
@@ -14,6 +14,7 @@
import java.util.List;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.dodico.crue.metier.emh.AbstractInfosEMH;
import org.fudaa.dodico.crue.metier.emh.EMH;
@@ -59,7 +60,11 @@
namePos = new TObjectIntHashMap();
int idx = 0;
for (final T t : struc) {
- namePos.put(t.getNom(), idx++);
+ String nom = t.getNom();
+ if (StringUtils.isNotBlank(nom)) {
+ namePos.put(nom, idx);
+ }
+ idx++;
}
nb = listData.size();
}
@@ -72,6 +77,10 @@
return new ResultatCalcul<T, R>(emh, getPosition(emh.getId()), this);
}
+ public ResultatCalcul createInfoEMH(EMH emh, int position) {
+ return new ResultatCalcul<T, R>(emh, position, this);
+ }
+
/**
* @param nom le nom
* @return la position de lecture. -1 si non present
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STOReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STOReader.java 2010-04-07 07:57:36 UTC (rev 5740)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STOReader.java 2010-04-08 20:50:20 UTC (rev 5741)
@@ -492,7 +492,7 @@
// Zf et Zhaut
rptgCasier.setZf(casier.getZFon());
- rptgCasier.setZHaut(casier.getZHau());
+ rptgCasier.setZhaut(casier.getZHau());
// Calcul des abscisses z
final float zmin = casier.getZFon();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java 2010-04-07 07:57:36 UTC (rev 5740)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java 2010-04-08 20:50:20 UTC (rev 5741)
@@ -91,7 +91,7 @@
rptgSection.setNom(donneesSection.getNom());
final String nom = rptgSection.getNom();
rptgSection.setZf(donneesSection.getZf());
- rptgSection.setZHaut(donneesSection.getZHaut());
+ rptgSection.setZhaut(donneesSection.getZHaut());
final float[] params = donneesSection.getParams();
if (params != null && params.length == 5) {
rptgSection.setNumLitZf((int) params[0]);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java 2010-04-07 07:57:36 UTC (rev 5740)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java 2010-04-08 20:50:20 UTC (rev 5741)
@@ -386,18 +386,21 @@
private SectionPourBranche0Ou9 getBranche0Ou9(final ByteBuffer bf) {
final SectionPourBranche0Ou9 donneesBranche = new SectionPourBranche0Ou9();
-
+ // real(4) ulm1, ulm2, ulm3
donneesBranche.setUlm1(bf.getFloat());
donneesBranche.setUlm2(bf.getFloat());
donneesBranche.setUlm3(bf.getFloat());
+ // dzg11, dzd11, dzg12, dzd12, dzg13, dzd13
donneesBranche.setDZg11(bf.getFloat());
+ donneesBranche.setDZd11(bf.getFloat());
donneesBranche.setDZg12(bf.getFloat());
+ donneesBranche.setDZd12(bf.getFloat());
donneesBranche.setDZg13(bf.getFloat());
- donneesBranche.setDZd11(bf.getFloat());
- donneesBranche.setDZd12(bf.getFloat());
donneesBranche.setDZd13(bf.getFloat());
+ // integer(4) isec2, iular4
donneesBranche.setISec2(bf.getInt());
donneesBranche.setIular4(bf.getInt());
+ // real(4) stric
donneesBranche.setStric(bf.getFloat());
final float[] listeSec1 = new float[nbHaut];
@@ -406,28 +409,27 @@
listeSec1[j] = bf.getFloat();
}
donneesBranche.setListeSec1(listeSec1);
-
+ // real(4) per1(NBHAUT)
final float[] listePer1 = new float[nbHaut];
for (int j = 0; j < nbHaut; j++) {
listePer1[j] = bf.getFloat();
}
donneesBranche.setListePer1(listePer1);
-
+ // ular1(NBHAUT)
final float[] listeUlar1 = new float[nbHaut];
for (int j = 0; j < nbHaut; j++) {
listeUlar1[j] = bf.getFloat();
}
donneesBranche.setListeUlar1(listeUlar1);
-
final float[] listeSec2 = new float[nbHaut];
for (int j = 0; j < nbHaut; j++) {
listeSec2[j] = bf.getFloat();
}
donneesBranche.setListeSec2(listeSec2);
-
+ // per2(NBHAUT)
final float[] listePer2 = new float[nbHaut];
for (int j = 0; j < nbHaut; j++) {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoCasier.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoCasier.java 2010-04-07 07:57:36 UTC (rev 5740)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoCasier.java 2010-04-08 20:50:20 UTC (rev 5741)
@@ -9,7 +9,7 @@
/** @pdOid ff358a06-83c9-4e9c-8de9-a8beac1414d1 */
private double zf;
/** @pdOid 6fa21c2e-b14a-4ec6-b0fa-8980dbd79531 */
- private double zHaut;
+ private double zhaut;
/** @pdOid 8a6c003a-0a3b-4cd9-8b97-7d2ccc31fb7d */
public LoiFF getLoiZVol() {
@@ -61,16 +61,16 @@
}
/** @pdOid 70459e03-4357-4584-97c6-9edcf0f9e499 */
- public double getZHaut() {
- return zHaut;
+ public double getZhaut() {
+ return zhaut;
}
/**
* @param newZHaut
* @pdOid 672abbe7-478f-452a-b673-917eeded2407
*/
- public void setZHaut(final double newZHaut) {
- zHaut = newZHaut;
+ public void setZhaut(final double newZHaut) {
+ zhaut = newZHaut;
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java 2010-04-07 07:57:36 UTC (rev 5740)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeoSection.java 2010-04-08 20:50:20 UTC (rev 5741)
@@ -17,7 +17,7 @@
/** @pdOid 5425f33c-0624-4b12-9058-a7c6e53bebe4 */
private double zf;
/** @pdOid 9314a711-1f69-42d0-8901-33f3184c8314 */
- private double zHaut;
+ private double zhaut;
/** @pdOid 57047aee-0f0e-4d4b-9b63-ea78ef22ddf4 */
private ResPrtData lstLitKsup;
/** @pdOid e161bbff-84a1-4cc2-8eb7-b7ebbc07932f */
@@ -70,16 +70,16 @@
}
/** @pdOid 006b4f38-400a-4616-845b-a5736e6c0565 */
- public final double getZHaut() {
- return zHaut;
+ public final double getZhaut() {
+ return zhaut;
}
/**
* @param newZHaut
* @pdOid 297a2126-0b53-4d5b-ba24-f041455fb349
*/
- public final void setZHaut(double newZHaut) {
- zHaut = newZHaut;
+ public final void setZhaut(double newZHaut) {
+ zhaut = newZHaut;
}
/** @pdOid 480a26bf-6069-4f53-9f16-a2eb96a215b8 */
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2010-04-07 07:57:36 UTC (rev 5740)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2010-04-08 20:50:20 UTC (rev 5741)
@@ -29,6 +29,7 @@
import org.fudaa.dodico.crue.io.neuf.STOSequentialReader;
import org.fudaa.dodico.crue.io.neuf.STRFactory;
import org.fudaa.dodico.crue.io.neuf.STRSequentialReader;
+import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader.ResultatCalcul;
import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader.ResultatCalculPasDeTemps;
import org.fudaa.dodico.crue.io.neuf.FCBValueObject.EnteteBranche;
import org.fudaa.dodico.crue.io.neuf.FCBValueObject.EnteteCasier;
@@ -165,9 +166,9 @@
}
private void validFcbProfils(final FCBSequentialReader res, final CrueData data, final CtuluAnalyze analyze) {
- int nbAbsolu = 0;
+
STOSequentialReader sto = data.getSto();
- TIntObjectHashMap numAbsoluProfil = new TIntObjectHashMap();
+ TIntObjectHashMap sectionByNumAbsolu = new TIntObjectHashMap();
List<DonneesBranche> donneesBranches = sto.getDonneesBranches();
for (DonneesBranche donneesBranche : donneesBranches) {
String nomBr = donneesBranche.getNomBr().trim();
@@ -175,26 +176,30 @@
List<RelationEMHSectionDansBranche> sections = branche.getSections();
Collections.sort(sections, new EMHHelper.ComparatorRelationEMHSectionDansBranche());
int[] n0Pr = donneesBranche.getN0Pr();
+ // WARN dans les données les indices fortran commencent à 1:
for (int i = 0; i < n0Pr.length; i++) {
- numAbsoluProfil.put(n0Pr[i], sections.get(i).getEmh());
+ // on enleve 1 pour partir de 0:
+ sectionByNumAbsolu.put(n0Pr[i] - 1, sections.get(i).getEmh());
}
}
+ int nbAbsolu = 0;
+ for (final EnteteProfil prof : res.getContainerProfil().getListData()) {
- for (final EnteteProfil prof : res.getContainerProfil().getListData()) {
- nbAbsolu++;
final String id = prof.getNom().toUpperCase();
- CatEMHSection foundSection = null;
+ final CatEMHSection foundSection = (CatEMHSection) sectionByNumAbsolu.get(nbAbsolu);
+ ResultatCalcul resultatCalcul = null;
if (StringUtils.isEmpty(id)) {
- foundSection = (CatEMHSection) numAbsoluProfil.get(nbAbsolu);
+ resultatCalcul = res.getContainerProfil().createInfoEMH(foundSection, nbAbsolu);
} else {
- foundSection = data.findSectionByReference(id);
+ resultatCalcul = res.getContainerProfil().createInfoEMH(foundSection);
}
if (StringUtils.isNotEmpty(id) && foundSection == null) {
analyze.addError("res.section.notFound", id);
// error = true;
} else if (foundSection != null) {
- foundSection.addInfosEMH(res.getContainerProfil().createInfoEMH(foundSection));
+ foundSection.addInfosEMH(resultatCalcul);
}
+ nbAbsolu++;
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueProperties.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueProperties.java 2010-04-07 07:57:36 UTC (rev 5740)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueProperties.java 2010-04-08 20:50:20 UTC (rev 5741)
@@ -1,7 +1,6 @@
package org.fudaa.dodico.crue.property;
import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -9,7 +8,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -88,7 +86,7 @@
if (numberFormat == null) {
numberFormat = new DecimalFormat();
numberFormat.setGroupingUsed(false);
- numberFormat.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
+ // numberFormat.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
numberFormat.setMaximumFractionDigits(nbDec);
nbDecFormat.put(nbDec, numberFormat);
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2010-04-07 07:57:36 UTC (rev 5740)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2010-04-08 20:50:20 UTC (rev 5741)
@@ -76,8 +76,8 @@
infoCrue_.banner = new BuIcon(pathLogo);
// infoCrue_.logo = new BuIcon(pathLogo);
infoCrue_.name = "Fudaa-Crue";
- infoCrue_.version = "0.24";
- infoCrue_.date = "07-Avril-2010";
+ infoCrue_.version = "0.25";
+ infoCrue_.date = "09-Avril-2010";
infoCrue_.rights = "";
infoCrue_.contact = "fu...@ge...";
infoCrue_.license = "GPL2";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
