Include jan's comments until polymorphism section

[matthijs/master-project/dsd-paper.git] / mac-nocurry.svg

diff --git a/mac-nocurry.svg b/mac-nocurry.svg
index a0ecc74856052636a3b6e8e332f52d16b01ed279..f0da35bcd926d91e8006ebb7d5cdc143a0c0d97a 100644 (file)
--- a/mac-nocurry.svg
+++ b/mac-nocurry.svg
@@ -10,12 +10,12 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="131.25"
+   width="130.3"

    height="68.14473"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
    height="68.14473"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"

-   sodipodi:docname="mac.svg">
+   sodipodi:docname="mac-nocurry.svg">

   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"


@@ -23,17 +23,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"

-     inkscape:zoom="4"
-     inkscape:cx="64.577756"
-     inkscape:cy="37.105291"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="77.999839"
+     inkscape:cy="5.2319952"

      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:snap-grids="true"
      inkscape:window-width="1091"
      inkscape:window-height="838"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:snap-grids="true"
      inkscape:window-width="1091"
      inkscape:window-height="838"

-     inkscape:window-x="30"
-     inkscape:window-y="154"
+     inkscape:window-x="207"
+     inkscape:window-y="153"

      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"


@@ -45,6 +45,58 @@
   </sodipodi:namedview>
   <defs
      id="defs4">
   </sodipodi:namedview>
   <defs
      id="defs4">

+    <marker
+       inkscape:stockid="DiamondMend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondMend"
+       style="overflow:visible">
+      <path
+         id="path3764"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondLend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondLend"
+       style="overflow:visible">
+      <path
+         id="path3761"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(0.8,0,0,0.8,-5.6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondL"
+       style="overflow:visible">
+      <path
+         id="path3743"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.8,0.8)" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondM"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondM"
+       style="overflow:visible">
+      <path
+         id="path3746"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.4,0.4)" />
+    </marker>

     <marker
        inkscape:stockid="TriangleOutM"
        orient="auto"
     <marker
        inkscape:stockid="TriangleOutM"
        orient="auto"


@@ -127,7 +179,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-        <dc:title></dc:title>
+        <dc:title />

       </cc:Work>
     </rdf:RDF>
   </metadata>
       </cc:Work>
     </rdf:RDF>
   </metadata>


@@ -139,7 +191,7 @@
     <rect
        style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
        id="rect2925"
     <rect
        style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
        id="rect2925"

-       width="100.64346"
+       width="102.94156"

        height="61.256287"
        x="394.5"
        y="562.75385" />
        height="61.256287"
        x="394.5"
        y="562.75385" />


@@ -173,8 +225,8 @@
        id="path2944"
        sodipodi:nodetypes="cc" />
     <path
        id="path2944"
        sodipodi:nodetypes="cc" />
     <path

-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
-       d="m 484,604.06917 25,0"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:none"
+       d="m 484,603.76913 23,0"

        id="path2946"
        sodipodi:nodetypes="cc" />
     <path
        id="path2946"
        sodipodi:nodetypes="cc" />
     <path


@@ -340,10 +392,10 @@
    d="m 226.99,660.11 0.11,0.11 0.1,0.12 0.11,0.11 0.09,0.12 0.05,0.05 0.05,0.06 0.04,0.06 0.04,0.05 0.05,0.06 0.04,0.05 0.04,0.06 0.03,0.05 0.04,0.05 0.03,0.05 0.03,0.04 0.03,0.05 0.03,0.04 0.03,0.04 0.02,0.04 0.02,0.04 0.02,0.03 0.02,0.03 0.01,0.03 0.01,0.02 0.01,0.02 0.01,0.02 0,0.02 0,0.01 c 0,0.1 -0.07,0.1 -0.13,0.1 -0.12,0 -0.13,-0.01 -0.19,-0.13 -0.33,-0.57 -0.46,-0.62 -0.62,-0.62 -0.18,0 -0.28,0.1 -0.47,0.36 -0.12,0.16 -0.29,0.39 -0.61,0.39 -0.73,0 -1.16,-0.94 -1.16,-1.14 0,-0.09 0.07,-0.11 0.15,-0.11 0.12,0 0.13,0.02 0.18,0.14 0.08,0.22 0.36,0.47 0.73,0.47 0.2,0 0.38,-0.08 0.6,-0.18 0.33,-0.15 0.44,-0.15 0.59,-0.15 -0.15,-0.17 -0.24,-0.28 -0.4,-0.44 l -1.63,-1.62 c -0.56,-0.55 -1.04,-1.29 -1.04,-1.39 0,-0.1 0.09,-0.1 0.15,-0.1 0.11,0 0.12,0.02 0.16,0.09 0.14,0.21 0.41,0.66 0.79,0.66 0.22,0 0.3,-0.11 0.47,-0.36 0.16,-0.2 0.31,-0.39 0.62,-0.39 0.97,0 1.51,1.3 1.51,1.54 0,0.1 -0.12,0.1 -0.15,0.1 -0.12,0 -0.13,-0.03 -0.17,-0.16 -0.18,-0.5 -0.66,-0.84 -1.09,-0.84 -0.2,0 -0.36,0.07 -0.56,0.16 -0.29,0.13 -0.41,0.17 -0.61,0.17 -0.05,0 -0.13,0 -0.18,-0.01 0.07,0.08 0.28,0.33 0.55,0.61 z"
    style="fill:#000000;stroke-width:0" />
 </g>    <path
    d="m 226.99,660.11 0.11,0.11 0.1,0.12 0.11,0.11 0.09,0.12 0.05,0.05 0.05,0.06 0.04,0.06 0.04,0.05 0.05,0.06 0.04,0.05 0.04,0.06 0.03,0.05 0.04,0.05 0.03,0.05 0.03,0.04 0.03,0.05 0.03,0.04 0.03,0.04 0.02,0.04 0.02,0.04 0.02,0.03 0.02,0.03 0.01,0.03 0.01,0.02 0.01,0.02 0.01,0.02 0,0.02 0,0.01 c 0,0.1 -0.07,0.1 -0.13,0.1 -0.12,0 -0.13,-0.01 -0.19,-0.13 -0.33,-0.57 -0.46,-0.62 -0.62,-0.62 -0.18,0 -0.28,0.1 -0.47,0.36 -0.12,0.16 -0.29,0.39 -0.61,0.39 -0.73,0 -1.16,-0.94 -1.16,-1.14 0,-0.09 0.07,-0.11 0.15,-0.11 0.12,0 0.13,0.02 0.18,0.14 0.08,0.22 0.36,0.47 0.73,0.47 0.2,0 0.38,-0.08 0.6,-0.18 0.33,-0.15 0.44,-0.15 0.59,-0.15 -0.15,-0.17 -0.24,-0.28 -0.4,-0.44 l -1.63,-1.62 c -0.56,-0.55 -1.04,-1.29 -1.04,-1.39 0,-0.1 0.09,-0.1 0.15,-0.1 0.11,0 0.12,0.02 0.16,0.09 0.14,0.21 0.41,0.66 0.79,0.66 0.22,0 0.3,-0.11 0.47,-0.36 0.16,-0.2 0.31,-0.39 0.62,-0.39 0.97,0 1.51,1.3 1.51,1.54 0,0.1 -0.12,0.1 -0.15,0.1 -0.12,0 -0.13,-0.03 -0.17,-0.16 -0.18,-0.5 -0.66,-0.84 -1.09,-0.84 -0.2,0 -0.36,0.07 -0.56,0.16 -0.29,0.13 -0.41,0.17 -0.61,0.17 -0.05,0 -0.13,0 -0.18,-0.01 0.07,0.08 0.28,0.33 0.55,0.61 z"
    style="fill:#000000;stroke-width:0" />
 </g>    <path

-       sodipodi:nodetypes="ccc"
+       sodipodi:nodetypes="cccc"

        id="path3257"
        id="path3257"

-       d="m 443.7,583.34917 46,0 0,16.1"
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#TriangleOutM)" />
+       d="m 443.7,583.34917 46.3,0.16096 0,18.3 17,0"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:none" />

     <path
        sodipodi:type="arc"
        style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
     <path
        sodipodi:type="arc"
        style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"


@@ -355,14 +407,9 @@
        d="m 93.161316,18.274765 c 0,0.829864 -0.672738,1.502602 -1.502602,1.502602 -0.829864,0 -1.502602,-0.672738 -1.502602,-1.502602 0,-0.829864 0.672738,-1.502602 1.502602,-1.502602 0.829864,0 1.502602,0.672738 1.502602,1.502602 z"
        transform="matrix(0.93153813,0,0,0.93153813,358.08191,566.35403)" />
     <path
        d="m 93.161316,18.274765 c 0,0.829864 -0.672738,1.502602 -1.502602,1.502602 -0.829864,0 -1.502602,-0.672738 -1.502602,-1.502602 0,-0.829864 0.672738,-1.502602 1.502602,-1.502602 0.829864,0 1.502602,0.672738 1.502602,1.502602 z"
        transform="matrix(0.93153813,0,0,0.93153813,358.08191,566.35403)" />
     <path

-       transform="matrix(0.93153813,0,0,0.93153813,404.30691,586.85403)"
-       d="m 93.161316,18.274765 c 0,0.829864 -0.672738,1.502602 -1.502602,1.502602 -0.829864,0 -1.502602,-0.672738 -1.502602,-1.502602 0,-0.829864 0.672738,-1.502602 1.502602,-1.502602 0.829864,0 1.502602,0.672738 1.502602,1.502602 z"
-       sodipodi:ry="1.5026019"
-       sodipodi:rx="1.5026019"
-       sodipodi:cy="18.274765"
-       sodipodi:cx="91.658714"
-       id="path5257"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-       sodipodi:type="arc" />
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 503.1,599.41013 5.5,3.4 -5.5,3.5"
+       id="path4090"
+       sodipodi:nodetypes="ccc" />

   </g>
 </svg>
   </g>
 </svg>