repositories / Project_POO.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
exo6: add the full implementation.
[Project_POO.git] / exo6 / design_arithmetic.uxf
diff --git a/exo6/design_arithmetic.uxf b/exo6/design_arithmetic.uxf
index 6e69bb0d494d1b66b0c713ab2c1623c7854a167d..8bcefa81bb6580de5c2655b6d53546c47983190f 100644 (file)
--- a/exo6/design_arithmetic.uxf
+++ b/exo6/design_arithmetic.uxf
@@ -3,23 +3,23 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>590</x>
-      <y>60</y>
-      <w>100</w>
+      <x>580</x>
+      <y>90</y>
+      <w>140</w>
       <h>60</h>
     </coordinates>
     <panel_attributes>/Expression/
 --
 --
-/+evaluer():/
+/+evaluer():double/
 </panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>380</x>
-      <y>200</y>
+      <x>390</x>
+      <y>230</y>
       <w>100</w>
       <h>30</h>
     </coordinates>
@@ -29,19 +29,19 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>870</x>
-      <y>200</y>
+      <x>880</x>
+      <y>230</y>
       <w>100</w>
       <h>30</h>
     </coordinates>
-    <panel_attributes>/Op-add/</panel_attributes>
+    <panel_attributes>/Opadd/</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>280</x>
-      <y>290</y>
+      <x>290</x>
+      <y>320</y>
       <w>100</w>
       <h>30</h>
     </coordinates>
@@ -51,81 +51,85 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>770</x>
-      <y>290</y>
-      <w>100</w>
-      <h>50</h>
+      <x>760</x>
+      <y>320</y>
+      <w>150</w>
+      <h>80</h>
     </coordinates>
-    <panel_attributes>Op+
+    <panel_attributes>Opplus
 --
 --
-+evaluer():gauche.evaluer() + droite.evaluer()</panel_attributes>
++evaluer():
+gauche.evaluer() + 
+droite.evaluer()</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>480</x>
-      <y>290</y>
+      <x>490</x>
+      <y>320</y>
       <w>100</w>
       <h>30</h>
     </coordinates>
-    <panel_attributes>/Op-mul/</panel_attributes>
+    <panel_attributes>/Opmul/</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>970</x>
-      <y>290</y>
-      <w>100</w>
-      <h>50</h>
+      <x>960</x>
+      <y>320</y>
+      <w>140</w>
+      <h>80</h>
     </coordinates>
-    <panel_attributes>Op-
+    <panel_attributes>Opminus
 --
 --
-+evaluer():gauche.evaluer() - droite.evaluer()</panel_attributes>
++evaluer():
+gauche.evaluer() - 
+droite.evaluer()</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
       <x>10</x>
-      <y>470</y>
-      <w>130</w>
+      <y>510</y>
+      <w>150</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>Chiffre
 --
 -c:int &lt;- {0,...,9}
 --
-+evaluer():int </panel_attributes>
++evaluer():double</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>170</x>
-      <y>470</y>
-      <w>180</w>
+      <x>190</x>
+      <y>510</y>
+      <w>220</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>Variable
 --
--vMap:Map&lt;key, value&gt;
+-v:TreeMap&lt;Integer,Double&gt;
 --
-+evaluer():char</panel_attributes>
++evaluer():double</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>380</x>
-      <y>470</y>
+      <x>440</x>
+      <y>510</y>
       <w>190</w>
       <h>80</h>
     </coordinates>
-    <panel_attributes>Expression parenthesée
+    <panel_attributes>ParentheseExp
 --
 --
 +evaluer():exp.evaluer()</panel_attributes>
@@ -134,36 +138,40 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>410</x>
-      <y>370</y>
-      <w>100</w>
-      <h>50</h>
+      <x>400</x>
+      <y>400</y>
+      <w>140</w>
+      <h>80</h>
     </coordinates>
-    <panel_attributes>Op*
+    <panel_attributes>Opmulti
 --
 --
-+evaluer():gauche.evaluer() * droite.evaluer()</panel_attributes>
++evaluer():
+gauche.evaluer() *
+droite.evaluer()</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
       <x>550</x>
-      <y>370</y>
-      <w>100</w>
-      <h>50</h>
+      <y>400</y>
+      <w>140</w>
+      <h>80</h>
     </coordinates>
-    <panel_attributes>Op\
+    <panel_attributes>Opdiv
 --
 --
-+evaluer():gauche.evaluer() / droite.evaluer()</panel_attributes>
++evaluer():
+gauche.evaluer() / 
+droite.evaluer()</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>630</x>
-      <y>110</y>
+      <x>640</x>
+      <y>140</y>
       <w>30</w>
       <h>80</h>
     </coordinates>
@@ -173,8 +181,8 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>420</x>
-      <y>160</y>
+      <x>430</x>
+      <y>190</y>
       <w>520</w>
       <h>60</h>
     </coordinates>
@@ -184,20 +192,20 @@
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>680</x>
-      <y>80</y>
-      <w>390</w>
+      <x>710</x>
+      <y>110</y>
+      <w>370</w>
       <h>150</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 droite</panel_attributes>
-    <additional_attributes>10.0;10.0;330.0;10.0;330.0;130.0;290.0;130.0</additional_attributes>
+    <additional_attributes>10.0;10.0;310.0;10.0;310.0;130.0;270.0;130.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>470</x>
-      <y>190</y>
+      <x>480</x>
+      <y>220</y>
       <w>420</w>
       <h>40</h>
     </coordinates>
@@ -208,8 +216,8 @@ gauche</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>420</x>
-      <y>220</y>
+      <x>430</x>
+      <y>250</y>
       <w>30</w>
       <h>60</h>
     </coordinates>
@@ -219,8 +227,8 @@ gauche</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>320</x>
-      <y>250</y>
+      <x>330</x>
+      <y>280</y>
       <w>230</w>
       <h>60</h>
     </coordinates>
@@ -230,8 +238,8 @@ gauche</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>370</x>
-      <y>280</y>
+      <x>380</x>
+      <y>310</y>
       <w>130</w>
       <h>40</h>
     </coordinates>
@@ -242,8 +250,8 @@ gauche</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>470</x>
-      <y>210</y>
+      <x>480</x>
+      <y>240</y>
       <w>210</w>
       <h>110</h>
     </coordinates>
@@ -254,8 +262,8 @@ droite</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>910</x>
-      <y>220</y>
+      <x>920</x>
+      <y>250</y>
       <w>30</w>
       <h>60</h>
     </coordinates>
@@ -265,8 +273,8 @@ droite</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>810</x>
-      <y>250</y>
+      <x>820</x>
+      <y>280</y>
       <w>230</w>
       <h>60</h>
     </coordinates>
@@ -276,8 +284,8 @@ droite</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>520</x>
-      <y>310</y>
+      <x>530</x>
+      <y>340</y>
       <w>30</w>
       <h>60</h>
     </coordinates>
@@ -287,8 +295,8 @@ droite</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>450</x>
-      <y>340</y>
+      <x>460</x>
+      <y>370</y>
       <w>170</w>
       <h>50</h>
     </coordinates>
@@ -298,46 +306,46 @@ droite</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>560</x>
-      <y>60</y>
-      <w>580</w>
-      <h>470</h>
+      <x>620</x>
+      <y>90</y>
+      <w>530</w>
+      <h>480</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 exp</panel_attributes>
-    <additional_attributes>130.0;10.0;540.0;10.0;540.0;450.0;10.0;450.0</additional_attributes>
+    <additional_attributes>100.0;10.0;490.0;10.0;490.0;460.0;10.0;460.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>60</x>
-      <y>430</y>
-      <w>430</w>
-      <h>60</h>
+      <x>70</x>
+      <y>480</y>
+      <w>480</w>
+      <h>50</h>
     </coordinates>
     <panel_attributes>lt=-</panel_attributes>
-    <additional_attributes>10.0;40.0;10.0;10.0;410.0;10.0;410.0;40.0</additional_attributes>
+    <additional_attributes>10.0;30.0;10.0;10.0;460.0;10.0;460.0;30.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>320</x>
-      <y>310</y>
+      <x>330</x>
+      <y>340</y>
       <w>30</w>
-      <h>150</h>
+      <h>170</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
-    <additional_attributes>10.0;10.0;10.0;130.0</additional_attributes>
+    <additional_attributes>10.0;10.0;10.0;150.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>250</x>
-      <y>430</y>
+      <x>290</x>
+      <y>480</y>
       <w>30</w>
-      <h>60</h>
+      <h>50</h>
     </coordinates>
     <panel_attributes>lt=-</panel_attributes>
-    <additional_attributes>10.0;10.0;10.0;40.0</additional_attributes>
+    <additional_attributes>10.0;10.0;10.0;30.0</additional_attributes>
   </element>
 </diagram>
HUGo Polytech'Marseille OOP project code