X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/ef88a740e20bc6320e164d24216d7ae9bb713a12..ecd8532dab095d6656a828f95c37143336372da2:/diagramas/clases.dia?ds=sidebyside

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 7e849e9..1b4f9ab 100644
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.38150566816329956"/>
+          <dia:real val="0.37544265389442444"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -71,13 +71,13 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.05,25.1"/>
+        <dia:point val="34.6,23.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34,25.05;38.6,26.95"/>
+        <dia:rectangle val="34.55,23.3;39.15,25.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34.05,25.1"/>
+        <dia:point val="34.6,23.35"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.5"/>
@@ -175,13 +175,13 @@
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.25,8.9;45.85,16.2"/>
+        <dia:rectangle val="33.25,8.9;45.75,16.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.5"/>
+        <dia:real val="12.4"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>
@@ -655,13 +655,13 @@
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.075,16.3"/>
+        <dia:rectangle val="-4.875,13;1.025,16.3"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
@@ -803,13 +803,13 @@
         <dia:point val="11.375,26.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.325,26.05;18.675,30.95"/>
+        <dia:rectangle val="11.325,26.05;18.525,30.95"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="11.375,26.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.25"/>
+        <dia:real val="7.0999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -997,13 +997,13 @@
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,2.7;1.9,6.8"/>
+        <dia:rectangle val="-4.05,2.7;1.85,6.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4"/>
@@ -1316,13 +1316,13 @@
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.725,4.6;16.925,15.3"/>
+        <dia:rectangle val="5.725,4.6;16.875,15.3"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="11.1"/>
+        <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="10.6"/>
@@ -1679,7 +1679,7 @@
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.875,16.1;40.35,23.52"/>
+        <dia:rectangle val="25.875,16.1;40.35,23.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
@@ -1714,13 +1714,13 @@
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.25,16.1;40.35,25.15"/>
+        <dia:rectangle val="36.8,16.1;40.35,23.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
         <dia:point val="39.5,22.72"/>
-        <dia:point val="36.3,22.72"/>
-        <dia:point val="36.3,25.1"/>
+        <dia:point val="36.85,22.72"/>
+        <dia:point val="36.85,23.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1894,13 +1894,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="42.665,24.4"/>
+        <dia:point val="42.415,25.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.615,24.35;51.365,29.25"/>
+        <dia:rectangle val="42.365,25.35;51.115,30.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="42.665,24.4"/>
+        <dia:point val="42.415,25.4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2091,13 +2091,13 @@
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.65,16.1;47.04,24.45"/>
+        <dia:rectangle val="38.65,16.1;46.79,25.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
         <dia:point val="39.5,22.72"/>
-        <dia:point val="46.99,22.72"/>
-        <dia:point val="46.99,24.4"/>
+        <dia:point val="46.74,22.72"/>
+        <dia:point val="46.74,25.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2422,13 +2422,13 @@
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.635,27.47;7.665,32.37"/>
+        <dia:rectangle val="-5.635,27.47;7.565,32.37"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.199999999999999"/>
+        <dia:real val="13.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -2616,13 +2616,13 @@
         <dia:point val="0.815,-3.52999"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.765,-3.57999;6.715,-0.27999"/>
+        <dia:rectangle val="0.765,-3.57999;6.665,-0.27999"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="0.815,-3.52999"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
@@ -2764,7 +2764,7 @@
         <dia:point val="7.515,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.465,26;12.125,29.02"/>
+        <dia:rectangle val="7.465,26.05;12.125,29.07"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.515,28.22"/>
@@ -2826,7 +2826,7 @@
         <dia:point val="18.475,26.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.425,26;21.95,28.15"/>
+        <dia:rectangle val="18.425,26.05;21.95,28.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="18.475,26.8"/>
@@ -2885,7 +2885,7 @@
         <dia:point val="44.115,-1.34"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.225,-2.14;44.815,1.6"/>
+        <dia:rectangle val="39.225,-2.09;44.815,1.65"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="44.115,-1.34"/>
@@ -3003,16 +3003,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="42.665,25.1"/>
+        <dia:point val="42.415,25.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.5,24.3;43.365,26.6"/>
+        <dia:rectangle val="39.05,23.3;43.115,26.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="42.665,25.1"/>
-        <dia:point val="40.6075,25.1"/>
-        <dia:point val="40.6075,25.8"/>
-        <dia:point val="38.55,25.8"/>
+        <dia:point val="42.415,25.4"/>
+        <dia:point val="40.7575,25.4"/>
+        <dia:point val="40.7575,24.05"/>
+        <dia:point val="39.1,24.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3056,7 +3056,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O11" connection="3"/>
+        <dia:connection handle="0" to="O11" connection="0"/>
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
@@ -3065,7 +3065,7 @@
         <dia:point val="0.975,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,-1.07999;4.465,14.55"/>
+        <dia:rectangle val="0.925,-1.07999;4.465,14.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="0.975,13.75"/>
@@ -3122,7 +3122,7 @@
         <dia:point val="5.775,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.215,4.55;6.825,28.32"/>
+        <dia:rectangle val="0.215,4.6;6.825,28.37"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="5.775,5.35"/>
@@ -3184,7 +3184,7 @@
         <dia:point val="-5.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,15.5;-1.175,29.02"/>
+        <dia:rectangle val="-6.635,15.5;-1.175,29.07"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.585,28.22"/>
@@ -3245,7 +3245,7 @@
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,6;-0.35,14.55"/>
+        <dia:rectangle val="-5.875,6;-0.35,14.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.825,13.75"/>
@@ -3306,7 +3306,7 @@
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,-5.36749;48.665,4.35"/>
+        <dia:rectangle val="-4.05,-5.31749;48.665,4.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4,2.75"/>
@@ -3365,13 +3365,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.865,27.8825"/>
+        <dia:point val="33.565,28.5825"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.815,27.8325;42.015,31.1325"/>
+        <dia:rectangle val="33.515,28.5325;41.715,31.8325"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.865,27.8825"/>
+        <dia:point val="33.565,28.5825"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.0999999999999996"/>
@@ -3516,13 +3516,13 @@
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.2008,-1.29249;28.2508,2.00751"/>
+        <dia:rectangle val="13.2008,-1.29249;28.2008,2.00751"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="14.949999999999999"/>
+        <dia:real val="14.9"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
@@ -3664,13 +3664,13 @@
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.0508,11.7575;31.2508,18.2575"/>
+        <dia:rectangle val="20.0508,11.7575;31.2008,18.2575"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="11.1"/>
+        <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>
@@ -3961,7 +3961,7 @@
         <dia:point val="31.1508,12.5075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.1008,11.7075;33.65,14.05"/>
+        <dia:rectangle val="31.1008,11.7575;33.65,14.1"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="31.1508,12.5075"/>
@@ -4020,7 +4020,7 @@
         <dia:point val="20.7008,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.15,-4.81749;21.4008,4.35"/>
+        <dia:rectangle val="-1.15,-4.76749;21.4008,4.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.7008,-1.24249"/>
@@ -4141,7 +4141,7 @@
         <dia:point val="1.8,3.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.05,2.65;12.025,6.25"/>
+        <dia:rectangle val="1.05,2.7;12.025,6.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.8,3.45"/>
@@ -4198,7 +4198,7 @@
         <dia:point val="16.875,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.825,4.55;22.35,24.55"/>
+        <dia:rectangle val="16.825,4.6;22.35,24.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="16.875,5.35"/>
@@ -4260,7 +4260,7 @@
         <dia:point val="21.6,28.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.85,27.9;32.575,34.0575"/>
+        <dia:rectangle val="20.85,27.9;32.425,34.0575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="21.6,28.65"/>
@@ -4322,13 +4322,13 @@
         <dia:point val="14.925,30.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.875,30.3325;38.665,34.8825"/>
+        <dia:rectangle val="14.875,30.85;38.365,35.5825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="14.925,30.9"/>
         <dia:point val="14.925,34.3575"/>
-        <dia:point val="37.915,34.3575"/>
-        <dia:point val="37.915,31.0825"/>
+        <dia:point val="37.615,34.3575"/>
+        <dia:point val="37.615,31.7825"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4381,16 +4381,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O40">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.25,27.35"/>
+        <dia:point val="30.25,28.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,26.55;34.215,29.3825"/>
+        <dia:rectangle val="30.2,27.4;34.265,30.1325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.25,27.35"/>
-        <dia:point val="32.0575,27.35"/>
-        <dia:point val="32.0575,28.5825"/>
-        <dia:point val="33.865,28.5825"/>
+        <dia:point val="30.25,28.15"/>
+        <dia:point val="31.9075,28.15"/>
+        <dia:point val="31.9075,29.2825"/>
+        <dia:point val="33.565,29.2825"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4409,7 +4409,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string># 1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4423,7 +4423,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#1 #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4434,7 +4434,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O2" connection="15"/>
+        <dia:connection handle="0" to="O2" connection="17"/>
         <dia:connection handle="1" to="O29" connection="3"/>
       </dia:connections>
     </dia:object>
@@ -4443,7 +4443,7 @@
         <dia:point val="32.375,0.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.1008,-1.34249;32.725,1.6"/>
+        <dia:rectangle val="28.1008,-1.29249;32.725,1.65"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.375,0.8"/>
@@ -4502,7 +4502,7 @@
         <dia:point val="25.6258,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.5758,2;32.725,13.4075"/>
+        <dia:rectangle val="25.5758,2.05;32.725,13.4075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,11.8075"/>
@@ -4554,5 +4554,64 @@
         <dia:connection handle="1" to="O6" connection="10"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="UML - Association" version="0" id="O43">
+      <dia:attribute name="obj_pos">
+        <dia:point val="42.415,27.3"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="30.2,25.8;43.115,28.15"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="42.415,27.3"/>
+        <dia:point val="36.3325,27.3"/>
+        <dia:point val="36.3325,26.55"/>
+        <dia:point val="30.25,26.55"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#titularidad#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string># titular#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># 0..1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O11" connection="8"/>
+        <dia:connection handle="1" to="O2" connection="13"/>
+      </dia:connections>
+    </dia:object>
   </dia:layer>
 </dia:diagram>