From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Wed, 7 Mar 2018 17:15:15 +0000 (+0100)
Subject: TD1: Add the UML objects diagram to exo3.
X-Git-Url: https://git.piment-noir.org/?p=TD_ACO.git;a=commitdiff_plain;h=a37f78bd78ad5451eb2825c9328cc9a7ff36dd29

TD1: Add the UML objects diagram to exo3.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
---

diff --git a/TD1/exo3.uxf b/TD1/exo3.uxf
index 39d62f6..8c2a55c 100644
--- a/TD1/exo3.uxf
+++ b/TD1/exo3.uxf
@@ -4,8 +4,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>580</x>
-      <y>120</y>
+      <x>570</x>
+      <y>40</y>
       <w>220</w>
       <h>100</h>
     </coordinates>
@@ -20,8 +20,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>10</x>
-      <y>80</y>
+      <x>0</x>
+      <y>0</y>
       <w>260</w>
       <h>190</h>
     </coordinates>
@@ -45,8 +45,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>930</x>
-      <y>150</y>
+      <x>920</x>
+      <y>70</y>
       <w>100</w>
       <h>30</h>
     </coordinates>
@@ -56,8 +56,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>600</x>
-      <y>320</y>
+      <x>590</x>
+      <y>240</y>
       <w>190</w>
       <h>60</h>
     </coordinates>
@@ -70,8 +70,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>500</x>
-      <y>510</y>
+      <x>490</x>
+      <y>430</y>
       <w>100</w>
       <h>30</h>
     </coordinates>
@@ -81,8 +81,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>790</x>
-      <y>500</y>
+      <x>780</x>
+      <y>420</y>
       <w>190</w>
       <h>50</h>
     </coordinates>
@@ -94,8 +94,8 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>790</x>
-      <y>150</y>
+      <x>780</x>
+      <y>70</y>
       <w>160</w>
       <h>30</h>
     </coordinates>
@@ -105,8 +105,8 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>680</x>
-      <y>210</y>
+      <x>670</x>
+      <y>130</y>
       <w>30</w>
       <h>130</h>
     </coordinates>
@@ -116,8 +116,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>420</x>
-      <y>590</y>
+      <x>410</x>
+      <y>510</y>
       <w>100</w>
       <h>50</h>
     </coordinates>
@@ -129,8 +129,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>580</x>
-      <y>590</y>
+      <x>570</x>
+      <y>510</y>
       <w>100</w>
       <h>50</h>
     </coordinates>
@@ -142,8 +142,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>720</x>
-      <y>590</y>
+      <x>710</x>
+      <y>510</y>
       <w>100</w>
       <h>30</h>
     </coordinates>
@@ -153,8 +153,8 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>830</x>
-      <y>590</y>
+      <x>820</x>
+      <y>510</y>
       <w>100</w>
       <h>30</h>
     </coordinates>
@@ -164,19 +164,19 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>940</x>
-      <y>590</y>
+      <x>930</x>
+      <y>510</y>
       <w>100</w>
       <h>30</h>
     </coordinates>
-    <panel_attributes>Salle de bain</panel_attributes>
+    <panel_attributes>SalledeBain</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>540</x>
-      <y>470</y>
+      <x>530</x>
+      <y>390</y>
       <w>360</w>
       <h>60</h>
     </coordinates>
@@ -186,8 +186,8 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>680</x>
-      <y>370</y>
+      <x>670</x>
+      <y>290</y>
       <w>30</w>
       <h>130</h>
     </coordinates>
@@ -197,8 +197,8 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>460</x>
-      <y>560</y>
+      <x>450</x>
+      <y>480</y>
       <w>190</w>
       <h>50</h>
     </coordinates>
@@ -208,8 +208,8 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>760</x>
-      <y>560</y>
+      <x>750</x>
+      <y>480</y>
       <w>250</w>
       <h>50</h>
     </coordinates>
@@ -219,8 +219,8 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>870</x>
-      <y>540</y>
+      <x>860</x>
+      <y>460</y>
       <w>30</w>
       <h>70</h>
     </coordinates>
@@ -230,8 +230,8 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>540</x>
-      <y>530</y>
+      <x>530</x>
+      <y>450</y>
       <w>30</w>
       <h>60</h>
     </coordinates>
@@ -241,21 +241,21 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>880</x>
-      <y>310</y>
-      <w>100</w>
+      <x>810</x>
+      <y>750</y>
+      <w>140</w>
       <h>50</h>
     </coordinates>
-    <panel_attributes>ServiceType
+    <panel_attributes>_type1:ServiceType_
 --
--nom:String</panel_attributes>
+-nom=evier</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>260</x>
-      <y>160</y>
+      <x>250</x>
+      <y>80</y>
       <w>340</w>
       <h>40</h>
     </coordinates>
@@ -267,12 +267,191 @@ m2=*</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>920</x>
-      <y>350</y>
+      <y>290</y>
       <w>30</w>
-      <h>170</h>
+      <h>150</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;&lt;-
 m2=*</panel_attributes>
-    <additional_attributes>10.0;10.0;10.0;150.0</additional_attributes>
+    <additional_attributes>10.0;10.0;10.0;130.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>370</x>
+      <y>630</y>
+      <w>220</w>
+      <h>30</h>
+    </coordinates>
+    <panel_attributes>_monAppartement:Appartement_</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>230</x>
+      <y>740</y>
+      <w>160</w>
+      <h>90</h>
+    </coordinates>
+    <panel_attributes>_maChambre:Chambre_
+--
+-longueur=4
+-largeur=6
+-surface=26
+-couleurs={rouge}
+-nbLits=1</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>420</x>
+      <y>740</y>
+      <w>120</w>
+      <h>90</h>
+    </coordinates>
+    <panel_attributes>_monSalon:Salon_
+--
+-longueur=
+-largeur=
+-surface=
+-nbTVs=1</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>570</x>
+      <y>740</y>
+      <w>190</w>
+      <h>80</h>
+    </coordinates>
+    <panel_attributes>_maSalledeBain:SalledeBain_
+--
+-longueur=3
+-largeur=3
+-surface=9</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>680</x>
+      <y>610</y>
+      <w>300</w>
+      <h>80</h>
+    </coordinates>
+    <panel_attributes>_maCuisine:Cuisine_
+--
+-longueur=3
+-largeur=5
+-surface=15</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>580</x>
+      <y>630</y>
+      <w>120</w>
+      <h>30</h>
+    </coordinates>
+    <panel_attributes>lt=-</panel_attributes>
+    <additional_attributes>10.0;10.0;100.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>300</x>
+      <y>700</y>
+      <w>380</w>
+      <h>60</h>
+    </coordinates>
+    <panel_attributes>lt=-</panel_attributes>
+    <additional_attributes>10.0;40.0;10.0;10.0;360.0;10.0;360.0;40.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>470</x>
+      <y>650</y>
+      <w>30</w>
+      <h>110</h>
+    </coordinates>
+    <panel_attributes>lt=-</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;90.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>880</x>
+      <y>250</y>
+      <w>100</w>
+      <h>50</h>
+    </coordinates>
+    <panel_attributes>ServiceType
+--
+-nom:String</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>750</x>
+      <y>770</y>
+      <w>80</w>
+      <h>30</h>
+    </coordinates>
+    <panel_attributes>lt=-</panel_attributes>
+    <additional_attributes>10.0;10.0;60.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>650</x>
+      <y>810</y>
+      <w>30</w>
+      <h>70</h>
+    </coordinates>
+    <panel_attributes>lt=-</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;50.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>1010</x>
+      <y>620</y>
+      <w>140</w>
+      <h>50</h>
+    </coordinates>
+    <panel_attributes>_type2:ServiceType_
+--
+-nom=cuisinière</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>970</x>
+      <y>640</y>
+      <w>60</w>
+      <h>30</h>
+    </coordinates>
+    <panel_attributes>lt=-</panel_attributes>
+    <additional_attributes>10.0;10.0;40.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>590</x>
+      <y>860</y>
+      <w>140</w>
+      <h>50</h>
+    </coordinates>
+    <panel_attributes>_type3:ServiceType_
+--
+-nom=douche</panel_attributes>
+    <additional_attributes/>
   </element>
 </diagram>
diff --git a/TD1/exo4.uxf b/TD1/exo4.uxf
index 026bd2c..4add072 100644
--- a/TD1/exo4.uxf
+++ b/TD1/exo4.uxf
@@ -9,7 +9,7 @@
       <w>200</w>
       <h>90</h>
     </coordinates>
-    <panel_attributes>/Route/
+    <panel_attributes>/LiaisonRoutière/
 --
 -longeur:double
 -vitesseMoyenne:double