From a2afe5428c138a207563bde2057a1632516bf3d2 Mon Sep 17 00:00:00 2001
From: Guillotin Damien <dguillot@azote.enseeiht.fr>
Date: Fri, 19 Nov 2021 20:09:58 +0100
Subject: [PATCH 1/2] ecore jusqu'au E13

---
 workspace/jeuexp/jeuexp.aird  | 220 ++++++++++++++++++++++------------
 workspace/jeuexp/jeuexp.ecore |  69 +++++++++--
 2 files changed, 202 insertions(+), 87 deletions(-)

diff --git a/workspace/jeuexp/jeuexp.aird b/workspace/jeuexp/jeuexp.aird
index 7ec335f..762f14b 100644
--- a/workspace/jeuexp/jeuexp.aird
+++ b/workspace/jeuexp/jeuexp.aird
@@ -12,7 +12,7 @@
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="jeuexp.ecore#/"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_UwYDAUk1EeythJY7L4WWUQ" name="jeuexp class diagram" repPath="#_UwWN0Ek1EeythJY7L4WWUQ" changeId="78e44fd9-3bf3-4477-bfab-20ed85d6d8e8">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_UwYDAUk1EeythJY7L4WWUQ" name="jeuexp class diagram" repPath="#_UwWN0Ek1EeythJY7L4WWUQ" changeId="d3634a0a-966c-4df6-b7f0-9ba5a120d814">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="jeuexp.ecore#/"/>
       </ownedRepresentationDescriptors>
@@ -300,9 +300,9 @@
         <children xmi:type="notation:Node" xmi:id="_VHMnkEk1EeythJY7L4WWUQ" type="2003" element="_VHF54Ek1EeythJY7L4WWUQ">
           <children xmi:type="notation:Node" xmi:id="_VHMnk0k1EeythJY7L4WWUQ" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_VHMnlEk1EeythJY7L4WWUQ" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_oWKW0Ek1EeythJY7L4WWUQ" type="3010" element="_oWFeVkk1EeythJY7L4WWUQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oWKW0Uk1EeythJY7L4WWUQ" fontName="Ubuntu" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oWKW0kk1EeythJY7L4WWUQ"/>
+            <children xmi:type="notation:Node" xmi:id="_53WxUElkEeyFpNsdGEs5Ug" type="3010" element="_53CoQElkEeyFpNsdGEs5Ug">
+              <styles xmi:type="notation:FontStyle" xmi:id="_53WxUUlkEeyFpNsdGEs5Ug" fontName="Ubuntu" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_53WxUklkEeyFpNsdGEs5Ug"/>
             </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_VHMnlUk1EeythJY7L4WWUQ"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_VHMnlkk1EeythJY7L4WWUQ"/>
@@ -313,6 +313,18 @@
         <children xmi:type="notation:Node" xmi:id="_VHMnl0k1EeythJY7L4WWUQ" type="2003" element="_VHGg8kk1EeythJY7L4WWUQ">
           <children xmi:type="notation:Node" xmi:id="_VHNOoEk1EeythJY7L4WWUQ" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_VHNOoUk1EeythJY7L4WWUQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_53XYYElkEeyFpNsdGEs5Ug" type="3010" element="_53EdcElkEeyFpNsdGEs5Ug">
+              <styles xmi:type="notation:FontStyle" xmi:id="_53XYYUlkEeyFpNsdGEs5Ug" fontColor="8224125" fontName="Ubuntu" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_53XYYklkEeyFpNsdGEs5Ug"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_TekxMElnEeyFpNsdGEs5Ug" type="3010" element="_TeOy8UlnEeyFpNsdGEs5Ug">
+              <styles xmi:type="notation:FontStyle" xmi:id="_TekxMUlnEeyFpNsdGEs5Ug" fontName="Ubuntu" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_TekxMklnEeyFpNsdGEs5Ug"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_TelYQElnEeyFpNsdGEs5Ug" type="3010" element="_TeR2QElnEeyFpNsdGEs5Ug">
+              <styles xmi:type="notation:FontStyle" xmi:id="_TelYQUlnEeyFpNsdGEs5Ug" fontName="Ubuntu" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_TelYQklnEeyFpNsdGEs5Ug"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_VHNOokk1EeythJY7L4WWUQ"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_VHNOo0k1EeythJY7L4WWUQ"/>
           </children>
@@ -322,6 +334,22 @@
         <children xmi:type="notation:Node" xmi:id="_VHNOpEk1EeythJY7L4WWUQ" type="2003" element="_VHHIAkk1EeythJY7L4WWUQ">
           <children xmi:type="notation:Node" xmi:id="_VHNOp0k1EeythJY7L4WWUQ" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_VHNOqEk1EeythJY7L4WWUQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_TelYQ0lnEeyFpNsdGEs5Ug" type="3010" element="_TeTEYElnEeyFpNsdGEs5Ug">
+              <styles xmi:type="notation:FontStyle" xmi:id="_TelYRElnEeyFpNsdGEs5Ug" fontName="Ubuntu" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_TelYRUlnEeyFpNsdGEs5Ug"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_Tel_UElnEeyFpNsdGEs5Ug" type="3010" element="_TeWHsElnEeyFpNsdGEs5Ug">
+              <styles xmi:type="notation:FontStyle" xmi:id="_Tel_UUlnEeyFpNsdGEs5Ug" fontName="Ubuntu" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Tel_UklnEeyFpNsdGEs5Ug"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_Tel_U0lnEeyFpNsdGEs5Ug" type="3010" element="_TeXV0ElnEeyFpNsdGEs5Ug">
+              <styles xmi:type="notation:FontStyle" xmi:id="_Tel_VElnEeyFpNsdGEs5Ug" fontName="Ubuntu" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Tel_VUlnEeyFpNsdGEs5Ug"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_Tel_VklnEeyFpNsdGEs5Ug" type="3010" element="_TeXV0klnEeyFpNsdGEs5Ug">
+              <styles xmi:type="notation:FontStyle" xmi:id="_Tel_V0lnEeyFpNsdGEs5Ug" fontName="Ubuntu" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Tel_WElnEeyFpNsdGEs5Ug"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_VHNOqUk1EeythJY7L4WWUQ"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_VHNOqkk1EeythJY7L4WWUQ"/>
           </children>
@@ -386,53 +414,26 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VHQR_Ek1EeythJY7L4WWUQ" id="(0.5084745762711864,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VHQR_Uk1EeythJY7L4WWUQ" id="(0.5084745762711864,1.0)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_VHQR_kk1EeythJY7L4WWUQ" type="4001" element="_VHLZd0k1EeythJY7L4WWUQ" source="_VHMnl0k1EeythJY7L4WWUQ" target="_VHNOpEk1EeythJY7L4WWUQ">
-          <children xmi:type="notation:Node" xmi:id="_VHQSAkk1EeythJY7L4WWUQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VHQSA0k1EeythJY7L4WWUQ" y="-10"/>
+        <edges xmi:type="notation:Edge" xmi:id="_TenNcElnEeyFpNsdGEs5Ug" type="4001" element="_TeZLAElnEeyFpNsdGEs5Ug" source="_VHMnl0k1EeythJY7L4WWUQ" target="_VHNOpEk1EeythJY7L4WWUQ">
+          <children xmi:type="notation:Node" xmi:id="_Tere4ElnEeyFpNsdGEs5Ug" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tere4UlnEeyFpNsdGEs5Ug" y="-10"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_VHVxgEk1EeythJY7L4WWUQ" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VHVxgUk1EeythJY7L4WWUQ" y="10"/>
+          <children xmi:type="notation:Node" xmi:id="_TesF8ElnEeyFpNsdGEs5Ug" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TesF8UlnEeyFpNsdGEs5Ug" y="10"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_VHVxgkk1EeythJY7L4WWUQ" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VHVxg0k1EeythJY7L4WWUQ" y="10"/>
+          <children xmi:type="notation:Node" xmi:id="_TetUEElnEeyFpNsdGEs5Ug" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TetUEUlnEeyFpNsdGEs5Ug" y="10"/>
           </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_VHQR_0k1EeythJY7L4WWUQ" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_VHQSAEk1EeythJY7L4WWUQ" fontName="Ubuntu" fontHeight="8" bold="true"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VHQSAUk1EeythJY7L4WWUQ" points="[-1, 0, 179, 60]$[-181, -60, -1, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VHWYkEk1EeythJY7L4WWUQ" id="(0.5084745762711864,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VHWYkUk1EeythJY7L4WWUQ" id="(0.5084745762711864,1.0)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_VHWYkkk1EeythJY7L4WWUQ" type="4001" element="_VHMAg0k1EeythJY7L4WWUQ" source="_VHMnkEk1EeythJY7L4WWUQ" target="_VHMnl0k1EeythJY7L4WWUQ">
-          <children xmi:type="notation:Node" xmi:id="_VHWYlkk1EeythJY7L4WWUQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VHWYl0k1EeythJY7L4WWUQ" x="46" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_VHWYmEk1EeythJY7L4WWUQ" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VHWYmUk1EeythJY7L4WWUQ" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_VHW_oEk1EeythJY7L4WWUQ" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VHW_oUk1EeythJY7L4WWUQ" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_VHWYk0k1EeythJY7L4WWUQ" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_VHWYlEk1EeythJY7L4WWUQ" fontName="Ubuntu" fontHeight="8" bold="true"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VHWYlUk1EeythJY7L4WWUQ" points="[58, 35, -197, -43]$[195, 35, -60, -43]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VHW_okk1EeythJY7L4WWUQ" id="(0.5084745762711864,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VHW_o0k1EeythJY7L4WWUQ" id="(0.5084745762711864,1.0)"/>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_TenNcUlnEeyFpNsdGEs5Ug" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_TenNcklnEeyFpNsdGEs5Ug" fontColor="7490599" fontName="Ubuntu" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TenNc0lnEeyFpNsdGEs5Ug" points="[0, 0, 180, 160]$[-180, -160, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TeyMkElnEeyFpNsdGEs5Ug" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TeyMkUlnEeyFpNsdGEs5Ug" id="(0.5,0.5)"/>
         </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_UwbGUEk1EeythJY7L4WWUQ" source="DANNOTATION_CUSTOMIZATION_KEY">
       <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_UwbGUUk1EeythJY7L4WWUQ">
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_cJ9fvEk1EeythJY7L4WWUQ" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_cJ9fvUk1EeythJY7L4WWUQ" showIcon="false" labelExpression="service:renderEOpposite">
-            <labelFormat>bold</labelFormat>
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </beginLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_cJ9fvkk1EeythJY7L4WWUQ" showIcon="false" labelExpression="service:render">
-            <labelFormat>bold</labelFormat>
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
         <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_oWGFYEk1EeythJY7L4WWUQ" labelExpression="service:renderAsNode" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
           <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelFormat>bold</labelFormat>
@@ -448,9 +449,37 @@
             <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </endLabelStyleDescription>
         </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_53FEgElkEeyFpNsdGEs5Ug" labelExpression="service:renderAsNode" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:UserFixedColor" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Inherited']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:FlatContainerStyleDescription" xmi:id="_TeHeMElnEeyFpNsdGEs5Ug" arcWidth="8" arcHeight="8" borderSizeComputationExpression="1" tooltipExpression="service:renderTooltip" roundedCorner="true" widthComputationExpression="12" heightComputationExpression="10" backgroundStyle="Liquid">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
+          <backgroundColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+          <foregroundColor xmi:type="description:UserFixedColor" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='EClass']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_TeVgoElnEeyFpNsdGEs5Ug" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_TebnQElnEeyFpNsdGEs5Ug" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_TebnQUlnEeyFpNsdGEs5Ug" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_TebnQklnEeyFpNsdGEs5Ug" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_VHF54Ek1EeythJY7L4WWUQ" name="Jeu" tooltipText="" outgoingEdges="_VHMAg0k1EeythJY7L4WWUQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_VHF54Ek1EeythJY7L4WWUQ" name="Jeu" tooltipText="" width="12" height="10">
       <target xmi:type="ecore:EClass" href="jeuexp.ecore#//Jeu"/>
       <semanticElements xmi:type="ecore:EClass" href="jeuexp.ecore#//Jeu"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -460,27 +489,49 @@
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_oWFeVkk1EeythJY7L4WWUQ" name=" explorateur : Explorateur" tooltipText="">
-        <target xmi:type="ecore:EReference" href="jeuexp.ecore#//Jeu/explorateur"/>
-        <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Jeu/explorateur"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_oWGFYUk1EeythJY7L4WWUQ" labelAlignment="LEFT" description="_oWGFYEk1EeythJY7L4WWUQ" color="114,159,207">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_53CoQElkEeyFpNsdGEs5Ug" name=" elementsjeu : ElementJeu" tooltipText="">
+        <target xmi:type="ecore:EReference" href="jeuexp.ecore#//Jeu/elementsjeu"/>
+        <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Jeu/elementsjeu"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_53DPUElkEeyFpNsdGEs5Ug" labelAlignment="LEFT" description="_oWGFYEk1EeythJY7L4WWUQ" color="114,159,207">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_VHGg8kk1EeythJY7L4WWUQ" name="Territoire" tooltipText="" outgoingEdges="_VHLZcEk1EeythJY7L4WWUQ _VHLZd0k1EeythJY7L4WWUQ" incomingEdges="_VHMAg0k1EeythJY7L4WWUQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_VHGg8kk1EeythJY7L4WWUQ" name="Territoire" tooltipText="&#xA;ERROR : The opposite must be a feature of the reference's type" outgoingEdges="_VHLZcEk1EeythJY7L4WWUQ _TeZLAElnEeyFpNsdGEs5Ug" width="12" height="10">
       <target xmi:type="ecore:EClass" href="jeuexp.ecore#//Territoire"/>
       <semanticElements xmi:type="ecore:EClass" href="jeuexp.ecore#//Territoire"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_VHHIAEk1EeythJY7L4WWUQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_TeHeMklnEeyFpNsdGEs5Ug" labelColor="239,41,41" description="_TeHeMElnEeyFpNsdGEs5Ug" borderSize="1" borderSizeComputationExpression="1" borderColor="239,41,41" backgroundStyle="Liquid" foregroundColor="255,252,216"/>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_53EdcElkEeyFpNsdGEs5Ug" name=" jeu : Jeu" tooltipText="">
+        <target xmi:type="ecore:EReference" href="jeuexp.ecore#//ElementJeu/jeu"/>
+        <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//ElementJeu/jeu"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_53FEgUlkEeyFpNsdGEs5Ug" labelColor="125,125,125" labelAlignment="LEFT" description="_53FEgElkEeyFpNsdGEs5Ug">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_TeOy8UlnEeyFpNsdGEs5Ug" name=" depart : Depart" tooltipText="">
+        <target xmi:type="ecore:EReference" href="jeuexp.ecore#//Territoire/depart"/>
+        <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Territoire/depart"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_TeQBEElnEeyFpNsdGEs5Ug" labelAlignment="LEFT" description="_oWGFYEk1EeythJY7L4WWUQ" color="114,159,207">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_TeR2QElnEeyFpNsdGEs5Ug" name=" fin : Fin" tooltipText="">
+        <target xmi:type="ecore:EReference" href="jeuexp.ecore#//Territoire/fin"/>
+        <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Territoire/fin"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_TeSdUElnEeyFpNsdGEs5Ug" labelAlignment="LEFT" description="_oWGFYEk1EeythJY7L4WWUQ" color="114,159,207">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_VHHIAkk1EeythJY7L4WWUQ" name="Lieu" tooltipText="" outgoingEdges="_VHKLUEk1EeythJY7L4WWUQ _VHKyZkk1EeythJY7L4WWUQ" incomingEdges="_VHLZd0k1EeythJY7L4WWUQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_VHHIAkk1EeythJY7L4WWUQ" name="Lieu" tooltipText="" outgoingEdges="_VHKLUEk1EeythJY7L4WWUQ _VHKyZkk1EeythJY7L4WWUQ" incomingEdges="_TeZLAElnEeyFpNsdGEs5Ug" width="12" height="10">
       <target xmi:type="ecore:EClass" href="jeuexp.ecore#//Lieu"/>
       <semanticElements xmi:type="ecore:EClass" href="jeuexp.ecore#//Lieu"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -490,6 +541,38 @@
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_TeTEYElnEeyFpNsdGEs5Ug" name="explore : EBoolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="jeuexp.ecore#//Lieu/explore"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="jeuexp.ecore#//Lieu/explore"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_TeVgoUlnEeyFpNsdGEs5Ug" labelAlignment="LEFT" description="_TeVgoElnEeyFpNsdGEs5Ug">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_TeWHsElnEeyFpNsdGEs5Ug" name=" connaissances : Connaissance" tooltipText="">
+        <target xmi:type="ecore:EReference" href="jeuexp.ecore#//Lieu/connaissances"/>
+        <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Lieu/connaissances"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_TeWHsUlnEeyFpNsdGEs5Ug" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_TeXV0ElnEeyFpNsdGEs5Ug" name=" objets : Objet" tooltipText="">
+        <target xmi:type="ecore:EReference" href="jeuexp.ecore#//Lieu/objets"/>
+        <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Lieu/objets"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_TeXV0UlnEeyFpNsdGEs5Ug" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_TeXV0klnEeyFpNsdGEs5Ug" name=" personnes : Personne" tooltipText="">
+        <target xmi:type="ecore:EReference" href="jeuexp.ecore#//Lieu/personnes"/>
+        <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Lieu/personnes"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_TeYj8ElnEeyFpNsdGEs5Ug" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_VHHvEEk1EeythJY7L4WWUQ" name="Chemin" tooltipText="" incomingEdges="_VHKLUEk1EeythJY7L4WWUQ _VHKyZkk1EeythJY7L4WWUQ _VHLZcEk1EeythJY7L4WWUQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="jeuexp.ecore#//Chemin"/>
@@ -534,33 +617,18 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_VHLZd0k1EeythJY7L4WWUQ" sourceNode="_VHGg8kk1EeythJY7L4WWUQ" targetNode="_VHHIAkk1EeythJY7L4WWUQ" beginLabel="[1..1] territoire" endLabel="[1..*] lieux">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_TeZLAElnEeyFpNsdGEs5Ug" name="[1..*] lieux" sourceNode="_VHGg8kk1EeythJY7L4WWUQ" targetNode="_VHHIAkk1EeythJY7L4WWUQ">
       <target xmi:type="ecore:EReference" href="jeuexp.ecore#//Territoire/lieux"/>
       <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Territoire/lieux"/>
-      <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Lieu/territoire"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yXHeZkk1EeythJY7L4WWUQ" description="_cJ9fvEk1EeythJY7L4WWUQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_yXHeZ0k1EeythJY7L4WWUQ" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </beginLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_yXHeaEk1EeythJY7L4WWUQ" showIcon="false">
-          <labelFormat>bold</labelFormat>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_TebnQ0lnEeyFpNsdGEs5Ug" description="_TebnQElnEeyFpNsdGEs5Ug" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_TebnRUlnEeyFpNsdGEs5Ug" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_TebnRElnEeyFpNsdGEs5Ug" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_VHMAg0k1EeythJY7L4WWUQ" sourceNode="_VHF54Ek1EeythJY7L4WWUQ" targetNode="_VHGg8kk1EeythJY7L4WWUQ" beginLabel="[1..1] jeu" endLabel="[1..1] territoire">
-      <target xmi:type="ecore:EReference" href="jeuexp.ecore#//Jeu/territoire"/>
-      <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Territoire/jeu"/>
-      <semanticElements xmi:type="ecore:EReference" href="jeuexp.ecore#//Jeu/territoire"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_cJ9fv0k1EeythJY7L4WWUQ" description="_cJ9fvEk1EeythJY7L4WWUQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_cJ9fwEk1EeythJY7L4WWUQ" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </beginLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_cJ9fwUk1EeythJY7L4WWUQ" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_UwW04Ek1EeythJY7L4WWUQ"/>
diff --git a/workspace/jeuexp/jeuexp.ecore b/workspace/jeuexp/jeuexp.ecore
index 705a030..a2e0d2a 100644
--- a/workspace/jeuexp/jeuexp.ecore
+++ b/workspace/jeuexp/jeuexp.ecore
@@ -2,31 +2,49 @@
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="jeuexp" nsURI="http://jeuexp" nsPrefix="jeuexp">
   <eClassifiers xsi:type="ecore:EClass" name="Jeu">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="territoire" lowerBound="1"
-        eType="#//Territoire" containment="true" eOpposite="#//Territoire/jeu"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="explorateur" lowerBound="1"
-        eType="#//Explorateur" containment="true" eOpposite="#//Explorateur/jeu"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="elementsjeu" lowerBound="2"
+        upperBound="-1" eType="#//ElementJeu" eOpposite="#//ElementJeu/jeu"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Explorateur">
+  <eClassifiers xsi:type="ecore:EClass" name="ElementJeu">
     <eStructuralFeatures xsi:type="ecore:EReference" name="jeu" lowerBound="1" eType="#//Jeu"
-        eOpposite="#//Jeu/explorateur"/>
+        eOpposite="#//Jeu/elementsjeu"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Territoire">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="jeu" lowerBound="1" eType="#//Jeu"
-        eOpposite="#//Jeu/territoire"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Explorateur" eSuperTypes="#//ElementJeu">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="connaissances" upperBound="-1"
+        eType="#//Connaissance" eOpposite="#//Connaissance/explorateur"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="objets" upperBound="-1"
+        eType="#//Objet" eOpposite="#//Objet/explorateur"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tailleTotaleMax" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Territoire" eSuperTypes="#//ElementJeu">
     <eStructuralFeatures xsi:type="ecore:EReference" name="lieux" lowerBound="1" upperBound="-1"
-        eType="#//Lieu" containment="true" eOpposite="#//Lieu/territoire"/>
+        eType="#//Lieu" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="chemins" upperBound="-1"
         eType="#//Chemin" containment="true" eOpposite="#//Chemin/territoire"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="depart" lowerBound="1"
+        eType="#//Depart"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="fin" lowerBound="1" eType="#//Fin"
+        eOpposite="#//Lieu/territoire"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Lieu">
     <eStructuralFeatures xsi:type="ecore:EReference" name="territoire" lowerBound="1"
-        eType="#//Territoire" eOpposite="#//Territoire/lieux"/>
+        eType="#//Territoire" eOpposite="#//Territoire/fin"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="chemins1" eType="#//Chemin"
         eOpposite="#//Chemin/lieu1"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="chemins2" upperBound="-1"
         eType="#//Chemin" eOpposite="#//Chemin/lieu2"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="explore" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="connaissances" upperBound="-1"
+        eType="#//Connaissance" eOpposite="#//Connaissance/lieu"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="objets" upperBound="-1"
+        eType="#//Objet" eOpposite="#//Objet/lieu"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="personnes" upperBound="-1"
+        eType="#//Personne" eOpposite="#//Personne/lieu"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Depart" eSuperTypes="#//Lieu"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Fin" eSuperTypes="#//Lieu"/>
   <eClassifiers xsi:type="ecore:EClass" name="Chemin">
     <eStructuralFeatures xsi:type="ecore:EReference" name="territoire" lowerBound="1"
         eType="#//Territoire" eOpposite="#//Territoire/chemins"/>
@@ -34,5 +52,34 @@
         eOpposite="#//Lieu/chemins1"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="lieu2" lowerBound="1" eType="#//Lieu"
         eOpposite="#//Lieu/chemins2"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ouvert" lowerBound="1"
+        eType="#//Condition"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
+        eType="#//Condition"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Objet" eSuperTypes="#//ElementJeu">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="explorateur" eType="#//Explorateur"
+        eOpposite="#//Explorateur/objets"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="taille" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="lieu" eType="#//Lieu" eOpposite="#//Lieu/objets"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
+        eType="#//Condition"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="deposable" lowerBound="1"
+        eType="#//Condition"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Connaissance" eSuperTypes="#//ElementJeu">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="explorateur" eType="#//Explorateur"
+        eOpposite="#//Explorateur/connaissances"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="lieu" eType="#//Lieu" eOpposite="#//Lieu/connaissances"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
+        eType="#//Condition"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Personne" eSuperTypes="#//ElementJeu">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="lieu" lowerBound="1" eType="#//Lieu"
+        eOpposite="#//Lieu/personnes"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
+        eType="#//Condition"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Condition"/>
 </ecore:EPackage>

From 4818b885fe632551d917be608df1eb40d4a5e45d Mon Sep 17 00:00:00 2001
From: Guillotin Damien <dguillot@azote.enseeiht.fr>
Date: Fri, 19 Nov 2021 22:27:05 +0100
Subject: [PATCH 2/2] ecore jusqu'au E23

---
 workspace/jeuexp/jeuexp.ecore | 70 +++++++++++++++++++++++++++++++----
 1 file changed, 62 insertions(+), 8 deletions(-)

diff --git a/workspace/jeuexp/jeuexp.ecore b/workspace/jeuexp/jeuexp.ecore
index a2e0d2a..29031ba 100644
--- a/workspace/jeuexp/jeuexp.ecore
+++ b/workspace/jeuexp/jeuexp.ecore
@@ -34,14 +34,16 @@
         eOpposite="#//Chemin/lieu1"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="chemins2" upperBound="-1"
         eType="#//Chemin" eOpposite="#//Chemin/lieu2"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="explore" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="connaissances" upperBound="-1"
         eType="#//Connaissance" eOpposite="#//Connaissance/lieu"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="objets" upperBound="-1"
-        eType="#//Objet" eOpposite="#//Objet/lieu"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="personnes" upperBound="-1"
         eType="#//Personne" eOpposite="#//Personne/lieu"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="objets" upperBound="-1"
+        eType="#//Objet" eOpposite="#//Objet/lieu"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="explore" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="deposable" lowerBound="1"
+        eType="#//Condition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Depart" eSuperTypes="#//Lieu"/>
   <eClassifiers xsi:type="ecore:EClass" name="Fin" eSuperTypes="#//Lieu"/>
@@ -52,26 +54,41 @@
         eOpposite="#//Lieu/chemins1"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="lieu2" lowerBound="1" eType="#//Lieu"
         eOpposite="#//Lieu/chemins2"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="objets" upperBound="-1"
+        eType="#//Objet"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="connaissances" upperBound="-1"
+        eType="#//Connaissance" eOpposite="#//Connaissance/chemin"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="objetsConso" upperBound="-1"
+        eType="#//Objet" eOpposite="#//Objet/cheminConso"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ouvert" lowerBound="1"
         eType="#//Condition"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
         eType="#//Condition"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="obligatoire" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Objet" eSuperTypes="#//ElementJeu">
     <eStructuralFeatures xsi:type="ecore:EReference" name="explorateur" eType="#//Explorateur"
         eOpposite="#//Explorateur/objets"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="lieu" eType="#//Lieu" eOpposite="#//Lieu/objets"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="chemin" eType="#//Chemin"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="cheminConso" eType="#//Chemin"
+        eOpposite="#//Chemin/objetsConso"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionObjet" upperBound="-1"
+        eType="#//ConditionObjet" eOpposite="#//ConditionObjet/objet"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="taille" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="lieu" eType="#//Lieu" eOpposite="#//Lieu/objets"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
         eType="#//Condition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deposable" lowerBound="1"
-        eType="#//Condition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Connaissance" eSuperTypes="#//ElementJeu">
     <eStructuralFeatures xsi:type="ecore:EReference" name="explorateur" eType="#//Explorateur"
         eOpposite="#//Explorateur/connaissances"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="lieu" eType="#//Lieu" eOpposite="#//Lieu/connaissances"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="chemin" eType="#//Chemin"
+        eOpposite="#//Chemin/connaissances"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionConnaissance"
+        upperBound="-1" eType="#//ConditionConnaissance" eOpposite="#//ConditionConnaissance/connaissance"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
         eType="#//Condition"/>
   </eClassifiers>
@@ -80,6 +97,43 @@
         eOpposite="#//Lieu/personnes"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
         eType="#//Condition"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="obligatoire" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Condition">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionOu" lowerBound="1"
+        upperBound="-1" eType="#//ConditionOu" eOpposite="#//ConditionOu/condition"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="explorateur" lowerBound="1"
+        eType="#//Explorateur"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConditionOu">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionEt" lowerBound="1"
+        upperBound="-1" eType="#//ConditionEt" eOpposite="#//ConditionEt/conditionOu"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" lowerBound="1"
+        eType="#//Condition" eOpposite="#//Condition/conditionOu"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConditionEt">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionTest" lowerBound="1"
+        upperBound="-1" eType="#//ConditionTest" eOpposite="#//ConditionTest/conditionEt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionOu" lowerBound="1"
+        eType="#//ConditionOu" eOpposite="#//ConditionOu/conditionEt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConditionTest">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionEt" lowerBound="1"
+        eType="#//ConditionEt" eOpposite="#//ConditionEt/conditionTest"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConditionConnaissance" eSuperTypes="#//ConditionTest">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="connaissance" lowerBound="1"
+        eType="#//Connaissance" eOpposite="#//Connaissance/conditionConnaissance"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="negation" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConditionObjet" eSuperTypes="#//ConditionTest">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="objet" lowerBound="1" eType="#//Objet"
+        eOpposite="#//Objet/conditionObjet"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nombre" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="superieurEgale" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Condition"/>
 </ecore:EPackage>