Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5768] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2010-06-22 22:34:06
|
Revision: 5768
http://fudaa.svn.sourceforge.net/fudaa/?rev=5768&view=rev
Author: deniger
Date: 2010-06-22 22:33:59 +0000 (Tue, 22 Jun 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/.classpath
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/CrueXmlReaderWriterImpl.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHConteneurDeSousModele.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHModeleBase.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/EMHSousModele.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/helper/EMHHelper.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestConvertSelectOn.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/metier/helper/TestEMHHelper.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/ExampleValidationVariableBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHManagerBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/lib/xstream-1.3.1-sources.jar
Modified: trunk/soft/fudaa-crue/dodico/.classpath
===================================================================
--- trunk/soft/fudaa-crue/dodico/.classpath 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/.classpath 2010-06-22 22:33:59 UTC (rev 5768)
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="src" path="src/test/resources"/>
- <classpathentry exported="true" kind="lib" path="lib/ctulu.jar" sourcepath="lib/ctulu-src.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dodico.jar" sourcepath="lib/dodico-src.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/trove.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.jar" sourcepath="lib/xstream-distribution-1.3.1-src.zip"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-jxpath-1.3.jar" sourcepath="lib/commons-jxpath-1.3-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.5.6.jar" sourcepath="lib/jcl-over-slf4j-1.5.6-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/logback-classic-0.9.15.jar" sourcepath="lib/logback-classic-0.9.15-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/logback-core-0.9.15.jar" sourcepath="lib/logback-core-0.9.15-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.6.jar" sourcepath="lib/slf4j-api-1.5.6-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/joda-time-1.6.jar" sourcepath="lib/joda-time-1.6-sources.jar"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar" sourcepath="lib/commons-lang-2.4-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-core-1.8.0.jar" sourcepath="lib/commons-beanutils-1.8.0-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar" sourcepath="lib/commons-collections-3.2.1-sources.jar"/>
- <classpathentry kind="output" path="classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry kind="src" path="src/test/resources"/>
+ <classpathentry exported="true" kind="lib" path="lib/ctulu.jar" sourcepath="lib/ctulu-src.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dodico.jar" sourcepath="lib/dodico-src.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/trove.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.jar" sourcepath="lib/xstream-1.3.1-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-jxpath-1.3.jar" sourcepath="lib/commons-jxpath-1.3-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.5.6.jar" sourcepath="lib/jcl-over-slf4j-1.5.6-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/logback-classic-0.9.15.jar" sourcepath="lib/logback-classic-0.9.15-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/logback-core-0.9.15.jar" sourcepath="lib/logback-core-0.9.15-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.6.jar" sourcepath="lib/slf4j-api-1.5.6-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/joda-time-1.6.jar" sourcepath="lib/joda-time-1.6-sources.jar"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar" sourcepath="lib/commons-lang-2.4-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-core-1.8.0.jar" sourcepath="lib/commons-beanutils-1.8.0-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar" sourcepath="lib/commons-collections-3.2.1-sources.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: trunk/soft/fudaa-crue/dodico/lib/xstream-1.3.1-sources.jar
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/dodico/lib/xstream-1.3.1-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
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 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataImpl.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -123,7 +123,7 @@
this.crue9ContientDistmax = crue9ContientDistmax;
}
- final CrueProperties propertyDefContainer;
+ final CrueProperties crueProperties;
/**
* Données STO
@@ -134,19 +134,19 @@
this(new EMHNoeudFactory(), propertyDefContainer);
}
- public CrueDataImpl(final EMHNoeudFactory nodeFactory, final CrueProperties propertyDefContainer) {
- scenarioData = new EMHScenario(propertyDefContainer);
+ public CrueDataImpl(final EMHNoeudFactory nodeFactory, final CrueProperties cruePropperties) {
+ scenarioData = new EMHScenario(cruePropperties);
scenarioData.getLoiConteneur();
- this.propertyDefContainer = propertyDefContainer;
- ssModele = new EMHSousModele();
- modele = new EMHModeleBase();
+ this.crueProperties = cruePropperties;
+ ssModele = new EMHSousModele(cruePropperties);
+ modele = new EMHModeleBase(cruePropperties);
this.nodeFactory = nodeFactory;
}
public CrueDataImpl(final EMHScenario scenarioData, final EMHModeleBase modele, final EMHSousModele ssModele,
final CrueProperties propertyDefContainer) {
super();
- this.propertyDefContainer = propertyDefContainer;
+ this.crueProperties = propertyDefContainer;
this.scenarioData = scenarioData;
if (scenarioData != null) {
scenarioData.getLoiConteneur();
@@ -163,7 +163,7 @@
}
public CrueProperties getCruePropertyDefinitionContainer() {
- return propertyDefContainer;
+ return crueProperties;
}
public EMHNoeudNiveauContinu createNode(final String id) {
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/dao/CrueXmlReaderWriterImpl.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -23,11 +23,13 @@
import com.memoire.fu.FuLogCrue;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
import com.thoughtworks.xstream.io.xml.XmlFriendlyReplacer;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
@@ -125,7 +127,7 @@
}
protected XStream initXmlParser(final CtuluAnalyze analyse, CrueProperties props) {
- final XmlFriendlyReplacer replacer = new XmlFriendlyReplacer("#", "_");
+ final XmlFriendlyReplacer replacer = createReplacer();
final DomDriver domDriver = new DomDriver("UTF-8", replacer);
final XStream xstream = new XStream(domDriver);
xstream.setMode(XStream.NO_REFERENCES);
@@ -144,6 +146,10 @@
return xstream;
}
+ private XmlFriendlyReplacer createReplacer() {
+ return new XmlFriendlyReplacer("#", "_");
+ }
+
/**
* @return true si le fichier demandé s'auto-suffit. Si il a besoin d'autre fichiers (ref ou dépendances) retourne
* false.
@@ -362,12 +368,14 @@
boolean isOk = true;
try {
final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, "UTF-8"));
- writer.write(CrueHelper.ENTETE_XML + "\n");
+ writer.write(CrueHelper.ENTETE_XML + CtuluLibString.LINE_SEP);
if (dao.Commentaire == null) {
dao.Commentaire = StringUtils.EMPTY;
}
final XStream parser = initXmlParser(analyser, props);
- parser.toXML(dao, writer);
+ parser.marshal(dao, new PrettyPrintWriter(writer, new char[] { ' ', ' ' }, CtuluLibString.LINE_SEP,
+ createReplacer()));
+ // parser.toXML(dao, writer);
} catch (final IOException e) {
FuLogCrue.debug(e.getMessage());
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHBranche.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -1,5 +1,7 @@
package org.fudaa.dodico.crue.metier.emh;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
@@ -64,4 +66,20 @@
EMHHelper.addNoeudAval(this, noeudAval);
}
+ /**
+ * @param props pour avoir le eps de xp.
+ */
+ protected void sortRelationSectionDansBranche(CrueProperties props) {
+ List<RelationEMH> init = getRelationEMH();
+ if (init == null) { return; }
+ List<RelationEMH> newrelationEMH = new ArrayList<RelationEMH>(init.size());
+ List<RelationEMHSectionDansBranche> relationEMHSection = new ArrayList<RelationEMHSectionDansBranche>(init.size());
+ // cette methode permet de trier les relation de type section dans branches des autres.
+ EMHHelper.filterRelationsSections(this, relationEMHSection, newrelationEMH);
+ Collections.sort(relationEMHSection, new EMHHelper.ComparatorRelationEMHSectionDansBranche(props));
+ newrelationEMH.addAll(relationEMHSection);
+ setRelationEMH(newrelationEMH);
+
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHConteneurDeSousModele.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHConteneurDeSousModele.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHConteneurDeSousModele.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -3,6 +3,8 @@
*/
package org.fudaa.dodico.crue.metier.emh;
+import org.fudaa.dodico.crue.property.CrueProperties;
+
/**
* @author deniger
*/
@@ -12,6 +14,20 @@
CommentairesManager commentaires;
+ private final CrueProperties defContainer;
+
+ /**
+ * @param defContainer
+ */
+ public EMHConteneurDeSousModele(CrueProperties defContainer) {
+ super();
+ this.defContainer = defContainer;
+ }
+
+ public CrueProperties getPropertyDefinitionContainer() {
+ return defContainer;
+ }
+
public CommentairesManager getCommentairesManager() {
if (commentaires == null) {
commentaires = new CommentairesManager();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHModeleBase.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHModeleBase.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHModeleBase.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -7,6 +7,7 @@
import java.util.List;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+import org.fudaa.dodico.crue.property.CrueProperties;
/** @pdOid 3c043ca3-0277-42fd-8f18-0492e16904d9 */
public class EMHModeleBase extends EMHConteneurDeSousModele {
@@ -17,6 +18,13 @@
}
/**
+ * @param defContainer
+ */
+ public EMHModeleBase(CrueProperties defContainer) {
+ super(defContainer);
+ }
+
+ /**
* @return liste des modele
*/
public List<EMHSousModele> getSousModele() {
Modified: 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/EMHScenario.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHScenario.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -19,17 +19,10 @@
private ResPrtReseau rptg;
private FCBSequentialReader res;
- private final CrueProperties defContainer;
-
public EMHScenario(CrueProperties defContainer) {
- super();
- this.defContainer = defContainer;
+ super(defContainer);
}
- public CrueProperties getPropertyDefinitionContainer() {
- return defContainer;
- }
-
@Override
public void sort() {
super.sort();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSousModele.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSousModele.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/EMHSousModele.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -6,7 +6,9 @@
import java.util.List;
+import org.apache.commons.collections.CollectionUtils;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+import org.fudaa.dodico.crue.property.CrueProperties;
/** @pdOid 509ab2d5-6ed9-4ab5-82c4-62e4ed7a00e6 */
public class EMHSousModele extends CatEMHConteneur implements CommentaireContainer {
@@ -17,7 +19,16 @@
}
CommentairesManager commentaires;
+ private final CrueProperties crueProperties;
+ /**
+ * @param crueProperties
+ */
+ public EMHSousModele(CrueProperties crueProperties) {
+ super();
+ this.crueProperties = crueProperties;
+ }
+
public CommentairesManager getCommentairesManager() {
if (commentaires == null) {
commentaires = new CommentairesManager();
@@ -49,6 +60,12 @@
public void sort() {
super.sort();
super.sortRelationEMH();
+ List<CatEMHBranche> branches = getBranches();
+ if (CollectionUtils.isNotEmpty(branches)) {
+ for (CatEMHBranche catEMHBranche : branches) {
+ catEMHBranche.sortRelationSectionDansBranche(crueProperties);
+ }
+ }
}
@@ -62,4 +79,11 @@
}
+ /**
+ * @return the crueProperties
+ */
+ public CrueProperties getCrueProperties() {
+ return crueProperties;
+ }
+
}
\ No newline at end of file
Modified: 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/ElemSeuil.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuil.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -50,7 +50,7 @@
@Override
public String toString() {
- return "ElemSeuil [coefD=" + coefD + ", largeur=" + largeur + ", zseuil=" + zseuil + "]";
+ return getClass().getSimpleName();
}
/**
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -521,19 +521,32 @@
public static List<RelationEMHSectionDansBranche> collectRelationsSections(final EMH emh) {
final List<RelationEMHSectionDansBranche> liste = new ArrayList<RelationEMHSectionDansBranche>();
+ filterRelationsSections(emh, liste, null);
+ return liste;
+ }
+
+ public static void filterRelationsSections(final EMH emh, List<RelationEMHSectionDansBranche> outSection,
+ List<RelationEMH> outNotSection) {
for (final RelationEMH relation : emh.getRelationEMH()) {
if (relation != null) {
- final Class<? extends RelationEMH> classRelation = relation.getClass();
- if (classRelation.equals(RelationEMHSectionDansBranche.class)
- || classRelation.equals(RelationEMHSectionDansBrancheSaintVenant.class)) {
- liste.add((RelationEMHSectionDansBranche) relation);
+ boolean isSectionDansBranche = isRelationSectionDansBranche(relation);
+ if (outSection != null && isSectionDansBranche) {
+ outSection.add((RelationEMHSectionDansBranche) relation);
+ } else if (outNotSection != null && !isSectionDansBranche) {
+ outNotSection.add(relation);
+
}
}
}
- return liste;
}
+ private static boolean isRelationSectionDansBranche(final RelationEMH relationEMH) {
+ final Class<? extends RelationEMH> classRelation = relationEMH.getClass();
+ return classRelation.equals(RelationEMHSectionDansBranche.class)
+ || classRelation.equals(RelationEMHSectionDansBrancheSaintVenant.class);
+ }
+
public static List<RelationEMHSectionDansBranche> collectListeRelationsSectionsSortedByXp(final EMH emh,
CrueProperties props) {
final List<RelationEMHSectionDansBranche> liste = collectRelationsSections(emh);
@@ -555,7 +568,7 @@
*/
public ComparatorRelationEMHSectionDansBranche(CrueProperties props) {
super();
- this.eps = props.getEpsilon("Xp");
+ this.eps = props.getEpsilon("xp");
}
/**
@@ -714,7 +727,7 @@
public static EMHSousModele concatIn(final EMHSousModele dest, final List<EMHSousModele> ssModele) {
EMHSousModele res = dest;
if (res == null) {
- res = new EMHSousModele();
+ res = new EMHSousModele(ssModele.get(0).getCrueProperties());
}
for (final EMHSousModele sousModele : ssModele) {
// on ajoute toutes les relationEMH.
Modified: 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/ScenarioLoaderCrue10.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -116,7 +116,7 @@
}
// -- on charge en memoire le contenu des sous modeles --//
- final EMHModeleBase emhModele = new EMHModeleBase();
+ final EMHModeleBase emhModele = new EMHModeleBase(propDefinition);
emhModele.setNom(modele.getNom());
for (final ManagerEMHSousModele sousModele : fils) {
final CrueData tmp = new CrueDataImpl(factory, propDefinition);
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestConvertSelectOn.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestConvertSelectOn.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestConvertSelectOn.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -140,7 +140,7 @@
}
private static EMHSousModele createModele(final String n1, final String n2) {
- final EMHSousModele sm1 = new EMHSousModele();
+ final EMHSousModele sm1 = new EMHSousModele(null);
addBranche(n1, n2, sm1);
return sm1;
}
@@ -155,7 +155,7 @@
}
public static EMHSousModele createModeleWithRelation(final String n1, final String n2) {
- final EMHSousModele sm1 = new EMHSousModele();
+ final EMHSousModele sm1 = new EMHSousModele(null);
final List<EMH> emhs = new ArrayList<EMH>();
final EMHBrancheOrifice b1 = new EMHBrancheOrifice(n1);
Modified: 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/comparaison/TestRequete.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/TestRequete.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -61,7 +61,7 @@
public void testSelectActive() {
EMHNoeudFactory nodeFactory = new EMHNoeudFactory();
- final EMHSousModele modele = new EMHSousModele();
+ final EMHSousModele modele = new EMHSousModele(null);
final EMHNoeudNiveauContinu nd = nodeFactory.getNode("inactive");// new EMHNoeudNiveauContinu("inactive");
final EMHBrancheOrifice nd2 = new EMHBrancheOrifice("inactive");
nd2.setUserActive(false);
@@ -76,7 +76,7 @@
}
public void testValParam() {
- EMHModeleBase model = new EMHModeleBase();
+ EMHModeleBase model = new EMHModeleBase(null);
OrdPrtCIniModeleBase o = new OrdPrtCIniModeleBase();
model.addInfosEMH(o);
o.addValParam(new ValParamDouble("tiot", 1d));
@@ -108,7 +108,7 @@
private EMHSousModele createModele() {
EMHNoeudFactory nodeFactory = new EMHNoeudFactory();
- final EMHSousModele modele = new EMHSousModele();
+ final EMHSousModele modele = new EMHSousModele(null);
final EMHNoeudNiveauContinu nd = nodeFactory.getNode("inactive");// new EMHNoeudNiveauContinu("inactive");
final RelationEMHCasierDansNoeud createCasierDansNoeud = FactoryEMHRelation
.createCasierDansNoeud(new EMHCasierProfil("casier"));
@@ -179,7 +179,7 @@
EMHScenario createScenar() {
final EMHSousModele ss = createModele();
- final EMHModeleBase modele = new EMHModeleBase();
+ final EMHModeleBase modele = new EMHModeleBase(null);
modele.addRelationEMH(FactoryEMHRelation.createRelationContient(ss));
final EMHScenario res = new EMHScenario(null);
res.addRelationEMH(FactoryEMHRelation.createRelationContient(modele));
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/metier/helper/TestEMHHelper.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/metier/helper/TestEMHHelper.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/metier/helper/TestEMHHelper.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -1,14 +1,17 @@
/**
- * Licence GPL
- * Copyright Genesis
+ * Licence GPL Copyright Genesis
*/
package org.fudaa.dodico.crue.metier.helper;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import junit.framework.TestCase;
+import org.fudaa.dodico.crue.metier.emh.EnumPositionSection;
+import org.fudaa.dodico.crue.metier.emh.RelationEMHSectionDansBranche;
+
/**
* @author deniger
*/
@@ -33,4 +36,42 @@
assertEquals(2, EMHHelper.getDistDiviseurForDistMax(50d, 70d));
}
+ /**
+ * Test le comparateur {@link EMHHelper.ComparatorRelationEMHSectionDansBranche}.
+ */
+ public void testSectionComparator() {
+ final List<RelationEMHSectionDansBranche> relationSectionExpected = new ArrayList<RelationEMHSectionDansBranche>();
+ // l'ordre attendu
+ relationSectionExpected.add(createRelationBranche(0, EnumPositionSection.AMONT));
+ relationSectionExpected.add(createRelationBranche(0, EnumPositionSection.INTERNE));
+ relationSectionExpected.add(createRelationBranche(0, EnumPositionSection.AVAL));
+ relationSectionExpected.add(createRelationBranche(0.1, EnumPositionSection.INTERNE));
+ relationSectionExpected.add(createRelationBranche(0.2, EnumPositionSection.INTERNE));
+ relationSectionExpected.add(createRelationBranche(0.3, EnumPositionSection.AVAL));
+ // la liste qui sera retrié avec le comparateur:
+ final List<RelationEMHSectionDansBranche> relationSectionRetrie = new ArrayList<RelationEMHSectionDansBranche>(
+ relationSectionExpected);
+ Collections.shuffle(relationSectionRetrie);
+ // cas tordu ou le shuffle ne fonctionne pas correctement et renvoie la meme liste.
+ if (relationSectionExpected.equals(relationSectionRetrie)) {
+ RelationEMHSectionDansBranche zero = relationSectionRetrie.get(0);
+ relationSectionRetrie.set(0, relationSectionRetrie.get(1));
+ relationSectionRetrie.set(1, zero);
+ }
+ // avant le tri, les 2 collections ne sont pas égales
+ assertFalse(relationSectionRetrie.equals(relationSectionExpected));
+ Collections.sort(relationSectionRetrie, new EMHHelper.ComparatorRelationEMHSectionDansBranche(0.001));
+ // le tri remet le tout dans l'ordre attendu:
+ assertTrue(relationSectionRetrie.equals(relationSectionExpected));
+
+ }
+
+ private RelationEMHSectionDansBranche createRelationBranche(final double xp, final EnumPositionSection position) {
+ final RelationEMHSectionDansBranche res = new RelationEMHSectionDansBranche();
+ res.setXp(xp);
+ res.setPos(position);
+ return res;
+
+ }
+
}
Modified: 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/ExampleValidationVariableBuilder.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/validation/ExampleValidationVariableBuilder.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -25,7 +25,7 @@
num.setParamNumCalcPseudoPerm(paramNumCalcPseudoPerm);
num.setFrLinInf(-1);
num.setFrLinSup(2);
- final EMH modele = new EMHModeleBase();
+ final EMH modele = new EMHModeleBase(null);
modele.addInfosEMH(num);
final List<EMH> asList = Arrays.asList(modele);
return asList;
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHManagerBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHManagerBuilder.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHManagerBuilder.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -102,7 +102,8 @@
entryValue = ((PdtVar) entryValue).getElemPdt();
}
// toutes les listes acceptés
- final boolean isAcceptedList = ("elemSeuil".equals(name) || "regle".equals(name) || isPdtVar)
+ boolean isElemSeuil = "elemSeuilAvecPdc".equals(name);
+ final boolean isAcceptedList = (isElemSeuil || "elemSeuil".equals(name) || "regle".equals(name) || isPdtVar)
&& entryValue instanceof Collection;
final boolean isRes = isResPrt || isDisplayedLoi || isResPrtData || isResPrtDataLitPos || isResPasDeTemps
@@ -228,8 +229,12 @@
final Collection col = (Collection) entryValue;
int i = 1;
for (final Object object : col) {
- child.add(new TreeNodeCleValeur(object.getClass().getSimpleName() + "[" + (i++) + "]", objectToString(name,
- object)));
+ TreeNodeCleValeur cleValeur = new TreeNodeCleValeur(object.getClass().getSimpleName() + "[" + (i++) + "]",
+ objectToString(name, object));
+ child.add(cleValeur);
+ if (isElemSeuil) {
+ addDescribeNode(object, cleValeur, null, ref);
+ }
}
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2010-06-22 20:13:58 UTC (rev 5767)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2010-06-22 22:33:59 UTC (rev 5768)
@@ -76,8 +76,8 @@
infoCrue_.banner = new BuIcon(pathLogo);
// infoCrue_.logo = new BuIcon(pathLogo);
infoCrue_.name = "Fudaa-Crue";
- infoCrue_.version = "0.29";
- infoCrue_.date = "28-Mai-2010";
+ infoCrue_.version = "0.30";
+ infoCrue_.date = "23-Juin-2010";
infoCrue_.rights = "";
infoCrue_.contact = "fu...@ge...";
infoCrue_.license = "GPL2";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
