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

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 6720766..41f02bc 100644
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -216,7 +216,7 @@
         <dia:point val="20,1.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.95,1.75;26.55,11.45"/>
+        <dia:rectangle val="19.95,1.75;26.55,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="20,1.8"/>
@@ -225,7 +225,7 @@
         <dia:real val="6.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="9.5999999999999996"/>
+        <dia:real val="11.200000000000001"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Persona#</dia:string>
@@ -423,7 +423,53 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#direccion#</dia:string>
+            <dia:string>#calle#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#numero#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#deaprtamento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>
@@ -1150,13 +1196,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.55,1.1"/>
+        <dia:point val="-3.75,1.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.6,1.05;1.15,6.75"/>
+        <dia:rectangle val="-3.8,1;0.95,6.7"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.55,1.1"/>
+        <dia:point val="-3.75,1.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.6499999999999995"/>
@@ -1870,13 +1916,13 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="23.25,11.4"/>
+        <dia:point val="23.25,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.025,11.35;24.1,17.35"/>
+        <dia:rectangle val="16.025,12.95;24.1,17.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="23.25,11.4"/>
+        <dia:point val="23.25,13"/>
         <dia:point val="23.25,15.1"/>
         <dia:point val="16.075,15.1"/>
         <dia:point val="16.075,17.3"/>
@@ -1905,13 +1951,13 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="23.25,11.4"/>
+        <dia:point val="23.25,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.4,11.35;24.1,17.35"/>
+        <dia:rectangle val="22.4,12.95;24.1,17.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="23.25,11.4"/>
+        <dia:point val="23.25,13"/>
         <dia:point val="23.25,15.1"/>
         <dia:point val="23.275,15.1"/>
         <dia:point val="23.275,17.3"/>
@@ -2005,13 +2051,13 @@
         <dia:point val="-1.45,16.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.125,15.65;0.365,27.42"/>
+        <dia:rectangle val="-2.125,15.65;0.165,27.42"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-1.45,16.4"/>
         <dia:point val="-2.075,16.4"/>
         <dia:point val="-2.075,26.57"/>
-        <dia:point val="0.015,26.57"/>
+        <dia:point val="-0.185,26.57"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -2059,19 +2105,19 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O3" connection="6"/>
-        <dia:connection handle="1" to="O25" connection="1"/>
+        <dia:connection handle="1" to="O24" connection="1"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="-1.5,6.7"/>
+        <dia:point val="-1.425,6.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.55,6.65;-1.1,14"/>
+        <dia:rectangle val="-1.5,6.6;-1.075,14"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-1.5,6.7"/>
-        <dia:point val="-1.5,9.15"/>
+        <dia:point val="-1.425,6.65"/>
+        <dia:point val="-1.425,9.15"/>
         <dia:point val="-1.45,9.15"/>
         <dia:point val="-1.45,11.6"/>
       </dia:attribute>
@@ -2379,13 +2425,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.815,17.36"/>
+        <dia:point val="28.815,17.31"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.765,17.31;34.715,21.41"/>
+        <dia:rectangle val="28.765,17.26;34.715,21.36"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="28.815,17.36"/>
+        <dia:point val="28.815,17.31"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.8499999999999996"/>
@@ -2550,16 +2596,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="23.25,11.4"/>
+        <dia:point val="23.25,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.4,11.35;31.79,17.41"/>
+        <dia:rectangle val="22.4,12.95;31.79,17.36"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="23.25,11.4"/>
+        <dia:point val="23.25,13"/>
         <dia:point val="23.25,15.1"/>
         <dia:point val="31.74,15.1"/>
-        <dia:point val="31.74,17.36"/>
+        <dia:point val="31.74,17.31"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2585,13 +2631,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.865,1.06"/>
+        <dia:point val="4.865,0.56"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.815,1.01;14.165,3.51"/>
+        <dia:rectangle val="4.815,0.51;14.165,3.01"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="4.865,1.06"/>
+        <dia:point val="4.865,0.56"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9.25"/>
@@ -2709,32 +2755,6 @@
       <dia:attribute name="templates"/>
     </dia:object>
     <dia:object type="Standard - ZigZagLine" version="0" id="O18">
-      <dia:attribute name="obj_pos">
-        <dia:point val="9.49,3.46"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.4,3.41;9.54,5.55"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="9.49,3.46"/>
-        <dia:point val="9.49,5.25"/>
-        <dia:point val="9.45,5.25"/>
-        <dia:point val="9.45,5.5"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O17" connection="6"/>
-        <dia:connection handle="1" to="O7" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O19">
       <dia:attribute name="obj_pos">
         <dia:point val="23.275,25.35"/>
       </dia:attribute>
@@ -2760,7 +2780,7 @@
         <dia:connection handle="1" to="O0" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O20">
+    <dia:object type="UML - Class" version="0" id="O19">
       <dia:attribute name="obj_pos">
         <dia:point val="-0.935,20.06"/>
       </dia:attribute>
@@ -2954,7 +2974,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O21">
+    <dia:object type="UML - Generalization" version="0" id="O20">
       <dia:attribute name="obj_pos">
         <dia:point val="9.45,13.5"/>
       </dia:attribute>
@@ -2986,10 +3006,10 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O7" connection="6"/>
-        <dia:connection handle="1" to="O20" connection="1"/>
+        <dia:connection handle="1" to="O19" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O22">
+    <dia:object type="UML - Class" version="0" id="O21">
       <dia:attribute name="obj_pos">
         <dia:point val="6.83,20.22"/>
       </dia:attribute>
@@ -3090,7 +3110,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O23">
+    <dia:object type="UML - Generalization" version="0" id="O22">
       <dia:attribute name="obj_pos">
         <dia:point val="9.45,13.5"/>
       </dia:attribute>
@@ -3122,10 +3142,10 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O7" connection="6"/>
-        <dia:connection handle="1" to="O22" connection="1"/>
+        <dia:connection handle="1" to="O21" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O24">
+    <dia:object type="Standard - ZigZagLine" version="0" id="O23">
       <dia:attribute name="obj_pos">
         <dia:point val="25.675,28.05"/>
       </dia:attribute>
@@ -3148,18 +3168,18 @@
         <dia:connection handle="1" to="O14" connection="10"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O25">
+    <dia:object type="UML - Class" version="0" id="O24">
       <dia:attribute name="obj_pos">
         <dia:point val="-4.285,26.57"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.335,26.52;4.365,31.42"/>
+        <dia:rectangle val="-4.335,26.52;3.965,31.42"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.285,26.57"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.5999999999999996"/>
+        <dia:real val="8.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -3245,7 +3265,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#tiempo_de_conveniencia#</dia:string>
+            <dia:string>#tiempo_de_permanencia#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>
@@ -3342,17 +3362,17 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O26">
+    <dia:object type="Standard - ZigZagLine" version="0" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.315,29.27"/>
+        <dia:point val="3.915,29.27"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.265,29.2;7.525,29.32"/>
+        <dia:rectangle val="3.865,29.2;7.525,29.32"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="4.315,29.27"/>
-        <dia:point val="5.895,29.27"/>
-        <dia:point val="5.895,29.25"/>
+        <dia:point val="3.915,29.27"/>
+        <dia:point val="5.695,29.27"/>
+        <dia:point val="5.695,29.25"/>
         <dia:point val="7.475,29.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -3361,11 +3381,11 @@
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O25" connection="11"/>
+        <dia:connection handle="0" to="O24" connection="11"/>
         <dia:connection handle="1" to="O4" connection="10"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O27">
+    <dia:object type="Standard - ZigZagLine" version="0" id="O26">
       <dia:attribute name="obj_pos">
         <dia:point val="12.725,12.2"/>
       </dia:attribute>
@@ -3392,7 +3412,7 @@
         <dia:connection handle="1" to="O2" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O28">
+    <dia:object type="UML - Class" version="0" id="O27">
       <dia:attribute name="obj_pos">
         <dia:point val="0.715,-3.67999"/>
       </dia:attribute>
@@ -3540,7 +3560,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O29">
+    <dia:object type="Standard - ZigZagLine" version="0" id="O28">
       <dia:attribute name="obj_pos">
         <dia:point val="2.99,-0.47999"/>
       </dia:attribute>
@@ -3562,19 +3582,19 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O28" connection="6"/>
+        <dia:connection handle="0" to="O27" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O30">
+    <dia:object type="UML - Association" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.815,18.06"/>
+        <dia:point val="28.815,18.01"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.15,17.95;28.865,19.66"/>
+        <dia:rectangle val="26.15,17.255;28.865,19.61"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="28.815,18.06"/>
-        <dia:point val="27.5075,18.06"/>
+        <dia:point val="28.815,18.01"/>
+        <dia:point val="27.5075,18.01"/>
         <dia:point val="27.5075,18"/>
         <dia:point val="26.2,18"/>
       </dia:attribute>
@@ -3624,5 +3644,70 @@
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="Standard - ZigZagLine" version="0" id="O30">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-1.425,1.05"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-1.485,-4.72999;35.665,27.31"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-1.425,1.05"/>
+        <dia:point val="-1.435,1.05"/>
+        <dia:point val="-1.435,-4.67999"/>
+        <dia:point val="35.615,-4.67999"/>
+        <dia:point val="35.615,27.26"/>
+        <dia:point val="34.065,27.26"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O5" connection="1"/>
+        <dia:connection handle="1" to="O14" connection="9"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Generalization" version="0" id="O31">
+      <dia:attribute name="obj_pos">
+        <dia:point val="9.45,5.5"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="8.6,2.91;10.3,5.55"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="9.45,5.5"/>
+        <dia:point val="9.45,4.23"/>
+        <dia:point val="9.49,4.23"/>
+        <dia:point val="9.49,2.96"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O7" connection="1"/>
+        <dia:connection handle="1" to="O17" connection="6"/>
+      </dia:connections>
+    </dia:object>
   </dia:layer>
 </dia:diagram>