Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5571] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2009-12-23 02:48:52
|
Revision: 5571
http://fudaa.svn.sourceforge.net/fudaa/?rev=5571&view=rev
Author: deniger
Date: 2009-12-23 02:48:43 +0000 (Wed, 23 Dec 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
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/metier/emh/AbstractInfosEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHActivable.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMCommon.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHModeleEnchainement.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSousModeleEnchainement.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumInfosEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcPseudoPerm.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcVraiPerm.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParam.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamBooleen.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamEntier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelperPredicate.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/validation/ValidateConnectionModele.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestRequete.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/metier/emh/TestCatEMHNoeud.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueScenarioBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHGeneralBuilder.java
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/projet/ScenarioComparaisonUI.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleScenarioManager.java
Added Paths:
-----------
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/AbstractTreeNode.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/TreeNodeCleValeur.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/TreeNodeEMH.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/TreeNodeString.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -57,12 +57,6 @@
@Override
public boolean isSameSafe(final Collection o1, final Collection o2, final ResultatTest res, TesterContext context)
throws Exception {
- // if (o1.size() != o2.size()) {
- // if (res != null) {
- // res.addFils(new ComparaisonResult(o1.size(), o2.size(), "comparaison.collection.size"));
- // }
- // return false;
- // }
final String[] prop = StringUtils.split(propName, ",");
final Set propInA = ConvertSelectOnItemMerge.getSet(o1, prop);
propInA.remove(null);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -209,12 +209,7 @@
branchePersist = new BrancheBarrageFilEau();
} else if (branche instanceof EMHBrancheBarrageGenerique) {
branchePersist = new BrancheBarrageGenerique();
- }
- // else if (branche instanceof EMHBrancheBarrageRhone) {
- // final EMHBrancheBarrageRhone new_name = (EMHBrancheBarrageRhone) branche;
- // branchePersist = new BrancheBarrageRhone();
- // }
- else if (branche instanceof EMHBrancheEnchainement) {
+ } else if (branche instanceof EMHBrancheEnchainement) {
branchePersist = new BrancheEnchainement();
} else if (branche instanceof EMHBrancheNiveauxAssocies) {
branchePersist = new BrancheNiveauxAssocies();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -242,7 +242,7 @@
if (branchePersist != null) {
// -- commun --//
final BrancheAbstract br = branchePersist;
- br.IsActive = branche.getActive();
+ br.IsActive = branche.getUserActive();
br.Nom = branche.getNom();
if (branche.getNoeudAmont() != null) {
br.NdAm = new NdAm(branche.getNoeudAmont().getNom());
@@ -336,7 +336,7 @@
if (branche != null) {
// -- commun --//
- branche.setActive(branchePersist.IsActive);
+ branche.setUserActive(branchePersist.IsActive);
// branche.setNom(branchePersist.Nom);
if (branchePersist.NdAm != null) {
final CatEMHNoeud noeudAmont = res.findNoeudByReference(branchePersist.NdAm.NomRef);
@@ -408,7 +408,7 @@
}
// -- commun --//
if (casierPersist != null) {
- casierPersist.IsActive = casier.getActive();
+ casierPersist.IsActive = casier.getUserActive();
if (casier.getNoeud() != null) {
casierPersist.Noeud = new ReferenceNoeud(casier.getNoeud().getNom());
}
@@ -468,7 +468,7 @@
// -- commun aux objets --//
if (casier != null) {
- casier.setActive(casierPersist.IsActive);
+ casier.setUserActive(casierPersist.IsActive);
if (casierPersist.Noeud != null) {
final String reference = casierPersist.Noeud.NomRef;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueDaoStructureDPTI.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -58,9 +58,10 @@
xstream.alias("DonPrtCIniBranche", BrancheStrickler.class);
xstream.alias("DonPrtCIniBranche", BrancheSeuilTransversal.class);
xstream.alias("DonPrtCIniBranche", BrancheBarrageFilEau.class);
+ xstream.alias("DonPrtCIniBranche", BrancheNiveauxAssocies.class);
xstream.alias("DonPrtCIniBranche", BranchePdc.class);
- xstream.alias("BrancheNiveauxAssocies", BrancheNiveauxAssocies.class);
+ // xstream.alias("BrancheNiveauxAssocies", BrancheNiveauxAssocies.class);
// -- mettre attribut Nom comme attribut de la balise branche,noeud et section et son converter appropri� --//
// -- mettre le nom de la branche dans la balise --//
xstream.useAttributeFor(BrancheAbstract.class, "NomRef");
@@ -134,124 +135,6 @@
protected static class BrancheNiveauxAssocies extends BrancheAbstract {}
- // /**
- // * le converter abstract pour les branches. Il faudra ensuite en d�clarer un pour chaque type de branche afin de
- // cr�er
- // * le bon type de modele.
- // *
- // * @author Adrien Hadoux
- // */
- // private static abstract class BrancheConverter implements SingleValueConverter {
- // public String toString(final Object obj) {
- // return ((BrancheAbstract) obj).NomRef;
- // }
- //
- // public abstract Object fromString(String name);
- //
- // public boolean canConvert(final Class type) {
- // return type.isInstance(BrancheAbstract.class);
- // }
- // }
- //
- // private static class BrancheSaintVenantConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BrancheSaintVenant branche = new BrancheSaintVenant();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
- //
- // private static class BrancheSeuilLateralConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BrancheSeuilLateral branche = new BrancheSeuilLateral();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
- //
- // private static class BrancheStricklerConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BrancheStrickler branche = new BrancheStrickler();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
- //
- // private static class BrancheOrificeConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BrancheOrifice branche = new BrancheOrifice();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
- //
- // private static class BrancheSeuilTransversalConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BrancheSeuilTransversal branche = new BrancheSeuilTransversal();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
- //
- // private static class BrancheBarrageFilEauConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BrancheBarrageFilEau branche = new BrancheBarrageFilEau();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
- //
- // private static class BranchePdcConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BranchePdc branche = new BranchePdc();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
- //
- // private static class BrancheBarrageGeneriqueConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BrancheBarrageGenerique branche = new BrancheBarrageGenerique();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
- //
- // private static class BrancheBarrageRhoneConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BrancheBarrageRhone branche = new BrancheBarrageRhone();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
- //
- // private static class BrancheEnchainementConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BrancheEnchainement branche = new BrancheEnchainement();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
- //
- // private static class BrancheNiveauxAssociesConverter extends BrancheConverter {
- // @Override
- // public Object fromString(final String name) {
- // final BrancheNiveauxAssocies branche = new BrancheNiveauxAssocies();
- // branche.NomRef = name;
- // return branche;
- // }
- // }
-
// *************************GESTION DES CASIERS *************************
protected static class CasierAbstract {
protected String NomRef;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -81,8 +81,8 @@
import org.fudaa.dodico.crue.metier.emh.ValParamEntier;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.metier.helper.FactoryEMH;
+import org.fudaa.dodico.crue.property.CrueLoaderPropertiesDefault;
import org.fudaa.dodico.crue.property.CrueNumberUtils;
-import org.fudaa.dodico.crue.property.CrueLoaderPropertiesDefault;
import org.fudaa.dodico.crue.validation.CruePrefix;
/**
@@ -282,17 +282,26 @@
for (final int indiceLitActif : listeLitsActifs) {
if (indiceLitActif == cpt) {
lit.setIsLitActif(true);
+ break;
}
}
}
// -- ajout du lit dans dptg --//
- dataDPTG.getLitNumerote().add(lit);
+ dataDPTG.addLitNumerote(lit);
litPrecedent = lit;
cpt++;
}
// -- on ajoute la limite fin du dernier elt, puisque les dernier elt n sont les premiers des n+1--//
if (listeLits.size() > 0) {
+ // for (LitNumerote lit : listeLits) {
+ // if (lit.getNomLit() != null && "MAJG".equals(lit.getNomLit().getNom())) {
+ // System.err.println(sectionProfil.getId() + "-->aie " + lit.getIsLitActif());
+ //
+ // }
+ //
+ // }
+
LitNumerote lastLit = listeLits.get(listeLits.size() - 1);
// si pas de limite de définies, le lit est definit avec le premier et dernier point:
// question de fred: normalement listLits.size doit valoir 1 ici avec LimDeb null pour ce lit
@@ -719,11 +728,9 @@
final String typeLigne = in_.stringField(0);
if (typeLigne.toUpperCase().equals(CrueIODico.BRANCHE_CCTRMAX)) {
- // if (elementOrifice != null) {
- // listeElem.add(elementOrifice);
- //
- // }
- elementOrifice = new ElemOrifice(metier.getCruePropertyDefinitionContainer());
+ if (elementOrifice == null) {
+ elementOrifice = new ElemOrifice(metier.getCruePropertyDefinitionContainer());
+ }
// ex CCTRMAX 0.65
final double coeff = in_.doubleField(1);
elementOrifice.setCoefCtrLim(coeff);
@@ -732,18 +739,13 @@
if (elementOrifice == null) {
elementOrifice = new ElemOrifice(metier.getCruePropertyDefinitionContainer());
}
- // * Zrad Haut Larg Cdeb Sens
- // ex CLAPET 3.00 1.50 20.0 0.90 0
- final double zrad = in_.doubleField(1);
- final double haut = in_.doubleField(2);
- final double larg = in_.doubleField(3);
- final double cdeb = in_.doubleField(4);
final String sens = CtuluLibString.getString((int) in_.doubleField(5));
-
- elementOrifice.setHaut(haut);
- elementOrifice.setLargeur(larg);
- elementOrifice.setZseuil(zrad);
- elementOrifice.setCoefD(cdeb);
+ elementOrifice.setZseuil(in_.doubleField(1));
+ elementOrifice.setHaut(in_.doubleField(2));
+ elementOrifice.setLargeur(in_.doubleField(3));
+ if (in_.getNumberOfFields() > 4) {
+ elementOrifice.setCoefD(in_.doubleField(4));
+ }
final EnumSensOrifice enumSens = (EnumSensOrifice) this.enumSensOrificeMapCrue9.fromString(sens);
// if (enumSens == null) {
// analyze_.addFatalError(EnumsConverter.CODE_CONVERT_ENUM_ERROR, sens);
@@ -1051,7 +1053,9 @@
final ElemSeuilAvecPdc seuil = new ElemSeuilAvecPdc(metier.getCruePropertyDefinitionContainer());
seuil.setLargeur(in_.doubleField(1));
seuil.setZseuil(in_.doubleField(2));
- seuil.setCoefD(in_.doubleField(3));
+ if (in_.getNumberOfFields() > 3) {
+ seuil.setCoefD(in_.doubleField(3));
+ }
// lecture de cpert
if (in_.getNumberOfFields() > 4) {
seuil.setCoefPdc(in_.doubleField(4));
@@ -1137,7 +1141,9 @@
final ElemSeuilAvecPdc seuil = new ElemSeuilAvecPdc(metier.getCruePropertyDefinitionContainer());
seuil.setLargeur(in_.doubleField(1));
seuil.setZseuil(in_.doubleField(2));
- seuil.setCoefD(in_.doubleField(3));
+ if (in_.getNumberOfFields() > 3) {
+ seuil.setCoefD(in_.doubleField(3));
+ }
// -- ajout du seuil --//
dataDCSP.addElemSeuilAvecPdc(seuil);
// }
@@ -1316,7 +1322,7 @@
final EMHCasierProfil newCasier = new EMHCasierProfil(CruePrefix.changePrefix(idNoeud, CruePrefix.P_NOEUD,
CruePrefix.P_CASIER));
- newCasier.setActive(true);
+ newCasier.setUserActive(true);
CatEMHNoeud noeudRef = metier.findNoeudByReference(idNoeud);
if (noeudRef == null) {
@@ -1745,7 +1751,7 @@
if (branche != null) {
branche.setNoeudAmont(noeudAmont);
branche.setNoeudAval(noeudAval);
- branche.setActive(true);
+ branche.setUserActive(true);
metier.add(branche);
} else {
@@ -1755,7 +1761,7 @@
if (branche != null) {
branche.setNoeudAmont(noeudAmont);
branche.setNoeudAval(noeudAval);
- branche.setActive(true);
+ branche.setUserActive(true);
metier.add(branche);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -391,7 +391,7 @@
} else {
for (final CatEMHCasier casier : metier.getCasiers()) {
- if (casier.getActive()) {
+ if (casier.getUserActive()) {
// -- ecriture du nom du Noeud associé au casier --//
// ex CASIER N6
fortranWriter.stringField(0, CrueIODico.CASIER_TYPE);
@@ -1144,8 +1144,8 @@
indiceFortran = 0;
fortranWriter.stringField(indiceFortran++, CrueIODico.BRANCHE_DZQ);
}
+ fortranWriter.doubleField(indiceFortran++, pt.getY());
fortranWriter.doubleField(indiceFortran++, pt.getX());
- fortranWriter.doubleField(indiceFortran++, pt.getY());
}
fortranWriter.writeFields();
}
@@ -1367,7 +1367,7 @@
for (final CatEMHBranche branche : data.getBranches()) {
// -- on ecrit au format crue 9 que si la branche est active --//
- if (branche.getActive()) {
+ if (branche.getUserActive()) {
// -- le type de la branche --//
int typeBranche = -1;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -921,7 +921,7 @@
final CalcPseudoPerm calcPerm = new CalcPseudoPerm();
- calcPerm.setNom(CruePrefix.P_CALCUL + (nbEtatPermanent + 1));
+ calcPerm.setNom(CruePrefix.P_CALCUL + "P" + (nbEtatPermanent + 1));
calcPerm.setDescription("Calcul permanent " + (nbEtatPermanent + 1));
// pour le premier on prend en compte la reprise éventuelle
boolean first = ocal.getOrdCalc().isEmpty();
@@ -1183,7 +1183,7 @@
// Un seul calcul transitoire possible en version crue 9
final CalcTrans calcTrans = new CalcTrans();
- calcTrans.setNom(CruePrefix.P_CALCUL + "Trans1");
+ calcTrans.setNom(CruePrefix.P_CALCUL + "T1");
calcTrans.setDescription("Calcul transitoire 1");
dclm.addCalcTrans(calcTrans);
final OrdCalcTransIniCalcPrecedent prec = new OrdCalcTransIniCalcPrecedent();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -441,7 +441,7 @@
nbCaractWritten = 0;
for (final CatEMHNoeud noeud : noeuds) {
final CatEMHCasier casier = noeud.getCasier();
- if (casier == null || !casier.getActive()) {
+ if (casier == null || !casier.getUserActive()) {
continue;
}
final List<DonCalcSansPrtCasierProfil> dcsps = EMHHelper.collectClass(casier.getInfosEMH(),
@@ -569,7 +569,7 @@
double res = 0;
final double eps = data.getCruePropertyDefinitionContainer().getEpsilon("coefRuisQdm");
for (final EMHBrancheSaintVenant brancheSaintVenant : branchesSaintVenant) {
- if (brancheSaintVenant.getActive()) {
+ if (brancheSaintVenant.getUserActive()) {
final List<DonCalcSansPrtBrancheSaintVenant> dcsps = EMHHelper.collectClass(brancheSaintVenant.getInfosEMH(),
DonCalcSansPrtBrancheSaintVenant.class);
for (final DonCalcSansPrtBrancheSaintVenant dcsp : dcsps) {
@@ -605,7 +605,7 @@
for (int j = 1, jmax = calcQruis.size(); j < jmax; j++) {
final CalcPseudoPermBrancheSaintVenantQruis brancheSV = calcQruis.get(j);
- if (((CatEMHActivable) brancheSV.getEmh()).getActive()) {
+ if (((CatEMHActivable) brancheSV.getEmh()).getUserActive()) {
if (!qruisSet) {
qruisSet = true;
qruis = brancheSV.getQruis();
@@ -621,7 +621,7 @@
for (int j = 1, jmax = calcCasierQruis.size(); j < jmax; j++) {
final CalcPseudoPermCasierProfilQruis casier = calcCasierQruis.get(j);
- if (((CatEMHActivable) casier.getEmh()).getActive()) {
+ if (((CatEMHActivable) casier.getEmh()).getUserActive()) {
if (!qruisSet) {
qruisSet = true;
qruis = casier.getQruis();
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 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBSequentialReader.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -15,6 +15,9 @@
import org.apache.commons.lang.ArrayUtils;
import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.dodico.crue.metier.emh.EnumInfosEMH;
+import org.fudaa.dodico.crue.metier.emh.InfosEMH;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -167,6 +170,53 @@
}
+ public class ResultatInfoEMH<T extends FCBValueObject.AbstractEntete, R extends FCBValueObject.AbstractRes>
+ implements InfosEMH {
+
+ final EMH emh;
+ final EnteteContainer<T, R> entete;
+
+ /**
+ * @param emh
+ * @param entete
+ */
+ public ResultatInfoEMH(EMH emh, EnteteContainer<T, R> entete) {
+ super();
+ this.emh = emh;
+ this.entete = entete;
+ }
+
+ public boolean getActivated() {
+ return true;
+ }
+
+ public EnumInfosEMH getCatType() {
+ return EnumInfosEMH.RESULTAT;
+ }
+
+ public EMH getEmh() {
+ return emh;
+ }
+
+ public String getType() {
+ return getClass().getSimpleName();
+ }
+
+ public void setEmh(EMH emh) {}
+
+ /**
+ * @param idxPt
+ * @param nomEMH
+ * @param inout
+ * @return le resultat lu
+ * @throws IOException
+ */
+ public R read(final int idxPt, final R inout) throws IOException {
+ return entete.read(idxPt, emh.getId(), inout);
+ }
+
+ }
+
/**
* @author denf01a
* @creation 27 mai 2009
@@ -193,6 +243,14 @@
nb = listData.size();
}
+ /**
+ * @param emh l'emh en question
+ * @return le resultat contenu dans une infoEMH
+ */
+ public ResultatInfoEMH createInfoEMH(EMH emh) {
+ return new ResultatInfoEMH<T, R>(emh, this);
+ }
+
protected ResBuilder<R> getResBuilder() {
return resBuilder;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractInfosEMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractInfosEMH.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/AbstractInfosEMH.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -16,7 +16,7 @@
}
public final boolean getActivated() {
- return getEmh() != null && getEmh().getActivated();
+ return getEmh() != null && getEmh().getActuallyActive();
}
public final EMH getEmh() {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHActivable.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHActivable.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHActivable.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -16,7 +16,7 @@
private boolean active;
/** @pdOid adf7fd8e-2133-4f9f-a463-e263df0c7557 */
- public boolean getActive() {
+ public boolean getUserActive() {
return active;
}
@@ -24,7 +24,7 @@
* @param newIsActive
* @pdOid 9c6ae571-14f8-4227-b75a-e320a4e581d9
*/
- public void setActive(final boolean newIsActive) {
+ public void setUserActive(final boolean newIsActive) {
active = newIsActive;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHCasier.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -36,11 +36,11 @@
}
@Override
- public boolean getActivated() {
- boolean res = super.getActivated();
+ public boolean getActuallyActive() {
+ boolean res = super.getActuallyActive();
if (res) {
CatEMHNoeud noeud = getNoeud();
- return noeud != null && noeud.getActivated();
+ return noeud != null && noeud.getActuallyActive();
}
return res;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -20,7 +20,7 @@
}
@Override
- public final boolean getActive() {// NOPMD
+ public final boolean getUserActive() {// NOPMD
return true;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHNoeud.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -17,18 +17,18 @@
}
@Override
- public final boolean getActive() {// NOPMD
+ public final boolean getUserActive() {// NOPMD
return true;
}
@Override
- public boolean getActivated() {
- final boolean res = super.getActivated();
+ public boolean getActuallyActive() {
+ final boolean res = super.getActuallyActive();
if (res) {
final Collection<RelationEMHBrancheContientNoeud> brs = EMHHelper.selectRelationOfType(this,
RelationEMHBrancheContientNoeud.class);
for (final RelationEMHBrancheContientNoeud relationEMHNoeudDansBranche : brs) {
- if (relationEMHNoeudDansBranche.getEmh().getActivated()) { return true; }
+ if (relationEMHNoeudDansBranche.getEmh().getActuallyActive()) { return true; }
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHSection.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -15,7 +15,7 @@
}
@Override
- public final boolean getActive() {// NOPMD
+ public final boolean getUserActive() {// NOPMD
return true;
}
@@ -30,13 +30,13 @@
* @return true si active et si contenue par une branche active.
*/
@Override
- public boolean getActivated() {
- final boolean res = super.getActivated();
+ public boolean getActuallyActive() {
+ final boolean res = super.getActuallyActive();
if (res) {
// une section appartient a une seule branche.
final RelationEMHBrancheContientSection brs = EMHHelper.selectFirstOfClass(getRelationEMH(),
RelationEMHBrancheContientSection.class);
- return brs != null && brs.getEmh() != null && brs.getEmh().getActivated();
+ return brs != null && brs.getEmh() != null && brs.getEmh().getActuallyActive();
}
return res;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMCommon.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMCommon.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMCommon.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -29,7 +29,7 @@
/** @pdOid 19f5a42d-3383-4aa3-af69-f436306152f4 */
public final String getNomCalculParent() {
- return calculParent.getNom();
+ return calculParent == null ? null : calculParent.getNom();
}
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMH.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -45,14 +45,14 @@
return infosEMHImmutable;
}
- public abstract boolean getActive();
+ public abstract boolean getUserActive();
/**
* @return la valeur réelle affectée à l'EMH. Prend en compte les relations de l'EMH. Par exemple, une section
* appartenant a une branche non active n'est pas active.
*/
- public boolean getActivated() {
- return getActive();
+ public boolean getActuallyActive() {
+ return getUserActive();
}
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHModeleEnchainement.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHModeleEnchainement.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHModeleEnchainement.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -15,7 +15,7 @@
}
@Override
- public boolean getActive() {
+ public boolean getUserActive() {
return true;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSousModeleEnchainement.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSousModeleEnchainement.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSousModeleEnchainement.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -15,7 +15,7 @@
}
@Override
- public final boolean getActive() {// NOPMD
+ public final boolean getUserActive() {// NOPMD
return true;
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumInfosEMH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumInfosEMH.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumInfosEMH.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -1,7 +1,5 @@
/***********************************************************************
- * Module: EnumInfosEMH.java
- * Author: deniger
- * Purpose: Defines the Class EnumInfosEMH
+ * Module: EnumInfosEMH.java Author: deniger Purpose: Defines the Class EnumInfosEMH
***********************************************************************/
package org.fudaa.dodico.crue.metier.emh;
@@ -12,6 +10,6 @@
* @pdOid dc6c684f-7254-4757-982f-988900d185ed
*/
public enum EnumInfosEMH {
- DON_CLIM, DON_CALC_SANS_PRT, DON_GEO_LOC, DON_PRT_CINI, ORD_CALC_SCENARIO, ORD_PRT_CINI_MODELE_BASE, ORD_RES_SCENARIO, PARAM_NUM_MODELE_BASE, RES_PRT_CL_INIT, RES_PRT_RESEAU, DON_PRT_GEO, RES_PRT_GEO, PARAM_CALC_SCENARIO, DON_FRT_CONTENEUR, DON_CLIM_SCENARIO, DON_LOI_CONTENEUR_SCENARIO, ORD_PRT_GEO_MODELE_BASE;
+ DON_CLIM, DON_CALC_SANS_PRT, DON_GEO_LOC, DON_PRT_CINI, ORD_CALC_SCENARIO, ORD_PRT_CINI_MODELE_BASE, ORD_RES_SCENARIO, PARAM_NUM_MODELE_BASE, RES_PRT_CL_INIT, RES_PRT_RESEAU, DON_PRT_GEO, RES_PRT_GEO, PARAM_CALC_SCENARIO, DON_FRT_CONTENEUR, DON_CLIM_SCENARIO, DON_LOI_CONTENEUR_SCENARIO, ORD_PRT_GEO_MODELE_BASE, RESULTAT;
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcPseudoPerm.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcPseudoPerm.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcPseudoPerm.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -10,6 +10,7 @@
public class ParamNumCalcPseudoPerm {
/** @pdOid 5f56670f-16ef-4b3a-86a2-e8bdf239dbc7 */
private double coefRelaxQ;
+
/** @pdOid f642ca96-f5e2-42ec-89a6-410004e5cd42 */
private double coefRelaxZ;
/** @pdOid d8a540b1-6b78-47a1-87cf-003b6fbf927a */
@@ -24,7 +25,6 @@
private double tolMaxQ;
/** @pdOid 2cab50ea-eb71-4a22-a319-01c8473a8388 */
private double tolMaxZ;
-
/** @pdRoleInfo migr=no name=Pdt assc=association114 mult=1..1 type=Composition */
private Pdt pdt;
@@ -39,22 +39,49 @@
tolMaxZ = values.getDefaultDoubleValue(DefaultValues.TOL_MAX_Z);
}
+ /** @pdOid 8ccb67bf-085c-447f-a3c4-aa0549574261 */
+ public final double getCoefRelaxQ() {
+ return coefRelaxQ;
+ }
+
+ /** @pdOid 7bae5f4d-b137-46a4-9602-401ccf8e69a0 */
+ public final double getCoefRelaxZ() {
+ return coefRelaxZ;
+ }
+
+ /** @pdOid 3f65241b-3795-43da-98f7-553fbbb05b71 */
+ public final double getCrMaxFlu() {
+ return crMaxFlu;
+ }
+
+ /** @pdOid bb4f1c0b-62a8-43c7-a30c-52b4b215a7b6 */
+ public final double getCrMaxTor() {
+ return crMaxTor;
+ }
+
+ /** @pdOid 1934a5c8-a415-439d-a69a-2c4b69fb694d */
+ public final int getNbrPdtDecoup() {
+ return nbrPdtDecoup;
+ }
+
+ /** @pdOid 4ddc311b-9bee-4471-9127-b3e9b5a8667c */
+ public final int getNbrPdtMax() {
+ return nbrPdtMax;
+ }
+
/** @pdGenerated default parent getter */
public Pdt getPdt() {
return pdt;
}
- /**
- * @pdGenerated default parent setter
- * @param newPdt
- */
- public void setPdt(Pdt newPdt) {
- this.pdt = newPdt;
+ /** @pdOid 14006a8e-3ca2-4f22-a3fb-c481e94b8fcd */
+ public final double getTolMaxQ() {
+ return tolMaxQ;
}
- /** @pdOid 8ccb67bf-085c-447f-a3c4-aa0549574261 */
- public final double getCoefRelaxQ() {
- return coefRelaxQ;
+ /** @pdOid cf9029b9-eac3-41cb-a45c-5c4c4bb49b0b */
+ public final double getTolMaxZ() {
+ return tolMaxZ;
}
/**
@@ -65,11 +92,6 @@
coefRelaxQ = newCoefRelaxQ;
}
- /** @pdOid 7bae5f4d-b137-46a4-9602-401ccf8e69a0 */
- public final double getCoefRelaxZ() {
- return coefRelaxZ;
- }
-
/**
* @param newCoefRelaxZ
* @pdOid 7ab8d0dd-4261-4d2e-b571-aae2378a56f5
@@ -78,11 +100,6 @@
coefRelaxZ = newCoefRelaxZ;
}
- /** @pdOid 3f65241b-3795-43da-98f7-553fbbb05b71 */
- public final double getCrMaxFlu() {
- return crMaxFlu;
- }
-
/**
* @param newCrMaxFlu
* @pdOid 189aed1d-3a76-4da8-88a2-527631d80a51
@@ -91,11 +108,6 @@
crMaxFlu = newCrMaxFlu;
}
- /** @pdOid bb4f1c0b-62a8-43c7-a30c-52b4b215a7b6 */
- public final double getCrMaxTor() {
- return crMaxTor;
- }
-
/**
* @param newCrMaxTor
* @pdOid 132ac15f-09fd-4463-84f0-5959c3f15c6f
@@ -104,11 +116,6 @@
crMaxTor = newCrMaxTor;
}
- /** @pdOid 1934a5c8-a415-439d-a69a-2c4b69fb694d */
- public final int getNbrPdtDecoup() {
- return nbrPdtDecoup;
- }
-
/**
* @param newNbrPdtDecoup
* @pdOid a8c6a325-675b-49ca-b6c0-ee44d03c5f05
@@ -117,11 +124,6 @@
nbrPdtDecoup = newNbrPdtDecoup;
}
- /** @pdOid 4ddc311b-9bee-4471-9127-b3e9b5a8667c */
- public final int getNbrPdtMax() {
- return nbrPdtMax;
- }
-
/**
* @param newNbrPdtMax
* @pdOid 9fc8e1f6-ac06-46b3-9eb5-18c4abbab5dc
@@ -130,9 +132,12 @@
nbrPdtMax = newNbrPdtMax;
}
- /** @pdOid 14006a8e-3ca2-4f22-a3fb-c481e94b8fcd */
- public final double getTolMaxQ() {
- return tolMaxQ;
+ /**
+ * @pdGenerated default parent setter
+ * @param newPdt
+ */
+ public void setPdt(Pdt newPdt) {
+ this.pdt = newPdt;
}
/**
@@ -143,11 +148,6 @@
tolMaxQ = newTolMaxQ;
}
- /** @pdOid cf9029b9-eac3-41cb-a45c-5c4c4bb49b0b */
- public final double getTolMaxZ() {
- return tolMaxZ;
- }
-
/**
* @param newTolMaxZ
* @pdOid 62827161-e612-4268-b881-8eb98f228911
@@ -156,4 +156,11 @@
tolMaxZ = newTolMaxZ;
}
+ @Override
+ public String toString() {
+ return "ParamNumCalcPseudoPerm [coefRelaxQ=" + coefRelaxQ + ", coefRelaxZ=" + coefRelaxZ + ", crMaxFlu=" + crMaxFlu
+ + ", crMaxTor=" + crMaxTor + ", nbrPdtDecoup=" + nbrPdtDecoup + ", nbrPdtMax=" + nbrPdtMax + ", pdt=" + pdt
+ + ", tolMaxQ=" + tolMaxQ + ", tolMaxZ=" + tolMaxZ + "]";
+ }
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -10,11 +10,11 @@
public class ParamNumCalcTrans {
/** @pdOid d16a5dab-67d9-4eef-833a-4d5911f0816e */
private double crMaxFlu;
+
/** @pdOid 46bd8b1d-0954-439f-9fed-6b925a7fcd25 */
private double crMaxTor;
/** @pdOid 6718b76c-bd86-4b14-a483-93d1decf7a75 */
private double thetaPreissmann;
-
/** @pdRoleInfo migr=no name=Pdt assc=association115 mult=1..1 type=Composition */
private Pdt pdt = DefaultValues.PDT_ONE_HOUR;
@@ -24,24 +24,26 @@
thetaPreissmann = defaultValues.getDefaultDoubleValue(DefaultValues.THETA);
}
+ /** @pdOid 5b9e8cff-ffcd-4c08-94cb-4c7491cbdde7 */
+ public final double getCrMaxFlu() {
+ return crMaxFlu;
+ }
+
+ /** @pdOid 19a74ae7-4f5d-4727-98ea-9fe3ed9a890c */
+ public final double getCrMaxTor() {
+ return crMaxTor;
+ }
+
/** @pdGenerated default parent getter */
public Pdt getPdt() {
return pdt;
}
- /**
- * @pdGenerated default parent setter
- * @param newPdt
- */
- public void setPdt(Pdt newPdt) {
- this.pdt = newPdt;
+ /** @pdOid 3a08c58e-1f25-47d7-9364-9d5bff029dd6 */
+ public final double getThetaPreissmann() {
+ return thetaPreissmann;
}
- /** @pdOid 5b9e8cff-ffcd-4c08-94cb-4c7491cbdde7 */
- public final double getCrMaxFlu() {
- return crMaxFlu;
- }
-
/**
* @param newCrMaxFlu
* @pdOid 868eefe0-ab51-49ef-8162-322e4145ba34
@@ -50,11 +52,6 @@
crMaxFlu = newCrMaxFlu;
}
- /** @pdOid 19a74ae7-4f5d-4727-98ea-9fe3ed9a890c */
- public final double getCrMaxTor() {
- return crMaxTor;
- }
-
/**
* @param newCrMaxTor
* @pdOid dbce015e-79ea-4c0f-9013-c713edb9e229
@@ -63,9 +60,12 @@
crMaxTor = newCrMaxTor;
}
- /** @pdOid 3a08c58e-1f25-47d7-9364-9d5bff029dd6 */
- public final double getThetaPreissmann() {
- return thetaPreissmann;
+ /**
+ * @pdGenerated default parent setter
+ * @param newPdt
+ */
+ public void setPdt(Pdt newPdt) {
+ this.pdt = newPdt;
}
/**
@@ -76,4 +76,10 @@
thetaPreissmann = newThetaPreissmann;
}
+ @Override
+ public String toString() {
+ return "ParamNumCalcTrans [crMaxFlu=" + crMaxFlu + ", crMaxTor=" + crMaxTor + ", pdt=" + pdt + ", thetaPreissmann="
+ + thetaPreissmann + "]";
+ }
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcVraiPerm.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcVraiPerm.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcVraiPerm.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -1,10 +1,15 @@
/***********************************************************************
- * Module: ParamNumCalcVraiPerm.java
- * Author: deniger
- * Purpose: Defines the Class ParamNumCalcVraiPerm
+ * Module: ParamNumCalcVraiPerm.java Author: deniger Purpose: Defines the Class ParamNumCalcVraiPerm
***********************************************************************/
package org.fudaa.dodico.crue.metier.emh;
/** @pdOid 46814e74-86a9-4dfc-b9ad-732b75c09147 */
-public class ParamNumCalcVraiPerm {}
\ No newline at end of file
+public class ParamNumCalcVraiPerm {
+
+ @Override
+ public String toString() {
+ return "ParamNumCalcVraiPerm []";
+ }
+
+}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParam.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParam.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParam.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -1,13 +1,11 @@
/***********************************************************************
- * Module: ValParam.java
- * Author: deniger
- * Purpose: Defines the Class ValParam
+ * Module: ValParam.java Author: deniger Purpose: Defines the Class ValParam
***********************************************************************/
package org.fudaa.dodico.crue.metier.emh;
/** @pdOid f034d538-ce8f-4c75-bfc8-4d8130c7a46f */
-public class ValParam implements ObjetNomme {
+public abstract class ValParam implements ObjetNomme {
/** @pdOid 6f0ce4aa-3299-48c8-b1d1-8f9126593468 */
private String nom;
@@ -22,6 +20,8 @@
return id;
}
+ public abstract Object getValeurObjet();
+
/**
* @param newNom
* @pdOid 93623cd5-ac30-4dec-b943-8e77e912f712
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamBooleen.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamBooleen.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamBooleen.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -1,7 +1,5 @@
/***********************************************************************
- * Module: ValParamBooleen.java
- * Author: battista
- * Purpose: Defines the Class ValParamBooleen
+ * Module: ValParamBooleen.java Author: battista Purpose: Defines the Class ValParamBooleen
***********************************************************************/
package org.fudaa.dodico.crue.metier.emh;
@@ -9,19 +7,26 @@
/** @pdOid 27c90d40-4bfd-4375-99b2-75c01bc273ca */
public class ValParamBooleen extends ValParam {
/** @pdOid 828ac7ca-131c-4d6f-94bb-f753f015ab7c */
- private boolean valeur;
-
- /** @pdOid 2dccad74-1c5b-493f-8352-e763f5095a4b */
- public final boolean getValeur() {
- return valeur;
- }
-
- /** @param newValeur
- * @pdOid 5f0d6b20-839e-42f1-b238-9372901e866a */
- public final void setValeur(boolean newValeur) {
- valeur = newValeur;
- }
+ private boolean valeur;
+ /** @pdOid 2dccad74-1c5b-493f-8352-e763f5095a4b */
+ public final boolean getValeur() {
+ return valeur;
+ }
+
+ /**
+ * @param newValeur
+ * @pdOid 5f0d6b20-839e-42f1-b238-9372901e866a
+ */
+ public final void setValeur(boolean newValeur) {
+ valeur = newValeur;
+ }
+
+ @Override
+ public Object getValeurObjet() {
+ return valeur;
+ }
+
public ValParamBooleen(final String nom, final boolean valeur) {
super(nom);
this.valeur = valeur;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamDouble.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamDouble.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamDouble.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -1,28 +1,32 @@
/***********************************************************************
- * Module: ValParamDouble.java
- * Author: deniger
- * Purpose: Defines the Class ValParamDouble
+ * Module: ValParamDouble.java Author: deniger Purpose: Defines the Class ValParamDouble
***********************************************************************/
package org.fudaa.dodico.crue.metier.emh;
-
/** @pdOid 5a1cc81a-375e-4f4f-80e7-6e7026fb7811 */
public class ValParamDouble extends ValParam {
- /** @pdOid 03367cd0-b53c-4e0a-97d1-abfc61d5d93e */
- private double valeur;
-
- /** @pdOid 11fa33aa-a560-4f98-981c-d13edff62523 */
- public final double getValeur() {
- return valeur;
- }
-
- /** @param newValeur
- * @pdOid efbd2d5d-d777-47c6-8b46-3a07649879f8 */
- public final void setValeur(double newValeur) {
- valeur = newValeur;
- }
+ /** @pdOid 03367cd0-b53c-4e0a-97d1-abfc61d5d93e */
+ private double valeur;
+ /** @pdOid 11fa33aa-a560-4f98-981c-d13edff62523 */
+ public final double getValeur() {
+ return valeur;
+ }
+
+ /**
+ * @param newValeur
+ * @pdOid efbd2d5d-d777-47c6-8b46-3a07649879f8
+ */
+ public final void setValeur(double newValeur) {
+ valeur = newValeur;
+ }
+
+ @Override
+ public Object getValeurObjet() {
+ return valeur;
+ }
+
public ValParamDouble(final String nom, final Double valeur) {
super(nom);
this.valeur = valeur;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamEntier.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamEntier.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ValParamEntier.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -1,7 +1,5 @@
/***********************************************************************
- * Module: ValParamEntier.java
- * Author: deniger
- * Purpose: Defines the Class ValParamEntier
+ * Module: ValParamEntier.java Author: deniger Purpose: Defines the Class ValParamEntier
***********************************************************************/
package org.fudaa.dodico.crue.metier.emh;
@@ -24,6 +22,11 @@
valeur = newValeur;
}
+ @Override
+ public Object getValeurObjet() {
+ return valeur;
+ }
+
public ValParamEntier(final String nom, final int valeur) {
super(nom);
this.valeur = valeur;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelperPredicate.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelperPredicate.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelperPredicate.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -44,7 +44,7 @@
public static class PredicateEMHActivated implements Predicate {
public boolean evaluate(Object object) {
- return object != null && ((CatEMHActivable) object).getActive();
+ return object != null && ((CatEMHActivable) object).getUserActive();
}
}
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 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -31,6 +31,7 @@
import org.fudaa.dodico.crue.io.neuf.FCBValueObject.EnteteProfil;
import org.fudaa.dodico.crue.metier.ManagerEMHModeleBase;
import org.fudaa.dodico.crue.metier.ManagerEMHScenario;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
@@ -143,23 +144,32 @@
boolean error = false;
for (final EnteteBranche br : res.getContainerBranches().getListData()) {
final String id = br.getNom().toUpperCase();
- if (data.findBrancheByReference(id) == null) {
+ CatEMHBranche foundBranche = data.findBrancheByReference(id);
+ if (foundBranche == null) {
analyze.addError("res.branche.notFound", id);
error = true;
+ } else {
+ foundBranche.addInfosEMH(res.getContainerBranches().createInfoEMH(foundBranche));
}
}
for (final EnteteNoeud nd : res.getContainerNoeuds().getListData()) {
final String id = nd.getNom().toUpperCase();
- if (data.findNoeudByReference(id) == null) {
+ CatEMHNoeud foundNoeud = data.findNoeudByReference(id);
+ if (foundNoeud == null) {
analyze.addError("res.noeud.notFound", id);
error = true;
+ } else {
+ foundNoeud.addInfosEMH(res.getContainerBranches().createInfoEMH(foundNoeud));
}
}
for (final EnteteProfil prof : res.getContainerProfil().getListData()) {
final String id = prof.getNom().toUpperCase();
- if (StringUtils.isNotEmpty(id) && data.findSectionByReference(id) == null) {
+ CatEMHSection foundSection = data.findSectionByReference(id);
+ if (StringUtils.isNotEmpty(id) && foundSection == null) {
analyze.addError("res.section.notFound", id);
error = true;
+ } else {
+ foundSection.addInfosEMH(res.getContainerBranches().createInfoEMH(foundSection));
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateConnectionModele.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateConnectionModele.java 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateConnectionModele.java 2009-12-23 02:48:43 UTC (rev 5571)
@@ -112,7 +112,7 @@
final List<CatEMHBranche> listeBranches = new ArrayList<CatEMHBranche>();
for (final CatEMHBranche branche : lstBranchesTotales) {
- if (branche.getActive()) {
+ if (branche.getUserActive()) {
listeBranches.add(branche);
}
}
@@ -132,7 +132,7 @@
final List<CatEMHBranche> listeConnected = new ArrayList<CatEMHBranche>();
for (final CatEMHBranche branche : lstBranchesRestantes) {
- if (branche.getActive()) {
+ if (branche.getUserActive()) {
final CatEMHNoeud noeudAmont = branche.getNoeudAmont();
if (noeudAmont == noeud) {
@@ -160,7 +160,7 @@
*/
public static CatEMHNoeud findNoeudDepart(final List<CatEMHBranche> data) {
for (final CatEMHBranche catEMHBranche : data) {
- if (catEMHBranche.getActive()) {
+ if (catEMHBranche.getUserActive()) {
CatEMHNoeud findNoeudDep = catEMHBranche.getNoeudAmont();
if (findNoeudDep != null) { return findNoeudDep; }
findNoeudDep = catEMHBranche.getNoeudAval();
@@ -187,7 +187,7 @@
}
for (final CatEMHBranche branche : data.getBranches()) {
- if (branche.getActive()) {
+ if (branche.getUserActive()) {
final CatEMHNoeud noeudAmont = branche.getNoeudAmont();
if (noeudAmont != null) {
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml 2009-12-22 01:54:50 UTC (rev 5570)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml 2009-12-23 02:48:43 UTC (rev 5571)
@@ -20,7 +20,8 @@
actives
-->
<Requete Description="EMH active">
- simpleEMH[activated='true']</Requete>
+ simpleEMH[actuallyActive='true']
+ </Requete>
</Selection>
<!--
Compare-Liste Attribut="id": signifie que dans les listes obtenues on
@@ -40,7 +41,8 @@
id
-->
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">simpleEMH[activated='true']</Requete>
+ <Requete Description="Toutes les EMH">simpleEMH[actuallyActive='true']
+ </Requete>
</Merge>
</Selection>
<!-- On compare les types des emh et notamment leur class -->
@@ -54,7 +56,8 @@
NdAv</Nom>
<Selection>
<Merge Attribut="id" Description="Branche présente dans A et B de même Id">
- <Requete Description="Toutes les branches">branches[activated='true']</Requete>
+ <Requete Description="Toutes les branches">branches[actuallyActive='true']
+ </Requete>
</Merge>
</Selection>
<!-- On compare le noeud aval et le noeud amont -->
@@ -69,7 +72,7 @@
casier ou un casier de nom différent dans B</Nom>
<Selection>
<Merge Attribut="id" Description="Noeud présente dans A et B de même Id">
- <Requete Description="Tous les noeuds">noeuds[activated='true']</Requete>
+ <Requete Description="Tous les noeuds">noeuds[actuallyActive='true']</Requete>
</Merge>
</Selection>
<!--
@@ -86,7 +89,8 @@
B.Branche de même nom</Nom>
<Selection>
<Merge Attribut="id" Description="Branche présente dans A et B de même Id">
- <Requete Description="outes les branches">branches[activated='true']</Requete>
+ <Requete Description="outes les branches">branches[actuallyActive='true']
+ </Requete>
</Merge>
<!-- a partir du dernier résultat on récupère les relations-->
<Requete Description="Toutes les sections de la branche">sections</Requete>
@@ -102,7 +106,8 @@
abscisse Xp différente</Nom>
<Selection>
<Merge Attribut="id" Description="Branche présente dans A et B de même Id">
- <Requete Description="Toutes les branches">branches[activated='true']</Requete>
+ <Requete Description="Toutes les branches">branches[actuallyActive='true']
+ </Requete>
</Merge>
<!-- on ne compare que les relations qui portent sur la meme EMH -->
<Merge Attribut="emh.id">
@@ -124,7 +129,7 @@
CoefDiv, CoefPond</Nom>
<Selection>
<Merge Attribut="id" Description="Branche présente dans A et B de même Id">
- <Requete Description="Toutes les branches de Saint-Venant">branchesSaintVenant[activated='true']
+ <Requete Description="Toutes les branches de Saint-Venant">branchesSaintVenant[actuallyActive='true']
</Requete>
</Merge>
<!-- on ne compare que les relations qui portent sur la meme EMH -->
@@ -150,7 +155,7 @@
DonPrtGeo* différentes</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">simpleEMH[activated='true']
+ <Requete Description="Toutes les EMH">simpleEMH[actuallyActive='true']
</Requete>
</Merge>
<!--
@@ -158,7 +163,7 @@
sont nommées: soit DonPrtGeoBatiCasier,
DonPrtGeoProfilCasier,DonPrtGeoProfilSection
-->
- <Requete Description="Les dptg nommés">DPTGNomme</Requete>
+ <Requete Description="Les dptg nommés">DPTGNommes</Requete>
</Selection>
<Compare-Liste Bidirect="true" Attribut="id" />
</Comparaison>
@@ -168,7 +173,7 @@
DonPrtGeo* de même nom (attributs premier niveau)</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">simpleEMH[activated='true']
+ <Requete Description="Toutes les EMH">simpleEMH[actuallyActive='true']
</R...
[truncated message content] |
