X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Fdsd-paper.git;a=blobdiff_plain;f=choice-case.svg;h=75701d1e98721195f3b49c611756a7839b66269e;hp=1eea0a744daea047fafca0b1a6920b0e5d4676e1;hb=be5b558f00c76c7190c5647d2f6e3e42003035fb;hpb=0e8500ea330813277f7cbea455b1760a9dad83c1;ds=sidebyside

diff --git a/choice-case.svg b/choice-case.svg
index 1eea0a7..75701d1 100644
--- a/choice-case.svg
+++ b/choice-case.svg
@@ -11,7 +11,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="172.75"
-   height="124.43002"
+   height="144.93002"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
@@ -23,12 +23,12 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.1106557"
-     inkscape:cx="228.11635"
-     inkscape:cy="26.631212"
+     inkscape:zoom="3.8827838"
+     inkscape:cx="72.928543"
+     inkscape:cy="40.778119"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="true"
+     showgrid="false"
      inkscape:snap-grids="true"
      inkscape:window-width="1091"
      inkscape:window-height="778"
@@ -114,8 +114,8 @@
     <rect
        style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
        id="rect6192"
-       width="140"
-       height="115"
+       width="139.5"
+       height="135.5"
        x="20"
        y="-0.58998108"
        transform="translate(368.36,548.2495)" />
@@ -151,7 +151,7 @@
 </g>    <g
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:none;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="g3863"
-       transform="matrix(1,0,0,-1,151.32988,1250.9995)"
+       transform="matrix(1,0,0,-1,151.32988,1251.5995)"
        xml:space="preserve"
        stroke-miterlimit="10.433"
        font-style="normal"
@@ -180,7 +180,7 @@
        font-style="normal"
        stroke-miterlimit="10.433"
        xml:space="preserve"
-       transform="matrix(1,0,0,-1,144.90488,1312.0082)"
+       transform="matrix(1,0,0,-1,144.90488,1314.7085)"
        id="g2979">
 <path
    style="fill:#000000;stroke-width:0"
@@ -199,7 +199,7 @@
    id="path2987"
    d="m 241.84,663.9 0,0 0.01,0 0,0.01 0,0 0,0 0,0.01 0,0 0,0.01 0,0 0.01,0.01 0,0.01 0,0.01 0,0.01 0.01,0.01 0,0 0,0 0,0.01 0,0 0,0.01 0,0 0,0.01 0,0 0,0 0,0.01 0,0 0,0 0,0 0,0.01 c 0,0.09 -0.06,0.12 -0.13,0.12 -0.03,0 -0.14,-0.01 -0.17,-0.02 l -0.98,-0.08 c -0.12,-0.01 -0.23,-0.02 -0.23,-0.21 0,-0.11 0.1,-0.11 0.24,-0.11 0.48,0 0.5,-0.07 0.5,-0.17 0,-0.03 -0.03,-0.16 -0.03,-0.17 l -0.58,-2.33 c -0.15,0.31 -0.42,0.58 -0.84,0.58 v -0.22 c 0.08,0 0.31,-0.01 0.49,-0.29 0.1,-0.16 0.2,-0.45 0.2,-0.64 0,-0.03 -0.01,-0.07 -0.03,-0.13 l -0.48,-1.91 c -0.08,-0.31 -0.69,-1.11 -1.23,-1.11 -0.47,0 -0.55,0.59 -0.55,0.89 0,0.5 0.31,1.66 0.49,2.08 0.25,0.61 0.7,1.11 1.11,1.11 v 0.22 c -1.1,0 -2.28,-1.52 -2.28,-2.97 0,-0.85 0.46,-1.55 1.21,-1.55 0.35,0 0.79,0.21 1.19,0.7 0.11,-0.49 0.48,-0.7 0.83,-0.7 0.37,0 0.58,0.25 0.73,0.56 0.18,0.38 0.29,0.96 0.29,0.98 0,0.1 -0.08,0.1 -0.14,0.1 -0.12,0 -0.13,-0.01 -0.19,-0.23 -0.14,-0.56 -0.33,-1.19 -0.67,-1.19 -0.26,0 -0.26,0.27 -0.26,0.41 0,0.07 0,0.22 0.06,0.46 z" />
 </g>    <g
-       transform="translate(-75.34,-10)"
+       transform="translate(-75.428753,-10)"
        id="g5140">
       <g
          transform="translate(118.2,-6.1899623)"
@@ -236,7 +236,7 @@
 </g>      </g>
     </g>
     <g
-       transform="translate(-67.625,71.145019)"
+       transform="translate(-67.228753,71.145019)"
        id="g4438">
       <path
          transform="translate(489,516.3654)"
@@ -277,7 +277,7 @@
    id="path3589" />
 </g>    </g>
     <g
-       transform="translate(-12.14,57.380016)"
+       transform="translate(-12.228753,57.380016)"
        id="g4579">
       <path
          transform="translate(434,506.3654)"
@@ -426,7 +426,7 @@
        sodipodi:nodetypes="ccc" />
     <g
        id="g5380"
-       transform="matrix(1,0,0,-1,-74.24,1214.8191)">
+       transform="matrix(1,0,0,-1,-75.428753,1214.8191)">
       <g
          id="g5382"
          transform="translate(118.2,-6.1899623)">
@@ -502,7 +502,7 @@
 </g>    <path
        sodipodi:nodetypes="cc"
        id="path5414"
-       d="m 473.18,642.15956 13,0"
+       d="m 471.58,642.15956 14.6,0"
        style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
     <path
        sodipodi:type="arc"
@@ -562,7 +562,7 @@
     <path
        sodipodi:nodetypes="ccc"
        id="path5432"
-       d="m 368.36,657.65952 151,0 0,-46"
+       d="m 471.66,666.15952 47.7,0 0,-54.5"
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
     <path
        id="path5434"
@@ -584,5 +584,95 @@
        id="path6186"
        d="m 524.36,602.65952 15,0"
        style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
-  </g>
+    <g
+       id="g2899"
+       transform="translate(-12.228753,133.38002)">
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;stroke:#000000"
+         id="path2901"
+         sodipodi:cx="40"
+         sodipodi:cy="26.984081"
+         sodipodi:rx="10"
+         sodipodi:ry="10"
+         d="m 50,26.984081 c 0,5.522848 -4.477153,10 -10,10 -5.522847,0 -10,-4.477152 -10,-10 0,-5.522847 4.477153,-10 10,-10 5.522847,0 10,4.477153 10,10 z"
+         transform="translate(434,506.3654)" />
+      <g
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:none;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         ns0:preamble=""
+         ns0:text="$\\equiv$\n\n\n\n\n"
+         word-spacing="normal"
+         letter-spacing="normal"
+         font-size-adjust="none"
+         font-stretch="normal"
+         font-weight="normal"
+         font-variant="normal"
+         font-style="normal"
+         stroke-miterlimit="10.433"
+         xml:space="preserve"
+         transform="matrix(1,0,0,-1,246.72,1192.8695)"
+         id="g2903">
+<path
+   style="fill:#000000;stroke-width:0"
+   id="path2905"
+   d="m 230.27,661.46 0.03,0 0.03,0 0.03,0 0.02,0 0.01,0 0.02,0 0.02,0 0.01,0.01 0.01,0 0.02,0 0.01,0 0.02,0.01 0.01,0 0.01,0.01 0.01,0 0.02,0.01 0.01,0.01 0.01,0 0.01,0.01 0.01,0.01 0,0.01 0.01,0.01 0,0 0,0.01 0.01,0 0,0.01 0,0.01 0.01,0 0,0.01 0,0.01 0,0.01 0,0 0,0.01 0,0.01 0.01,0.01 0,0.01 0,0.01 c 0,0.19 -0.18,0.19 -0.35,0.19 h -5.95 c -0.17,0 -0.35,0 -0.35,-0.19 0,-0.2 0.2,-0.2 0.36,-0.2 z" />
+<path
+   style="fill:#000000;stroke-width:0"
+   id="path2907"
+   d="m 230.28,657.59 0.03,0 0.03,0 0.03,0 0.02,0 0.01,0 0.02,0.01 0.01,0 0.02,0 0.01,0 0.02,0 0.01,0.01 0.01,0 0.01,0.01 0.02,0 0.01,0.01 0.01,0 0.01,0.01 0.01,0.01 0.01,0.01 0.01,0 0.01,0.01 0,0.01 0,0.01 0.01,0 0,0.01 0,0 0,0.01 0.01,0.01 0,0 0,0.01 0,0.01 0,0.01 0,0 0,0.01 0.01,0.01 0,0.01 0,0.01 c 0,0.2 -0.19,0.2 -0.36,0.2 h -5.93 c -0.16,0 -0.36,0 -0.36,-0.2 0,-0.2 0.18,-0.2 0.35,-0.2 z" />
+<path
+   style="fill:#000000;stroke-width:0"
+   id="path2909"
+   d="m 230.28,659.52 0.03,0 0.03,0 0.03,0.01 0.02,0 0.01,0 0.02,0 0.01,0 0.02,0 0.01,0 0.02,0.01 0.01,0 0.01,0 0.01,0.01 0.02,0 0.01,0.01 0.01,0.01 0.01,0 0.01,0.01 0.01,0.01 0.01,0.01 0.01,0.01 0,0 0,0.01 0.01,0 0,0.01 0,0.01 0,0 0.01,0.01 0,0.01 0,0 0,0.01 0,0.01 0,0.01 0,0.01 0.01,0 0,0.01 0,0.01 c 0,0.2 -0.18,0.2 -0.35,0.2 h -5.95 c -0.17,0 -0.35,0 -0.35,-0.2 0,-0.2 0.18,-0.2 0.35,-0.2 z" />
+</g>    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)"
+       d="m 368.36,660.85952 83.7,0"
+       id="path2911"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path2913"
+       d="m 440.76,671.95952 11,0"
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+    <g
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:none;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       ns0:preamble=""
+       ns0:text="$\\mathit{Equiv}$\n\n\n\n\n\n\n"
+       word-spacing="normal"
+       letter-spacing="normal"
+       font-size-adjust="none"
+       font-stretch="normal"
+       font-weight="normal"
+       font-variant="normal"
+       font-style="normal"
+       stroke-miterlimit="10.433"
+       xml:space="preserve"
+       transform="matrix(1,0,0,-1,191.39491,1331.6142)"
+       id="g3199">
+<path
+   id="path3201"
+   d="m 230.24,659.57 0,0 0,0.01 0,0 0,0 0,0 0,0 0,0.01 0,0 0.01,0.01 0,0 0,0 0,0.01 0,0 0,0.01 0.01,0.01 0,0.01 0,0 0,0.01 0.01,0 0,0.01 0,0 0,0 0,0.01 0,0 0,0.01 0,0 0,0 0.01,0 0,0.01 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 c 0,0.11 -0.12,0.11 -0.15,0.11 -0.11,0 -0.12,-0.01 -0.21,-0.24 -0.58,-1.37 -0.93,-2.02 -2.51,-2.02 h -1.22 c -0.31,0 -0.31,0.03 -0.31,0.1 0,0.06 0.03,0.16 0.04,0.22 l 0.69,2.74 h 0.87 c 0.67,0 0.75,-0.16 0.75,-0.43 0,-0.07 -0.02,-0.22 -0.1,-0.51 0,-0.02 -0.01,-0.08 -0.01,-0.11 0,-0.12 0.09,-0.12 0.15,-0.12 0.11,0 0.14,0.02 0.18,0.2 l 0.55,2.2 c 0.01,0.02 0.03,0.1 0.03,0.13 0,0.11 -0.12,0.11 -0.16,0.11 -0.13,0 -0.13,-0.03 -0.19,-0.23 -0.19,-0.71 -0.38,-0.93 -1.18,-0.93 h -0.81 l 0.61,2.45 c 0.08,0.33 0.15,0.34 0.48,0.34 h 1.24 c 1.08,0 1.33,-0.3 1.33,-1.01 0,-0.27 -0.02,-0.4 -0.05,-0.64 -0.01,-0.04 -0.02,-0.14 -0.02,-0.16 0,-0.12 0.11,-0.12 0.15,-0.12 0.14,0 0.15,0.03 0.17,0.21 l 0.22,1.77 c 0.03,0.26 -0.03,0.26 -0.23,0.26 h -4.66 c -0.17,0 -0.27,0 -0.27,-0.18 0,-0.13 0.07,-0.13 0.27,-0.13 0.58,0 0.58,-0.08 0.58,-0.17 0,-0.01 0,-0.08 -0.04,-0.23 l -1.33,-5.34 c -0.08,-0.34 -0.14,-0.42 -0.82,-0.42 -0.16,0 -0.27,0 -0.27,-0.19 0,-0.12 0.09,-0.12 0.25,-0.12 h 4.77 c 0.2,0 0.21,0.01 0.28,0.16 z"
+   style="fill:#000000;stroke-width:0" />
+<path
+   id="path3203"
+   d="m 235.11,661.39 0,0 0,0 0,0.01 0.01,0 0,0 0,0.01 0,0 0,0.01 0,0 0,0.01 0.01,0.01 0,0.01 0,0.01 0,0.01 0,0 0,0 0.01,0.01 0,0 0,0.01 0,0 0,0.01 0,0 0,0 0,0.01 0,0 0,0 0,0 0,0.01 c 0,0.09 -0.08,0.11 -0.11,0.11 -0.11,0 -0.47,-0.35 -0.63,-0.63 -0.11,0.29 -0.37,0.64 -0.85,0.64 v -0.22 c 0.08,0 0.31,-0.01 0.49,-0.29 0.09,-0.16 0.2,-0.45 0.2,-0.64 0,-0.03 -0.01,-0.07 -0.03,-0.13 l -0.48,-1.91 c -0.08,-0.31 -0.69,-1.11 -1.24,-1.11 -0.47,0 -0.55,0.59 -0.55,0.89 0,0.5 0.31,1.66 0.49,2.08 0.25,0.61 0.71,1.11 1.12,1.11 v 0.22 c -1.11,0 -2.28,-1.52 -2.28,-2.97 0,-0.85 0.45,-1.55 1.2,-1.55 0.41,0 0.78,0.26 1.06,0.53 l -0.39,-1.56 c -0.11,-0.43 -0.12,-0.47 -0.76,-0.48 -0.13,0 -0.24,0 -0.24,-0.19 0,-0.09 0.06,-0.12 0.13,-0.12 0.32,0 0.67,0.03 1,0.03 0.33,0 0.69,-0.03 1,-0.03 0.06,0 0.19,0 0.19,0.19 0,0.12 -0.1,0.12 -0.23,0.12 -0.51,0 -0.51,0.06 -0.51,0.16 0,0.07 0.02,0.12 0.03,0.18 z"
+   style="fill:#000000;stroke-width:0" />
+<path
+   id="path3205"
+   d="m 239.88,661.13 0.01,0.01 0,0.01 0,0.01 0.01,0.01 0,0.01 0,0.01 0,0.01 0.01,0.01 0,0 0,0.01 0,0 0,0.01 0,0 0,0 0,0.01 0,0 0,0 0,0.01 0,0 0,0 0,0.01 0,0 0,0 0,0.01 c 0,0.11 -0.08,0.26 -0.28,0.26 -0.29,0 -0.36,-0.29 -0.38,-0.37 l -0.73,-2.91 c -0.05,-0.18 -0.05,-0.2 -0.14,-0.33 -0.19,-0.28 -0.48,-0.58 -0.92,-0.58 -0.45,0 -0.54,0.44 -0.54,0.77 0,0.61 0.33,1.5 0.58,2.18 0.08,0.21 0.13,0.35 0.13,0.54 0,0.5 -0.33,0.81 -0.75,0.81 -0.93,0 -1.28,-1.48 -1.28,-1.54 0,-0.1 0.1,-0.1 0.15,-0.1 0.13,0 0.14,0.02 0.18,0.16 0.08,0.31 0.35,1.26 0.92,1.26 0.11,0 0.22,-0.03 0.22,-0.29 0,-0.24 -0.1,-0.51 -0.23,-0.9 -0.26,-0.7 -0.52,-1.43 -0.52,-1.95 0,-0.87 0.58,-1.16 1.11,-1.16 0.53,0 0.87,0.3 1.11,0.6 0.18,-0.54 0.61,-0.6 0.8,-0.6 0.36,0 0.57,0.25 0.72,0.56 0.18,0.38 0.3,0.96 0.3,0.98 0,0.1 -0.08,0.1 -0.15,0.1 -0.12,0 -0.13,-0.01 -0.19,-0.23 -0.14,-0.56 -0.33,-1.19 -0.67,-1.19 -0.25,0 -0.25,0.27 -0.25,0.41 0,0.07 0,0.23 0.07,0.51 z"
+   style="fill:#000000;stroke-width:0" />
+<path
+   id="path3207"
+   d="m 243.42,658.66 0,0 0,0.01 0,0 0,0 0,0.01 0,0 0,0.01 -0.01,0 0,0 0,0.01 0,0 0,0 0,0.01 0,0 0,0 -0.01,0 0,0.01 0,0 0,0 -0.01,0.01 0,0 -0.01,0.01 0,0 -0.01,0 0,0 -0.01,0.01 0,0 -0.01,0 0,0 -0.01,0 -0.01,0 0,0 -0.01,0.01 -0.01,0 0,0 -0.02,0 -0.01,0 -0.01,0 c -0.13,0 -0.13,-0.02 -0.17,-0.17 -0.08,-0.29 -0.35,-1.25 -0.93,-1.25 -0.08,0 -0.22,0.01 -0.22,0.28 0,0.26 0.13,0.59 0.26,0.96 l 0.64,1.7 c 0.1,0.29 0.12,0.37 0.12,0.56 0,0.55 -0.38,0.8 -0.75,0.8 -0.93,0 -1.27,-1.49 -1.27,-1.54 0,-0.1 0.1,-0.1 0.15,-0.1 0.13,0 0.14,0.02 0.18,0.16 0.09,0.33 0.34,1.26 0.92,1.26 0.11,0 0.22,-0.05 0.22,-0.28 0,-0.24 -0.11,-0.53 -0.18,-0.72 l -0.3,-0.83 c -0.13,-0.32 -0.25,-0.65 -0.37,-0.98 -0.14,-0.38 -0.17,-0.49 -0.17,-0.69 0,-0.39 0.23,-0.8 0.75,-0.8 0.94,0 1.27,1.5 1.27,1.54 z"
+   style="fill:#000000;stroke-width:0" />
+<path
+   id="path3209"
+   d="m 243.37,663.44 0,0.01 0,0.01 0,0.01 0,0.01 -0.01,0.01 0,0.01 0,0.02 -0.01,0.02 0,0.02 -0.01,0.02 -0.01,0.02 0,0.01 -0.01,0.02 -0.01,0.01 -0.01,0.01 -0.01,0.01 -0.01,0.02 -0.02,0.01 -0.01,0.01 -0.01,0.01 -0.01,0 -0.02,0.01 -0.01,0.01 -0.02,0.01 -0.01,0 -0.01,0.01 -0.02,0 -0.01,0.01 -0.02,0 -0.01,0 -0.02,0 -0.01,0.01 -0.01,0 -0.02,0 -0.01,0 c -0.21,0 -0.48,-0.2 -0.48,-0.48 0,-0.25 0.2,-0.33 0.34,-0.33 0.2,0 0.48,0.19 0.48,0.48 z"
+   style="fill:#000000;stroke-width:0" />
+<path
+   id="path3211"
+   d="m 248.08,660.98 0,0.03 0,0.03 0,0.03 0,0.04 0,0.03 -0.01,0.03 0,0.03 -0.01,0.03 -0.01,0.03 0,0.03 -0.01,0.02 -0.01,0.03 -0.01,0.03 -0.01,0.02 -0.01,0.02 -0.01,0.03 -0.01,0.02 -0.02,0.02 -0.01,0.02 -0.02,0.02 -0.01,0.02 -0.02,0.01 -0.02,0.02 -0.02,0.01 -0.02,0.01 -0.02,0.02 -0.02,0 -0.02,0.01 -0.03,0.01 -0.02,0 -0.03,0.01 -0.02,0 c -0.23,0 -0.48,-0.23 -0.48,-0.46 0,-0.13 0.07,-0.2 0.13,-0.27 0.24,-0.26 0.27,-0.58 0.27,-0.79 0,-0.28 -0.47,-2.78 -1.62,-2.78 -0.54,0 -0.65,0.5 -0.65,0.83 0,0.58 0.32,1.44 0.59,2.16 0.05,0.16 0.11,0.31 0.11,0.5 0,0.5 -0.33,0.81 -0.76,0.81 -0.92,0 -1.27,-1.48 -1.27,-1.54 0,-0.1 0.1,-0.1 0.15,-0.1 0.13,0 0.14,0.02 0.18,0.16 0.08,0.31 0.35,1.26 0.93,1.26 0.1,0 0.21,-0.03 0.21,-0.29 0,-0.24 -0.1,-0.51 -0.23,-0.9 -0.31,-0.85 -0.51,-1.44 -0.51,-1.91 0,-0.91 0.63,-1.2 1.22,-1.2 1.68,0 2.13,3.6 2.13,3.86 z"
+   style="fill:#000000;stroke-width:0" />
+</g>  </g>
 </svg>