Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5560] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2009-12-11 03:14:06
|
Revision: 5560
http://fudaa.svn.sourceforge.net/fudaa/?rev=5560&view=rev
Author: deniger
Date: 2009-12-11 03:13:54 +0000 (Fri, 11 Dec 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractTemplateEqualsTesterDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterInteger.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLong.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.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/CrueConverterETU.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterOPTG.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPCAL.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterPNUM.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/CrueIODico.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/metier/EMHProjet.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermBrancheSaintVenantQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermCasierProfilQruis.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuQapp.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcPseudoPermNoeudNiveauContinuZimpose.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CalcTransBrancheOrificeManoeuvre.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageFilEau.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheBarrageGenerique.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheNiveauxAssocies.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheQ.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCalcSansPrtCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniCasierProfil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniNoeudNiveauContinu.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniSection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoBatiCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilCasier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilSectionFenteData.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoSectionIdem.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHScenario.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemOrifice.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemPdt.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuil.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuilAvecPdc.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdPrtGeoModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamCalcScenario.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/ParamNumModeleBase.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/PlanimetrageNbrPdzCst.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHSectionDansBrancheSaintVenant.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMH.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/FactoryEMHRelation.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.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/PropertyValidatorsBuilder.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/ValidateEMHProperties.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/io/ioMessages.properties
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestComparaisonFactory.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestEqualsTesterLoi.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestExecuteComparaison.java
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/io/TestCrueDC.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCLMFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDCSPFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDPTIFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDRSOFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTGFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCruePCALFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCruePNUMFile.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueValidationModele.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/common/TestCrueDataImpl.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/metier/emh/TestCatEMHNoeud.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/ExampleNumberRangeValidator.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/ExampleValidationVariableBuilder.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestCruePrefix.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/CrueProjet.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/projet/ScenarioLoaderUI.java
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/ihmMessages.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueFileHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueLoaderNature.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueLoaderProperty.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueNumberParser.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CrueNumberUtils.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CruePropertyDefinitionContainer.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CruePropertyDefinitionNatureLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/CruePropertyDefinitionNatureLoaderDefault.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/NumberRangeValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/PropertyDefinition.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/PropertyNature.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/property/PropertyValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/PropertyValidatorBuilder.java
trunk/soft/fudaa-crue/dodico/src/main/resources/crue-nature.csv
trunk/soft/fudaa-crue/dodico/src/main/resources/crue-variable.csv
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/common/TestCrueFileHelper.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/property/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/property/TestCrueNatureAndPropertyLoader.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueNumberUtils.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonValuesLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/FactoryEqualsTesterSingleton.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/NumberRangeValidator.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/PropertyValidator.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/comparaison.csv
trunk/soft/fudaa-crue/dodico/src/test/java/idea/
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestComparaisonValuesLoader.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/ExampleValidateRangeBuilder.java
Added: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueFileHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueFileHelper.java (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueFileHelper.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -0,0 +1,85 @@
+package org.fudaa.dodico.crue.common;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluLibFile;
+
+public final class CrueFileHelper {
+
+ private CrueFileHelper() {
+
+ }
+
+ public static List<String[]> readFile(final String file, final CtuluAnalyze analyze) {
+ InputStream in = null;
+ List<String[]> lines = null;
+ try {
+ in = CrueFileHelper.class.getResourceAsStream(file);
+ lines = readFile(new InputStreamReader(in), analyze);
+ } catch (final Exception e) {
+ analyze.manageException(e);
+
+ } finally {
+ CtuluLibFile.close(in);
+ }
+ return lines;
+ }
+
+ public static List<String[]> readFile(final File file, final CtuluAnalyze analyze) {
+ Reader in = null;
+ List<String[]> lines = null;
+ try {
+ in = new FileReader(file);
+ lines = readFile(in, analyze);
+ } catch (final Exception e) {
+ analyze.manageException(e);
+
+ } finally {
+ CtuluLibFile.close(in);
+ }
+ return lines;
+ }
+
+ public static List<String[]> readFile(final Reader in, final CtuluAnalyze analyze) throws IOException {
+ final List<String[]> lines = new ArrayList<String[]>(300);
+ if (in == null) { return lines; }
+ final LineNumberReader reader = new LineNumberReader(in);
+ String line = reader.readLine();
+ while (line != null) {
+ if (line.length() > 0 && line.charAt(0) != '#') {
+ String[] allTokens = StringUtils.splitPreserveAllTokens(line, ';');
+ if (allTokens != null) {
+ for (int i = 0; i < allTokens.length; i++) {
+ allTokens[i] = clearCsvString(allTokens[i]);
+ }
+ }
+ lines.add(allTokens);
+ }
+
+ line = reader.readLine();
+ }
+ return lines;
+ }
+
+ /**
+ * @param in la chaine a traiter
+ * @return enlever les quotes au debut et fin si necessaire.
+ */
+ public static String clearCsvString(String in) {
+ if (in == null || in.length() < 2) { return in; }
+ char zero = in.charAt(0);
+ char last = in.charAt(in.length() - 1);
+ if ((zero == '"' && last == '"') || (zero == '\'' && last == '\'')) { return in.substring(1, in.length() - 1); }
+ return in;
+ }
+}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueNumberUtils.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueNumberUtils.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/common/CrueNumberUtils.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -1,59 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.common;
-
-import org.fudaa.ctulu.CtuluLib;
-
-/**
- * @author deniger
- */
-public final class CrueNumberUtils {
-
- /**
- * L'infini sur les EMH
- */
- public final static double INFINI = 1E30;
- /**
- * La valeur de l'infini a utiliser pour les tests.
- */
- public final static double INFINI_FOR_TEST = 1E29;
-
- private CrueNumberUtils() {
-
- }
-
- /**
- * @param d le double a tester
- * @return true si superieur a +{@link #INFINI} ou inferieur à -{@link #INFINI}
- */
- public static boolean isInfini(final double d) {
- return isInfiniPositif(d) || isInfiniNegatif(d);
- }
-
- /**
- * @param d le double a tester
- * @return true si pas infini
- */
- public static boolean isNotInfini(final double d) {
- return !isInfini(d);
- }
-
- /**
- * @param d d le double a tester
- * @return true si superieur ou egal a +{@link #INFINI}
- */
- public static boolean isInfiniPositif(final double d) {
- return d >= INFINI_FOR_TEST || CtuluLib.isEquals(d, INFINI_FOR_TEST);
- }
-
- /**
- * @param d d le double a tester
- * @return true si inferieur ou egal à -{@link #INFINI}
- */
- public static boolean isInfiniNegatif(final double d) {
- return d <= -INFINI_FOR_TEST || CtuluLib.isEquals(d, -INFINI_FOR_TEST);
- }
-
-}
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonValuesLoader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonValuesLoader.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ComparaisonValuesLoader.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -1,86 +0,0 @@
-package org.fudaa.dodico.crue.comparaison;
-
-import gnu.trove.TObjectDoubleHashMap;
-
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ctulu.CtuluLibFile;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Permet de lire les valeurs de comparaisons dans un fichier
- *
- * @author deniger
- * @creation 22 juin 2009
- * @version
- */
-public class ComparaisonValuesLoader {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(ComparaisonValuesLoader.class);
-
- /**
- * Charge le fichier comparaison.csv
- *
- * @param analyze l'analyse recevant les erreur
- * @return la map identifiant variable-> eps de comparaison.
- */
- public TObjectDoubleHashMap load(final CtuluAnalyze analyze) {
- return load("comparaison.csv", analyze);
- }
-
- /**
- * @param file le nom du fichier a lire
- * @param analyze l'analyse recevant les erreur
- * @return la map identifiant variable ( avec une minuscule au debut)-> eps de comparaison.
- */
- public TObjectDoubleHashMap load(final String file, final CtuluAnalyze analyze) {
- final List<String[]> res = readFile(file, analyze);
- final TObjectDoubleHashMap values = new TObjectDoubleHashMap(res.size());
- for (final String[] strings : res) {
- if (strings.length == 2 && StringUtils.isNotBlank(strings[1])) {
- final String id = strings[0];
- try {
- strings[1] = StringUtils.replace(strings[1], "10-", "1E-", 1);
- final double value = Double.parseDouble(strings[1]);
- values.put(StringUtils.uncapitalize(id), value);
- } catch (final NumberFormatException e) {
- analyze.addError("comparaison.format.error", (Object) id);
- LOGGER.warn("comparaison.format.error in " + file + " for value " + strings[1], e);
- }
- }
- }
- return values;
-
- }
-
- private List<String[]> readFile(final String file, final CtuluAnalyze analyze) {
- InputStream in = null;
- final List<String[]> lines = new ArrayList<String[]>(300);
- try {
- in = ComparaisonValuesLoader.class.getResourceAsStream(file);
- final LineNumberReader reader = new LineNumberReader(new InputStreamReader(in));
- String line = reader.readLine();
- while (line != null) {
- if (line.length() > 0 && line.charAt(0) != '#') {
- lines.add(StringUtils.splitPreserveAllTokens(line, ';'));
- }
-
- line = reader.readLine();
- }
- } catch (final Exception e) {
- analyze.manageException(e);
-
- } finally {
- CtuluLibFile.close(in);
- }
- return lines;
- }
-
-}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -15,6 +15,7 @@
import org.fudaa.dodico.crue.comparaison.config.ConfCompare;
import org.fudaa.dodico.crue.comparaison.tester.FactoryEqualsTester;
import org.fudaa.dodico.crue.comparaison.tester.ResultatTest;
+import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
/**
* @author deniger
@@ -27,8 +28,8 @@
/**
* @param in
*/
- public ExecuteComparaison(final ConfComparaisonConteneur in) {
- this(in, FactoryEqualsTesterSingleton.INSTANCE);
+ public ExecuteComparaison(final ConfComparaisonConteneur in, CruePropertyDefinitionContainer props) {
+ this(in, new FactoryEqualsTester(props));
}
/**
Deleted: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/FactoryEqualsTesterSingleton.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/FactoryEqualsTesterSingleton.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/FactoryEqualsTesterSingleton.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -1,44 +0,0 @@
-/**
- * Licence GPL
- * Copyright Genesis
- */
-package org.fudaa.dodico.crue.comparaison;
-
-import gnu.trove.TObjectDoubleHashMap;
-
-import java.util.Collection;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.comparaison.tester.FactoryEqualsTester;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author deniger
- */
-public final class FactoryEqualsTesterSingleton {
- private final static Logger LOGGER = LoggerFactory.getLogger(FactoryEqualsTesterSingleton.class);
-
- /**
- * Singleton sur la factory
- */
- public static final FactoryEqualsTester INSTANCE;
- static {
- final CtuluAnalyze analyze = new CtuluAnalyze();
- final ComparaisonValuesLoader loader = new ComparaisonValuesLoader();
- final TObjectDoubleHashMap res = loader.load(analyze);
- INSTANCE = new FactoryEqualsTester(res);
- if (analyze.containsErrors()) {
- LOGGER.error("can't load ComparaisonValuesLoader");
- Collection<LogRecord> records = analyze.getRecords();
- for (LogRecord logRecord : records) {
- if (logRecord.getLevel() == Level.SEVERE) {
- LOGGER.error(logRecord.getMessage());
- }
- }
- }
- }
-
-}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractTemplateEqualsTesterDouble.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractTemplateEqualsTesterDouble.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractTemplateEqualsTesterDouble.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -1,6 +1,6 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import org.fudaa.dodico.crue.common.CrueNumberUtils;
+import org.fudaa.dodico.crue.property.CrueNumberUtils;
/**
* un template pour comparer des long.
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterInteger.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterInteger.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterInteger.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -1,6 +1,6 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import org.fudaa.dodico.crue.common.CrueNumberUtils;
+import org.fudaa.dodico.crue.property.CrueNumberUtils;
/**
* @author denf01a
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLong.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLong.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLong.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -1,6 +1,6 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import org.fudaa.dodico.crue.common.CrueNumberUtils;
+import org.fudaa.dodico.crue.property.CrueNumberUtils;
/**
* @author denf01a
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -1,7 +1,5 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import gnu.trove.TObjectDoubleHashMap;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -10,6 +8,7 @@
import org.fudaa.dodico.crue.metier.emh.LoiDF;
import org.fudaa.dodico.crue.metier.emh.LoiFF;
import org.fudaa.dodico.crue.metier.emh.PtProfil;
+import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
/**
* @author denf01a
@@ -18,7 +17,7 @@
*/
public class FactoryEqualsTester {
- private final TObjectDoubleHashMap propEps;
+ private final CruePropertyDefinitionContainer propEps;
private final Map<Class, EqualsTesterItemBuilder> knownTesterBuilder;
private final Map<Class, EqualsTester> knownTester;
@@ -28,7 +27,7 @@
/**
* @param propEps la correspondance propertyName->Epsilon
*/
- public FactoryEqualsTester(final TObjectDoubleHashMap propEps) {
+ public FactoryEqualsTester(final CruePropertyDefinitionContainer propEps) {
super();
this.propEps = propEps;
knownTesterBuilder = new HashMap<Class, EqualsTesterItemBuilder>();
@@ -58,7 +57,7 @@
* @return l'epsilon cherche
*/
public double getEpsFor(final String id) {
- return (propEps == null) ? 0 : propEps.get(id);
+ return (propEps == null || !propEps.isPropertyDefined(id)) ? 0 : propEps.getProperty(id).getEpsilon();
}
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueData.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueData.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueData.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -31,6 +31,7 @@
import org.fudaa.dodico.crue.metier.emh.OrdResScenario;
import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
+import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
/**
* @author deniger
@@ -242,4 +243,20 @@
*/
List<EMHBrancheSaintVenant> getBranchesSaintVenant();
+ /**
+ * boolean pour indiquer les fichiers crue 9 contiennent des cartes distmax. Dans ce cas, la lecture des fichiers de resultats ne doivent pas se faire.
+ * @return true si contient distmax
+ */
+ public boolean isCrue9ContientDistmax();
+
+ /**
+ * boolean pour indiquer les fichiers crue 9 contiennent des cartes distmax. Dans ce cas, la lecture des fichiers de
+ * resultats ne doivent pas se faire.
+ *
+ * @param crue9ContientDistmax true si contient distmax
+ */
+ public void setCrue9ContientDistmax(boolean crue9ContientDistmax);
+
+ public CruePropertyDefinitionContainer getCruePropertyDefinitionContainer();
+
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -37,6 +37,7 @@
import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+import org.fudaa.dodico.crue.property.CruePropertyDefinitionContainer;
/**
* CrueData est un conteneur de donn�es Crue, il contient des donnees EMH de chaque cat�gorie pour optimiser leur acc�s.
@@ -92,21 +93,48 @@
// private List<ResPrtGeo> rptg;
- private final EMHScenario scenarioData;
+ final EMHScenario scenarioData;
private final EMHSousModele ssModele;
private final EMHNoeudFactory nodeFactory;
+
/**
+ * boolean pour indiquer les fichiers crue 9 contiennent des cartes distmax. Dans ce cas, la lecture des fichiers de
+ * resultats ne doivent pas se faire.
+ */
+ boolean crue9ContientDistmax;
+
+ /**
+ * boolean pour indiquer les fichiers crue 9 contiennent des cartes distmax. Dans ce cas, la lecture des fichiers de
+ * resultats ne doivent pas se faire.
+ *
+ * @return true si contient distmax
+ */
+ public boolean isCrue9ContientDistmax() {
+ return crue9ContientDistmax;
+ }
+
+ /**
+ * boolean pour indiquer les fichiers crue 9 contiennent des cartes distmax. Dans ce cas, la lecture des fichiers de
+ * resultats ne doivent pas se faire.
+ *
+ * @param crue9ContientDistmax true si contient distmax
+ */
+ public void setCrue9ContientDistmax(boolean crue9ContientDistmax) {
+ this.crue9ContientDistmax = crue9ContientDistmax;
+ }
+
+ /**
* Données STO
*/
private STOSequentialReader sto;
- public CrueDataImpl() {
- this(new EMHNoeudFactory());
+ public CrueDataImpl(CruePropertyDefinitionContainer propertyDefContainer) {
+ this(new EMHNoeudFactory(), propertyDefContainer);
}
- public CrueDataImpl(EMHNoeudFactory nodeFactory) {
- scenarioData = new EMHScenario();
+ public CrueDataImpl(EMHNoeudFactory nodeFactory, CruePropertyDefinitionContainer propertyDefContainer) {
+ scenarioData = new EMHScenario(propertyDefContainer);
ssModele = new EMHSousModele();
modele = new EMHModeleBase();
this.nodeFactory = nodeFactory;
@@ -126,6 +154,10 @@
}
}
+ public CruePropertyDefinitionContainer getCruePropertyDefinitionContainer() {
+ return scenarioData.getPropertyDefinitionContainer();
+ }
+
public EMHNoeudNiveauContinu createNode(String id) {
return this.nodeFactory.getNode(id);
}
@@ -315,7 +347,7 @@
public void registerUseCasierBati(final EMH emh, final String profilId) {
DonPrtGeoBatiCasier casier = getUsedBatiCasier(profilId);
if (casier == null) {
- casier = new DonPrtGeoBatiCasier();
+ casier = new DonPrtGeoBatiCasier(getCruePropertyDefinitionContainer());
casier.setNom(profilId);
idBatiCasierUse.put(profilId, casier);
}
@@ -326,7 +358,7 @@
public void registerUseCasierProfil(final EMH emh, final String profilId) {
DonPrtGeoProfilCasier casier = getUsedProfilCasier(profilId);
if (casier == null) {
- casier = new DonPrtGeoProfilCasier();
+ casier = new DonPrtGeoProfilCasier(getCruePropertyDefinitionContainer());
casier.setNom(profilId);
idProfilCasierUse.put(profilId, casier);
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCLM.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -1,6 +1,5 @@
/**
- * Licence GPL
- * Copyright Genesis
+ * Licence GPL Copyright Genesis
*/
package org.fudaa.dodico.crue.io.dao;
@@ -10,8 +9,46 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueData;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.*;
-import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.BrancheOrificeManoeuvrePersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.BrancheSaintVenantHydrogrammeRuisPersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.CalcPseudoPermBrancheBrancheSaintVenantQruisPersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.CalcPseudoPermBrancheCasierProfilQruisPersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.CalcPseudoPermBrancheOrificeManoeuvrePersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.CalcPseudoPermNoeudNiveauContinuQappPersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.CalcPseudoPermNoeudNiveauContinuZimposePersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.CalculAbstractPersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.CalculPermanentPersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.CalculTransitoirePersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.CasierProfilHydrogrammeRuisPersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.HydrogrammeQappPersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.HydrogrammeQruisPersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.LimnigrammePersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.ManoeuvrePersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.NoeudNiveauContinuHydrogrammePersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.NoeudNiveauContinuLimnigrammePersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.NoeudNiveauContinuTarragePersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.RefDCLMAbstractPersist;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCLM.TarragePersist;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPerm;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermBrancheOrificeManoeuvre;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermBrancheSaintVenantQruis;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermCasierProfilQruis;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermNoeudNiveauContinuQapp;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermNoeudNiveauContinuZimpose;
+import org.fudaa.dodico.crue.metier.emh.CalcTrans;
+import org.fudaa.dodico.crue.metier.emh.CalcTransBrancheOrificeManoeuvre;
+import org.fudaa.dodico.crue.metier.emh.CalcTransBrancheSaintVenantQruis;
+import org.fudaa.dodico.crue.metier.emh.CalcTransCasierProfilQruis;
+import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuLimnigramme;
+import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuQapp;
+import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuTarage;
+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.DonCLimMScenario;
+import org.fudaa.dodico.crue.metier.emh.Loi;
+import org.fudaa.dodico.crue.metier.emh.LoiDF;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
/**
@@ -113,7 +150,8 @@
final CalcPseudoPermNoeudNiveauContinuQappPersist eltPersist = (CalcPseudoPermNoeudNiveauContinuQappPersist) eltRefPersist;
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
- final CalcPseudoPermNoeudNiveauContinuQapp eltMetier = new CalcPseudoPermNoeudNiveauContinuQapp();
+ final CalcPseudoPermNoeudNiveauContinuQapp eltMetier = new CalcPseudoPermNoeudNiveauContinuQapp(dataLinked
+ .getCruePropertyDefinitionContainer());
eltMetier.setCalculParent(calculPermMetier);
eltMetier.setQapp(eltPersist.Qapp);
calculPermMetier.addCalcPseudoPermNoeudNiveauContinuQapp(eltMetier);
@@ -129,7 +167,8 @@
final CalcPseudoPermNoeudNiveauContinuZimposePersist eltPersist = (CalcPseudoPermNoeudNiveauContinuZimposePersist) eltRefPersist;
final CatEMHNoeud noeudMetier = getEMHNoeudFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (noeudMetier != null) {
- final CalcPseudoPermNoeudNiveauContinuZimpose eltMetier = new CalcPseudoPermNoeudNiveauContinuZimpose();
+ final CalcPseudoPermNoeudNiveauContinuZimpose eltMetier = new CalcPseudoPermNoeudNiveauContinuZimpose(
+ dataLinked.getCruePropertyDefinitionContainer());
eltMetier.setCalculParent(calculPermMetier);
eltMetier.setZimpose(eltPersist.Zimpose);
calculPermMetier.addCalcPseudoPermNoeudNiveauContinuZimpose(eltMetier);
@@ -142,7 +181,8 @@
final CalcPseudoPermBrancheOrificeManoeuvrePersist eltPersist = (CalcPseudoPermBrancheOrificeManoeuvrePersist) eltRefPersist;
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
- final CalcPseudoPermBrancheOrificeManoeuvre eltMetier = new CalcPseudoPermBrancheOrificeManoeuvre();
+ final CalcPseudoPermBrancheOrificeManoeuvre eltMetier = new CalcPseudoPermBrancheOrificeManoeuvre(
+ dataLinked.getCruePropertyDefinitionContainer());
eltMetier.setCalculParent(calculPermMetier);
eltMetier.setOuv(eltPersist.Ouv);
eltMetier.setSensOuv(eltPersist.SensOuv);
@@ -157,7 +197,8 @@
final CalcPseudoPermBrancheBrancheSaintVenantQruisPersist eltPersist = (CalcPseudoPermBrancheBrancheSaintVenantQruisPersist) eltRefPersist;
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
- final CalcPseudoPermBrancheSaintVenantQruis eltMetier = new CalcPseudoPermBrancheSaintVenantQruis();
+ final CalcPseudoPermBrancheSaintVenantQruis eltMetier = new CalcPseudoPermBrancheSaintVenantQruis(
+ dataLinked.getCruePropertyDefinitionContainer());
eltMetier.setCalculParent(calculPermMetier);
eltMetier.setQruis(eltPersist.Qruis);
calculPermMetier.addCalcPseudoPermBrancheSaintVenantQruis(eltMetier);
@@ -172,7 +213,8 @@
final CalcPseudoPermBrancheCasierProfilQruisPersist eltPersist = (CalcPseudoPermBrancheCasierProfilQruisPersist) eltRefPersist;
final CatEMHCasier casierMetier = getEMHCasierFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (casierMetier != null) {
- final CalcPseudoPermCasierProfilQruis eltMetier = new CalcPseudoPermCasierProfilQruis();
+ final CalcPseudoPermCasierProfilQruis eltMetier = new CalcPseudoPermCasierProfilQruis(dataLinked
+ .getCruePropertyDefinitionContainer());
eltMetier.setCalculParent(calculPermMetier);
eltMetier.setQruis(eltPersist.Qruis);
calculPermMetier.addCalcPseudoPermCasierProfilQruis(eltMetier);
@@ -290,7 +332,8 @@
final BrancheOrificeManoeuvrePersist eltPersist = (BrancheOrificeManoeuvrePersist) eltRefPersist;
final CatEMHBranche brancheMetier = getEMHBrancheFromReferenceDRSO(eltPersist.NomRef, dataLinked, analyzer);
if (brancheMetier != null) {
- final CalcTransBrancheOrificeManoeuvre eltMetier = new CalcTransBrancheOrificeManoeuvre();
+ final CalcTransBrancheOrificeManoeuvre eltMetier = new CalcTransBrancheOrificeManoeuvre(dataLinked
+ .getCruePropertyDefinitionContainer());
eltMetier.setCalculParent(calculTransMetier);
brancheMetier.addInfosEMH(eltMetier);
eltMetier.setEmh(brancheMetier);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDCSP.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -7,8 +7,49 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueData;
-import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.*;
-import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheAbstract;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageFilEauAbstract;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheBarrageGeneriqueAbstract;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheClassiqueAbstract;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheNiveauxAssocies;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheOrifice;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBranchePDCAbstract;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBranchePdc;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheSaintVenant;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheSeuilAbstract;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheSeuilLateral;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoCasier;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoElemAvecSeuilPdc;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoElemSeuilOrifice;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoPdc;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoRegimeDenoye;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoRegimeNoye;
+import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDCSP.DaoZasso;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrt;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheNiveauxAssocies;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBranchePdc;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtCasierProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheNiveauxAssocies;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.EMHBranchePdc;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.ElemSeuilAvecPdc;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
/**
@@ -49,7 +90,8 @@
if (casier == null) {
analyser.addInfo("io.global.cantFindCasier.error", daoCasier.NomRef);
}
- final DonCalcSansPrtCasierProfil dcsp = new DonCalcSansPrtCasierProfil();
+ final DonCalcSansPrtCasierProfil dcsp = new DonCalcSansPrtCasierProfil(dataLinked
+ .getCruePropertyDefinitionContainer());
dcsp.setCoefRuis(daoCasier.CoefRuis);
casier.addInfosEMH(dcsp);
}
@@ -380,7 +422,8 @@
} else {
if (branchePersist instanceof DaoBrancheClassiqueAbstract) {
final DaoBrancheClassiqueAbstract br = (DaoBrancheClassiqueAbstract) branchePersist;
- final DonCalcSansPrtBrancheSaintVenant dataCalcul = new DonCalcSansPrtBrancheSaintVenant();
+ final DonCalcSansPrtBrancheSaintVenant dataCalcul = new DonCalcSansPrtBrancheSaintVenant(data
+ .getCruePropertyDefinitionContainer());
dataCalcul.setCoefBeta(br.CoefBeta);
dataCalcul.setCoefRuis(br.CoefRuis);
dataCalcul.setCoefRuisQdm(br.CoefRuisQdm);
@@ -401,7 +444,7 @@
// -- recuperation de la formule --//
dataCalcul.setFormulePdc(br.FormulePdc);
// -- on remplit la liste des elements seuils --//
- dataCalcul.setElemSeuilAvecPdc(daoToMetierElemSeuilAvecPdc(br.ElemSeuils));
+ dataCalcul.setElemSeuilAvecPdc(daoToMetierElemSeuilAvecPdc(br.ElemSeuils, data));
// if (emh.getListeInfosEMH() == null) {
// emh.setListeInfosEMH(new ArrayList<InfosEMH>());
// }
@@ -412,7 +455,7 @@
// -- recuperation de la formule --//
dataCalcul.setFormulePdc(br.FormulePdc);
// -- on remplit la liste des elements seuils --//
- dataCalcul.setElemSeuilAvecPdc(daoToMetierElemSeuilAvecPdc(br.ElemSeuils));
+ dataCalcul.setElemSeuilAvecPdc(daoToMetierElemSeuilAvecPdc(br.ElemSeuils, data));
// if (emh.getListeInfosEMH() == null) {
// emh.setListeInfosEMH(new ArrayList<InfosEMH>());
// }
@@ -427,7 +470,7 @@
final DaoBrancheOrifice br = (DaoBrancheOrifice) branchePersist;
final DonCalcSansPrtBrancheOrifice dataCalcul = new DonCalcSansPrtBrancheOrifice();
// -- on remplit la liste des elements seuils --//
- dataCalcul.setElemOrifice(daoMetierBrancheOrifice(br.ElemOrifice));
+ dataCalcul.setElemOrifice(daoMetierBrancheOrifice(br.ElemOrifice, data));
// if (emh.getListeInfosEMH() == null) {
// emh.setListeInfosEMH(new ArrayList<InfosEMH>());
// }
@@ -453,7 +496,8 @@
// -- Branche niveau associé --//
else if (branchePersist instanceof DaoBrancheNiveauxAssocies) {
final DaoBrancheNiveauxAssocies br = (DaoBrancheNiveauxAssocies) branchePersist;
- final DonCalcSansPrtBrancheNiveauxAssocies dataCalcul = new DonCalcSansPrtBrancheNiveauxAssocies();
+ final DonCalcSansPrtBrancheNiveauxAssocies dataCalcul = new DonCalcSansPrtBrancheNiveauxAssocies(data
+ .getCruePropertyDefinitionContainer());
// -- recuperation de la Loi PDC --//
if (br.Zasso != null) {
final LoiFF newLoi = new LoiFF();
@@ -470,7 +514,8 @@
branche.addInfosEMH(dataCalcul);
} else if (branchePersist instanceof DaoBrancheBarrageFilEauAbstract) {
final DaoBrancheBarrageFilEauAbstract br = (DaoBrancheBarrageFilEauAbstract) branchePersist;
- final DonCalcSansPrtBrancheBarrageFilEau dataCalcul = new DonCalcSansPrtBrancheBarrageFilEau();
+ final DonCalcSansPrtBrancheBarrageFilEau dataCalcul = new DonCalcSansPrtBrancheBarrageFilEau(data
+ .getCruePropertyDefinitionContainer());
// -- recuperation de la Loi RegimeDenoye --//
if (br.RegimeDenoye != null) {
@@ -483,15 +528,13 @@
dataCalcul.setQLimSup(br.QLimSup);
// -- on remplit la liste des elements seuils --//
- dataCalcul.setElemSeuil(daoToMetierElemSeuil(br.ElemSeuils));
- // if (emh.getListeInfosEMH() == null) {
- // emh.setListeInfosEMH(new ArrayList<InfosEMH>());
- // }
+ dataCalcul.setElemSeuil(daoToMetierElemSeuil(br.ElemSeuils, data));
branche.addInfosEMH(dataCalcul);
} else if (branchePersist instanceof DaoBrancheBarrageGeneriqueAbstract) {
final DaoBrancheBarrageGeneriqueAbstract br = (DaoBrancheBarrageGeneriqueAbstract) branchePersist;
- final DonCalcSansPrtBrancheBarrageGenerique dataCalcul = new DonCalcSansPrtBrancheBarrageGenerique();
+ final DonCalcSansPrtBrancheBarrageGenerique dataCalcul = new DonCalcSansPrtBrancheBarrageGenerique(data
+ .getCruePropertyDefinitionContainer());
// -- recuperation de la Loi RegimeDenoye --//
if (br.RegimeDenoye != null) {
@@ -534,11 +577,12 @@
* @param listeSeuilsPersist
* @return List<ElemSeuilAvecPdc>
*/
- private static List<ElemSeuilAvecPdc> daoToMetierElemSeuilAvecPdc(final List<DaoElemAvecSeuilPdc> listeSeuilsPersist) {
+ private static List<ElemSeuilAvecPdc> daoToMetierElemSeuilAvecPdc(final List<DaoElemAvecSeuilPdc> listeSeuilsPersist,
+ CrueData res) {
final List<ElemSeuilAvecPdc> listeEltSeuilsEMH = new ArrayList<ElemSeuilAvecPdc>();
if (listeSeuilsPersist != null) {
for (final DaoElemAvecSeuilPdc seuilPersist : listeSeuilsPersist) {
- final ElemSeuilAvecPdc seuilMetier = new ElemSeuilAvecPdc();
+ final ElemSeuilAvecPdc seuilMetier = new ElemSeuilAvecPdc(res.getCruePropertyDefinitionContainer());
seuilMetier.setCoefD(seuilPersist.CoefD);
seuilMetier.setCoefPdc(seuilPersist.CoefPdc);
seuilMetier.setLargeur(seuilPersist.Largeur);
@@ -558,10 +602,11 @@
* @return List<org.fudaa.dodico.crue.metier.emh.ElemSeuil>
*/
private static List<org.fudaa.dodico.crue.metier.emh.ElemSeuil> daoToMetierElemSeuil(
- final List<CrueDaoStructureDCSP.DaoElemSeuil> listeSeuilsPersist) {
+ final List<CrueDaoStructureDCSP.DaoElemSeuil> listeSeuilsPersist, CrueData res) {
final List<org.fudaa.dodico.crue.metier.emh.ElemSeuil> listeEltSeuilsEMH = new ArrayList<org.fudaa.dodico.crue.metier.emh.ElemSeuil>();
for (final CrueDaoStructureDCSP.DaoElemSeuil seuilPersist : listeSeuilsPersist) {
- final org.fudaa.dodico.crue.metier.emh.ElemSeuil seuilMetier = new org.fudaa.dodico.crue.metier.emh.ElemSeuil();
+ final org.fudaa.dodico.crue.metier.emh.ElemSeuil seuilMetier = new org.fudaa.dodico.crue.metier.emh.ElemSeuil(res
+ .getCruePropertyDefinitionContainer());
seuilMetier.setCoefD(seuilPersist.CoefD);
seuilMetier.setLargeur(seuilPersist.Largeur);
@@ -593,8 +638,9 @@
// }
private static org.fudaa.dodico.crue.metier.emh.ElemOrifice daoMetierBrancheOrifice(
- final DaoElemSeuilOrifice seuilPersist) {
- final org.fudaa.dodico.crue.metier.emh.ElemOrifice seuilMetier = new org.fudaa.dodico.crue.metier.emh.ElemOrifice();
+ final DaoElemSeuilOrifice seuilPersist, CrueData res) {
+ final org.fudaa.dodico.crue.metier.emh.ElemOrifice seuilMetier = new org.fudaa.dodico.crue.metier.emh.ElemOrifice(
+ res.getCruePropertyDefinitionContainer());
seuilMetier.setCoefD(seuilPersist.CoefD);
seuilMetier.setLargeur(seuilPersist.Largeur);
seuilMetier.setZseuil(seuilPersist.Zseuil);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.java 2009-12-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTG.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -286,7 +286,8 @@
// -- on remplit son contenu --//
profilGeo.setNom(profilPersist.Nom);
if (profilPersist.LargeurFente != null) {
- final DonPrtGeoProfilSectionFenteData dataFente = new DonPrtGeoProfilSectionFenteData();
+ final DonPrtGeoProfilSectionFenteData dataFente = new DonPrtGeoProfilSectionFenteData(crueData
+ .getCruePropertyDefinitionContainer());
dataFente.setLargeurFente(profilPersist.LargeurFente);
dataFente.setProfondeurFente(profilPersist.ProfondeurFente);
profilGeo.setFente(dataFente);
@@ -442,7 +443,7 @@
if (section == null) {
analyser.addInfo("io.dptg.section.ref.error", reference);
} else {
- final DonPrtGeoSectionIdem prtgeo = new DonPrtGeoSectionIdem();
+ final DonPrtGeoSectionIdem prtgeo = new DonPrtGeoSectionIdem(dataLinked.getCruePropertyDefinitionContainer());
prtgeo.setDz(sectionPersist.Dz);
section.addInfosEMH(prtgeo);
}
@@ -464,7 +465,8 @@
if (branche == null) {
analyser.addInfo("io.dptg.branche.ref.error", reference);
} else {
- final DonPrtGeoBrancheSaintVenant prtgeo = new DonPrtGeoBrancheSaintVenant();
+ final DonPrtGeoBrancheSaintVenant prtgeo = new DonPrtGeoBrancheSaintVenant(data
+ .getCruePropertyDefinitionContainer());
prtgeo.setCoefSinuo(branchePersist.CoefSinuo);
branche.addInfosEMH(prtgeo);
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-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDPTI.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
+import com.thoughtworks.xstream.converters.SingleValueConverter;
+
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueData;
@@ -56,8 +58,6 @@
import org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
-import com.thoughtworks.xstream.converters.SingleValueConverter;
-
/**
* Factory qui se charge de remplir les structures DAO du fichier DPTI avec les donnees metier et inversement.
*
@@ -335,7 +335,8 @@
if (noeud == null) {
analyser.addInfo("io.dpti.noeud.ref.error", reference);
} else {
- final DonPrtCIniNoeudNiveauContinu condInit = new DonPrtCIniNoeudNiveauContinu();
+ final DonPrtCIniNoeudNiveauContinu condInit = new DonPrtCIniNoeudNiveauContinu(data
+ .getCruePropertyDefinitionContainer());
condInit.setZini(noeudPersist.Zini);
// if (emh.getInfosEMH() == null) {
// emh.setListeInfosEMH(new ArrayList<InfosEMH>());
@@ -365,7 +366,7 @@
if (section == null) {
CrueHelper.unknowReference("Section", reference, analyser);
} else {
- final DonPrtCIniSection condInit = new DonPrtCIniSection();
+ final DonPrtCIniSection condInit = new DonPrtCIniSection(data.getCruePropertyDefinitionContainer());
condInit.setZini(sectionPersist.Zini);
// if (emh.getInfosEMH() == null) {
// emh.setListeInfosEMH(new ArrayList<InfosEMH>());
@@ -398,7 +399,7 @@
DonPrtCIniBranche condInit = null;
// -- cas particuliers Orifice--//
if (branchePersist instanceof BrancheOrifice) {
- condInit = new DonPrtCIniBrancheOrifice();
+ condInit = new DonPrtCIniBrancheOrifice(data.getCruePropertyDefinitionContainer());
final BrancheOrifice orif = (BrancheOrifice) branchePersist;
if (orif.Ouv != null) {
((DonPrtCIniBrancheOrifice) condInit).setOuv(orif.Ouv);
@@ -408,14 +409,14 @@
}
// -- cas particuliers SaintVenant--//
} else if (branchePersist instanceof BrancheSaintVenant) {
- condInit = new DonPrtCIniBrancheSaintVenant();
+ condInit = new DonPrtCIniBrancheSaintVenant(data.getCruePropertyDefinitionContainer());
final BrancheSaintVenant stVenant = (BrancheSaintVenant) branchePersist;
if (stVenant.Qruis != null) {
((DonPrtCIniBrancheSaintVenant) condInit).setQruis(stVenant.Qruis);
}
}
if (condInit == null) {
- condInit = new DonPrtCIniBranche();
+ condInit = new DonPrtCIniBranche(data.getCruePropertyDefinitionContainer());
}
if (branchePersist.Qini != null) {
condInit.setQini(branchePersist.Qini);
@@ -446,12 +447,8 @@
CrueHelper.unknowReference("Casier", reference, analyser);
} else {
if (casierPersist.Qruis != null) {
- final DonPrtCIniCasierProfil condInit = new DonPrtCIniCasierProfil();
- // condInit.setQruis(casierPersist.Qruis);
+ final DonPrtCIniCasierProfil condInit = new DonPrtCIniCasierProfil(data.getCruePropertyDefinitionContainer());
condInit.setQruis(casierPersist.Qruis);
- // if (emh.getInfosEMH() == null) {
- // emh.setListeInfosEMH(new ArrayList<InfosEMH>());
- // }
casier.addInfosEMH(condInit);
}
}
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-10 17:15:06 UTC (rev 5559)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueConverterDRSO.java 2009-12-11 03:13:54 UTC (rev 5560)
@@ -12,7 +12,6 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.io.common.CrueData;
-import org.fudaa.dodico.crue.io.common.CrueDataImpl;
import org.fudaa.dodico.crue.io.common.EnumsConverter;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDRSO.BrancheAbstract;
import org.fudaa.dodico.crue.io.dao.CrueDaoStructureDRSO.BrancheBarrageFilEau;
@@ -92,7 +91,7 @@
public CrueData convertDaoToMetier(final CrueDaoDRSO dao, final CrueData dataLinked, final CtuluAnalyze analyser) {
sectionPositionConverter = EnumsConverter.createEnumConverter(EnumPositionSection.class, analyser);
- final CrueData res = dataLinked == null ? new CrueDataImpl() : dataLinked;
+ final CrueData res = dataLinked;
// -- etape 1: on remplit les infso des noeuds --//
convertDaoToMetierNoeud(res, dao.Noeuds, analyser);
@@ -566,7 +565,7 @@
// -- commun aux objets --//
if (section != null) {
final RelationEMHSect...
[truncated message content] |
