Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9661] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2017-07-13 11:27:52
|
Revision: 9661
http://sourceforge.net/p/fudaa/svn/9661
Author: deniger
Date: 2017-07-13 11:27:49 +0000 (Thu, 13 Jul 2017)
Log Message:
-----------
Classes AOC
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-aoc/pom.xml
trunk/soft/fudaa-crue/crue-aoc/src/test/java/org/fudaa/dodico/crue/io/aoc/TestCrueAOC.java
trunk/soft/fudaa-crue/crue-aoc/src/test/resources/aoc/campagne.aoc.xml
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/CrueFileType.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java
trunk/soft/fudaa-crue/ui-application/application.iml
trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs.zip
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-aoc/src/main/java/org/fudaa/dodico/crue/io/aoc/CrueFileFormatBuilderAOC.java
trunk/soft/fudaa-crue/crue-config/src/test/resources/xsd/aoc-1.2.xsd
Modified: trunk/soft/fudaa-crue/crue-aoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-aoc/pom.xml 2017-07-13 10:10:35 UTC (rev 9660)
+++ trunk/soft/fudaa-crue/crue-aoc/pom.xml 2017-07-13 11:27:49 UTC (rev 9661)
@@ -1,107 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>fudaa-crue</artifactId>
- <groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.4-SNAPSHOT</version>
- </parent>
- <artifactId>crue-aoc</artifactId>
- <name>Crue AOC</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <parallel>classes</parallel>
- <threadCount>5</threadCount>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-compare</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-core</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-io</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-config</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-test</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <!--pour eviter de lancer les tests d'integration-->
- <profiles>
- <profile>
- <id>release</id>
- <build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>fudaa-crue</artifactId>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <version>1.4-SNAPSHOT</version>
+ </parent>
+ <artifactId>crue-aoc</artifactId>
+ <name>Crue AOC</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <build>
<plugins>
- <plugin>
- <groupId>com.keyboardsamurais.maven</groupId>
- <artifactId>maven-timestamp-plugin</artifactId>
- <version>1.0</version>
- <configuration>
- <propertyName>timestamp</propertyName>
- <timestampPattern>dd.MM.yyyy HH:mm</timestampPattern>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <parallel>classes</parallel>
+ <threadCount>5</threadCount>
+ </configuration>
+ </plugin>
</plugins>
- </build>
- </profile>
- </profiles>
+
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-compare</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-core</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-io</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-config</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-test</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <!--pour eviter de lancer les tests d'integration-->
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.keyboardsamurais.maven</groupId>
+ <artifactId>maven-timestamp-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <propertyName>timestamp</propertyName>
+ <timestampPattern>dd.MM.yyyy HH:mm</timestampPattern>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Copied: trunk/soft/fudaa-crue/crue-aoc/src/main/java/org/fudaa/dodico/crue/io/aoc/CrueFileFormatBuilderAOC.java (from rev 9660, trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/CrueFileFormatBuilderLHPT.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-aoc/src/main/java/org/fudaa/dodico/crue/io/aoc/CrueFileFormatBuilderAOC.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-aoc/src/main/java/org/fudaa/dodico/crue/io/aoc/CrueFileFormatBuilderAOC.java 2017-07-13 11:27:49 UTC (rev 9661)
@@ -0,0 +1,22 @@
+/**
+ * License GPL v2
+ */
+package org.fudaa.dodico.crue.io.aoc;
+
+import org.fudaa.dodico.crue.config.coeur.CoeurConfigContrat;
+import org.fudaa.dodico.crue.io.Crue10FileFormat;
+import org.fudaa.dodico.crue.io.CrueFileFormatBuilder;
+import org.fudaa.dodico.crue.io.common.CrueDataXmlReaderWriterImpl;
+import org.fudaa.dodico.crue.metier.CrueFileType;
+import org.fudaa.dodico.crue.projet.aoc.AocCampagne;
+
+public class CrueFileFormatBuilderAOC implements CrueFileFormatBuilder<AocCampagne> {
+
+ @Override
+ public Crue10FileFormat<AocCampagne> getFileFormat(CoeurConfigContrat coeurConfig) {
+ return new Crue10FileFormat<>(new CrueDataXmlReaderWriterImpl<>(CrueFileType.AOC,
+ coeurConfig, new CrueConverterAOC(), new CrueDaoStructureAOC()));
+
+ }
+
+}
Modified: trunk/soft/fudaa-crue/crue-aoc/src/test/java/org/fudaa/dodico/crue/io/aoc/TestCrueAOC.java
===================================================================
--- trunk/soft/fudaa-crue/crue-aoc/src/test/java/org/fudaa/dodico/crue/io/aoc/TestCrueAOC.java 2017-07-13 10:10:35 UTC (rev 9660)
+++ trunk/soft/fudaa-crue/crue-aoc/src/test/java/org/fudaa/dodico/crue/io/aoc/TestCrueAOC.java 2017-07-13 11:27:49 UTC (rev 9661)
@@ -8,6 +8,7 @@
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.common.io.CrueIOResu;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierLoaderDefaultTest;
+import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig;
import org.fudaa.dodico.crue.io.AbstractIOTestCase;
import org.fudaa.dodico.crue.projet.aoc.*;
import org.joda.time.LocalDateTime;
@@ -26,7 +27,7 @@
File testFile;
public TestCrueAOC() {
- super(FICHIER_TEST_XML);
+ super(new CrueFileFormatBuilderAOC().getFileFormat(TestCoeurConfig.INSTANCE), FICHIER_TEST_XML);
}
private static AocCampagne read(File otfaFile) {
@@ -75,17 +76,17 @@
// Cc_T01
assertEquals("Cc_T01", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(0).getCalculRef());
assertEquals("LoiT 1", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(0).getLoiRef());
- assertEquals("Section 1", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(0).getSectionRef());
+ assertEquals("St_Section 1", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(0).getSectionRef());
assertEquals(1, campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(0).getPonderation());
// Cc_T02
assertEquals("Cc_T02", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(1).getCalculRef());
assertEquals("LoiT 2", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(1).getLoiRef());
- assertEquals("Section 2", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(1).getSectionRef());
+ assertEquals("St_Section 2", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(1).getSectionRef());
assertEquals(2, campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(1).getPonderation());
// Cc_T03
assertEquals("Cc_T03", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(2).getCalculRef());
assertEquals("LoiT 3", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(2).getLoiRef());
- assertEquals("Section 3", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(2).getSectionRef());
+ assertEquals("St_Section 3", campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(2).getSectionRef());
assertEquals(3, campagne.getDonnees().getLoisCalculsTransitoires().getLois().get(2).getPonderation());
//Strickler
@@ -126,7 +127,7 @@
assertEquals(2, campagne.getDonnees().getValidationCroisee().getGroupes().size());
AocValidationGroupe validationGroupe = campagne.getDonnees().getValidationCroisee().getGroupes().get(0);
assertEquals(2, validationGroupe.getEffectifApprentissage());
- assertEquals("1", validationGroupe.getId());
+ assertEquals("GR_1", validationGroupe.getId());
assertEquals("Groupe 1", validationGroupe.getNom());
assertEquals("Un commentaire", validationGroupe.getCommentaire());
@@ -136,7 +137,7 @@
validationGroupe = campagne.getDonnees().getValidationCroisee().getGroupes().get(1);
assertEquals(3, validationGroupe.getEffectifApprentissage());
- assertEquals("2", validationGroupe.getId());
+ assertEquals("GR_2", validationGroupe.getId());
assertEquals("Groupe 2", validationGroupe.getNom());
assertEquals("", validationGroupe.getCommentaire());
@@ -196,8 +197,4 @@
return testFile;
}
- @Override
- public void testValide() {
- //TODO Tester validité XSD.
- }
}
Modified: trunk/soft/fudaa-crue/crue-aoc/src/test/resources/aoc/campagne.aoc.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-aoc/src/test/resources/aoc/campagne.aoc.xml 2017-07-13 10:10:35 UTC (rev 9660)
+++ trunk/soft/fudaa-crue/crue-aoc/src/test/resources/aoc/campagne.aoc.xml 2017-07-13 11:27:49 UTC (rev 9661)
@@ -49,9 +49,9 @@
<!-- LoiRef = référence vers un nom de loi dans le fichier LHPT associé à l'étude de la campagne -->
<!-- SectionRef = référence vers un nom de section dans le fichier DRSO associé à l'étude de la campagne -->
<!-- CalculRef = référence vers un nom de Calcul transitoire dans le fichier OCAL associé à l'étude de la campagne -->
- <LoiCalculTransitoire CalculRef="Cc_T01" LoiRef="LoiT 1" SectionRef="Section 1" Ponderation="1"/>
- <LoiCalculTransitoire CalculRef="Cc_T02" LoiRef="LoiT 2" SectionRef="Section 2" Ponderation="2"/>
- <LoiCalculTransitoire CalculRef="Cc_T03" LoiRef="LoiT 3" SectionRef="Section 3" Ponderation="3"/>
+ <LoiCalculTransitoire CalculRef="Cc_T01" LoiRef="LoiT 1" SectionRef="St_Section 1" Ponderation="1"/>
+ <LoiCalculTransitoire CalculRef="Cc_T02" LoiRef="LoiT 2" SectionRef="St_Section 2" Ponderation="2"/>
+ <LoiCalculTransitoire CalculRef="Cc_T03" LoiRef="LoiT 3" SectionRef="St_Section 3" Ponderation="3"/>
</LoisCalculsTransitoires>
<LoisStrickler>
@@ -70,7 +70,7 @@
</ListeCalculs>
<ValidationCroisee>
- <Groupe Id="1" Nom="Groupe 1">
+ <Groupe Id="GR_1" Nom="Groupe 1">
<Lois>
<!-- LoiRef = référence vers un nom de loi dans le fichier LHPT associé à l'étude de la campagne -->
<Loi LoiRef="Loi 3"/>
@@ -79,7 +79,7 @@
<EffectifApprentissage>2</EffectifApprentissage>
<Commentaire>Un commentaire</Commentaire>
</Groupe>
- <Groupe Id="2" Nom="Groupe 2">
+ <Groupe Id="GR_2" Nom="Groupe 2">
<Lois>
<!-- LoiRef = référence vers un nom de loi dans le fichier LHPT associé à l'étude de la campagne -->
<Loi LoiRef="Loi 1"/>
Copied: trunk/soft/fudaa-crue/crue-config/src/test/resources/xsd/aoc-1.2.xsd (from rev 9659, trunk/soft/fudaa-crue/crue-config/src/test/resources/xsd/lhpt-1.2.xsd)
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/resources/xsd/aoc-1.2.xsd (rev 0)
+++ trunk/soft/fudaa-crue/crue-config/src/test/resources/xsd/aoc-1.2.xsd 2017-07-13 11:27:49 UTC (rev 9661)
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ attributeFormDefault="unqualified" elementFormDefault="qualified"
+ targetNamespace="http://www.fudaa.fr/xsd/crue" xmlns="http://www.fudaa.fr/xsd/crue">
+
+ <xs:include schemaLocation="nomRef-fichierUnique-1.2.xsd"/>
+ <xs:include schemaLocation="frag-common-1.2.xsd"/>
+
+ <xs:element name="Chemin" type="xs:string"/>
+ <xs:element name="NomScenario" type="xs:string"/>
+
+ <xs:element name="Donnees">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Permanent"/>
+ <xs:enumeration value="TransitoireLimnigramme"/>
+ <xs:enumeration value="TransitoireHydrogramme"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="Critere">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="ErreurQuadratique"/>
+ <xs:enumeration value="EcartNiveauxMax"/>
+ <xs:enumeration value="EcartTempsArriveeMax"/>
+ <xs:enumeration value="EcartVolumes"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="NombreIteration" type="xs:positiveInteger"/>
+ <xs:element name="NombreIterationTir" type="xs:positiveInteger"/>
+ <xs:element name="NombreTir" type="xs:positiveInteger"/>
+ <xs:element name="PonderationApprentissage" type="xs:double"/>
+ <xs:element name="PonderationValidation" type="xs:double"/>
+
+ <xs:simpleType name="positiveIntegerOrNull" id="positiveInteger">
+ <xs:restriction base="xs:nonNegativeInteger">
+ <xs:minInclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+
+ <xs:element name="Type">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Seul"/>
+ <xs:enumeration value="TestRepetabilite"/>
+ <xs:enumeration value="AnalyseSensibilite"/>
+ <xs:enumeration value="ValidationCroisee"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="Algorithme">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Recuit"/>
+ <xs:enumeration value="MonteCarlo"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="Seul">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="NombreIteration"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="TestRepetabilite">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="NombreIterationTir"/>
+ <xs:element ref="NombreTir"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ValidationCroisee">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="NombreIteration" minOccurs="0"/>
+ <xs:element ref="PonderationApprentissage" minOccurs="0"/>
+ <xs:element ref="PonderationValidation" minOccurs="0"/>
+ <xs:element ref="Groupe" maxOccurs="unbounded" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="LoiCalculPermanent">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="TypeForAttributeNomRefCalc" name="CalculRef"/>
+ <xs:attribute type="xs:string" name="LoiRef"/>
+ <xs:attribute type="xs:positiveInteger" name="Ponderation"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="LoiCalculTransitoire">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="TypeForAttributeNomRefCalc" name="CalculRef"/>
+ <xs:attribute type="xs:token" name="LoiRef"/>
+ <xs:attribute type="TypeForAttributeNomRefSection" name="SectionRef"/>
+ <xs:attribute type="positiveIntegerOrNull" name="Ponderation"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="LoiStrickler">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:token" name="LoiRef"/>
+ <xs:attribute type="positiveIntegerOrNull" name="Min"/>
+ <xs:attribute type="positiveIntegerOrNull" name="Ini"/>
+ <xs:attribute type="positiveIntegerOrNull" name="Max"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ParamCalc">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="TypeForAttributeNomRefCalc" name="CalculRef"/>
+ <xs:attribute type="xs:token" name="EMHRef"/>
+ <xs:attribute type="xs:double" name="DeltaQ"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Loi">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:token" name="LoiRef"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Lois">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="Loi" maxOccurs="unbounded" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="EffectifApprentissage" type="positiveIntegerOrNull"/>
+ <xs:element name="Groupe">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="Lois"/>
+ <xs:element ref="EffectifApprentissage"/>
+ <xs:element ref="Commentaire"/>
+ </xs:sequence>
+ <xs:attribute type="TypeForAttributeNom" name="Id"/>
+ <xs:attribute type="xs:token" name="Nom"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="LoisCalculsPermanents">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="LoiCalculPermanent" maxOccurs="unbounded" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="LoisCalculsTransitoires">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="LoiCalculTransitoire" maxOccurs="unbounded" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="LoisStrickler">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="LoiStrickler" maxOccurs="unbounded" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ListeCalculs">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="ParamCalc" maxOccurs="unbounded" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AuteurCreation" type="xs:string"/>
+ <xs:element name="DateCreation" type="xs:dateTime"/>
+ <xs:element name="AuteurDerniereModif" type="xs:string"/>
+ <xs:element name="DateDerniereModif" type="xs:dateTime"/>
+ <xs:element name="EtudeAssociee">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="Chemin"/>
+ <xs:element ref="NomScenario"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="TypeCalage">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="Donnees"/>
+ <xs:element ref="Critere"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Calage">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="Type"/>
+ <xs:element ref="Algorithme"/>
+ <xs:element ref="Seul"/>
+ <xs:element ref="TestRepetabilite"/>
+ <xs:element ref="ValidationCroisee"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="DonneesCampagne">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="LoisCalculsPermanents"/>
+ <xs:element ref="LoisCalculsTransitoires"/>
+ <xs:element ref="LoisStrickler"/>
+ <xs:element ref="ListeCalculs"/>
+ <xs:element ref="ValidationCroisee"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AOC">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="Commentaire"/>
+ <xs:element ref="AuteurCreation"/>
+ <xs:element ref="DateCreation"/>
+ <xs:element ref="AuteurDerniereModif"/>
+ <xs:element ref="DateDerniereModif"/>
+ <xs:element ref="EtudeAssociee"/>
+ <xs:element ref="TypeCalage"/>
+ <xs:element ref="Calage"/>
+ <xs:element ref="DonneesCampagne"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
+
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/CrueFileType.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/CrueFileType.java 2017-07-13 10:10:35 UTC (rev 9660)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/CrueFileType.java 2017-07-13 11:27:49 UTC (rev 9661)
@@ -18,6 +18,7 @@
public enum CrueFileType implements FileType{
ETU(CrueLevelType.PROJET, null),
+ AOC(CrueLevelType.PROJET, CrueVersionType.CRUE10),
DCLM(CrueLevelType.SCENARIO, CrueVersionType.CRUE10),
DCSP(CrueLevelType.SOUS_MODELE, CrueVersionType.CRUE10),
DFRT(CrueLevelType.SOUS_MODELE, CrueVersionType.CRUE10),
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java 2017-07-13 10:10:35 UTC (rev 9660)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormat.java 2017-07-13 11:27:49 UTC (rev 9661)
@@ -32,7 +32,7 @@
/**
* @param readerWriter le reader/writer
*/
- protected Crue10FileFormat(final CrueXmlReaderWriter<M> readerWriter) {
+ public Crue10FileFormat(final CrueXmlReaderWriter<M> readerWriter) {
this(readerWriter.getFileType(), readerWriter);
}
Modified: trunk/soft/fudaa-crue/ui-application/application.iml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/application.iml 2017-07-13 10:10:35 UTC (rev 9660)
+++ trunk/soft/fudaa-crue/ui-application/application.iml 2017-07-13 11:27:49 UTC (rev 9661)
@@ -9,7 +9,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="ui-aoc" />
<orderEntry type="library" name="Maven: org.netbeans.external:asm-all-5.0.1:RELEASE82" level="project" />
<orderEntry type="library" name="Maven: org.netbeans.modules:org-netbeans-bootstrap:RELEASE82" level="project" />
<orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-libs-asm:RELEASE82" level="project" />
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
