--- a/model/images/Collections.svg Thu Mar 29 16:40:45 2012 +0100
+++ b/model/images/Collections.svg Thu Mar 29 16:44:08 2012 +0100
@@ -1,52 +1,69 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg height="322" version="1.1" width="516" xmlns="http://www.w3.org/2000/svg">
-<rect fill="#ffffff" height="68" stroke="#ffffff" stroke-width="1" width="74" x="278" y="152"/>
-<rect fill="none" height="68" stroke="#000000" stroke-width="1" width="74" x="278" y="152"/>
-<text font-family="Lucida Grande" font-size="13" x="283" y="166">
+<svg height="370" version="1.1" width="691" xmlns="http://www.w3.org/2000/svg">
+<rect fill="#ffffff" height="68" stroke="#ffffff" stroke-width="1" width="74" x="342" y="200"/>
+<rect fill="none" height="68" stroke="#000000" stroke-width="1" width="74" x="342" y="200"/>
+<text font-family="Lucida Grande" font-size="13" x="347" y="214">
Collection</text>
-<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="74" x="278" y="176"/>
-<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="74" x="278" y="197"/>
-<rect fill="#ffffff" height="68" stroke="#ffffff" stroke-width="1" width="66" x="278" y="24"/>
-<rect fill="none" height="68" stroke="#000000" stroke-width="1" width="66" x="278" y="24"/>
-<text font-family="Lucida Grande" font-size="13" x="293" y="38">
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="74" x="342" y="224"/>
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="74" x="342" y="245"/>
+<rect fill="#ffffff" height="68" stroke="#ffffff" stroke-width="1" width="66" x="342" y="72"/>
+<rect fill="none" height="68" stroke="#000000" stroke-width="1" width="66" x="342" y="72"/>
+<text font-family="Lucida Grande" font-size="13" x="357" y="86">
Entity</text>
-<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="66" x="278" y="48"/>
-<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="66" x="278" y="69"/>
-<polyline fill="none" points="318,152 318,92" stroke="#000000" stroke-width="1"/>
-<polygon fill="#ffffff" points="318,92 325,104 311,104" stroke="#ffffff" stroke-width="1"/>
-<polygon fill="none" points="318,92 325,104 311,104" stroke="#000000" stroke-width="1"/>
-<rect fill="#ffffff" height="88" stroke="#ffffff" stroke-width="1" width="67" x="86" y="96"/>
-<rect fill="none" height="88" stroke="#000000" stroke-width="1" width="67" x="86" y="96"/>
-<text font-family="Lucida Grande" font-size="13" x="108" y="110">
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="66" x="342" y="96"/>
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="66" x="342" y="117"/>
+<polyline fill="none" points="382,200 382,140" stroke="#000000" stroke-width="1"/>
+<polygon fill="#ffffff" points="382,140 389,152 375,152" stroke="#ffffff" stroke-width="1"/>
+<polygon fill="none" points="382,140 389,152 375,152" stroke="#000000" stroke-width="1"/>
+<rect fill="#ffffff" height="88" stroke="#ffffff" stroke-width="1" width="67" x="150" y="144"/>
+<rect fill="none" height="88" stroke="#000000" stroke-width="1" width="67" x="150" y="144"/>
+<text font-family="Lucida Grande" font-size="13" x="172" y="158">
Pair</text>
-<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="67" x="86" y="120"/>
-<text font-family="Lucida Grande" font-size="13" x="90" y="135">
-key</text>
-<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="67" x="86" y="153"/>
-<polyline fill="none" points="278,192 206,192 206,280 302,280 302,220" stroke="#000000" stroke-width="1"/>
-<ellipse cx="207" cy="277" fill="#000000" rx="0.5" ry="0.5" stroke="#000000" stroke-width="1"/>
-<ellipse cx="208" cy="278" fill="#ffffff" rx="-0.5" ry="-0.5" stroke="#ffffff" stroke-width="1"/>
-<rect fill="#ffffff" height="68" stroke="#ffffff" stroke-width="1" width="162" x="14" y="240"/>
-<rect fill="none" height="68" stroke="#000000" stroke-width="1" width="162" x="14" y="240"/>
-<text font-family="Lucida Grande" font-size="13" x="19" y="254">
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="67" x="150" y="168"/>
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="67" x="150" y="199"/>
+<polyline fill="none" points="342,240 270,240 270,328 366,328 366,268" stroke="#000000" stroke-width="1"/>
+<ellipse cx="271" cy="325" fill="#000000" rx="0.5" ry="0.5" stroke="#000000" stroke-width="1"/>
+<ellipse cx="272" cy="326" fill="#ffffff" rx="-0.5" ry="-0.5" stroke="#ffffff" stroke-width="1"/>
+<rect fill="#ffffff" height="68" stroke="#ffffff" stroke-width="1" width="162" x="78" y="288"/>
+<rect fill="none" height="68" stroke="#000000" stroke-width="1" width="162" x="78" y="288"/>
+<text font-family="Lucida Grande" font-size="13" x="83" y="302">
Derivation-by-Insertion</text>
-<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="162" x="14" y="264"/>
-<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="162" x="14" y="285"/>
-<line fill="#000000" stroke="#000000" stroke-width="1" x1="207" x2="202" y1="277" y2="277"/>
-<line fill="#000000" stroke="#000000" stroke-width="1" x1="197" x2="192" y1="277" y2="277"/>
-<line fill="#000000" stroke="#000000" stroke-width="1" x1="187" x2="182" y1="277" y2="277"/>
-<line fill="#000000" stroke="#000000" stroke-width="1" x1="177" x2="176" y1="277" y2="277"/>
-<polyline fill="none" points="153,152 278,152" stroke="#000000" stroke-width="1"/>
-<line fill="#000000" stroke="#000000" stroke-width="1" x1="266" x2="278" y1="159" y2="152"/>
-<line fill="#000000" stroke="#000000" stroke-width="1" x1="266" x2="278" y1="145" y2="152"/>
-<text font-family="Lucida Grande" font-size="13" x="165" y="138">
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="162" x="78" y="312"/>
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="162" x="78" y="333"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="271" x2="266" y1="325" y2="325"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="261" x2="256" y1="325" y2="325"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="251" x2="246" y1="325" y2="325"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="241" x2="240" y1="325" y2="325"/>
+<polyline fill="none" points="217,200 342,200" stroke="#000000" stroke-width="1"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="330" x2="342" y1="207" y2="200"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="330" x2="342" y1="193" y2="200"/>
+<text font-family="Lucida Grande" font-size="13" x="252" y="186">
Membership</text>
-<polyline fill="none" points="118,184 118,240" stroke="#000000" stroke-width="1"/>
-<polyline fill="none" points="352,208 502,208 502,168 352,168" stroke="#000000" stroke-width="1"/>
-<text font-family="Lucida Grande" font-size="13" x="409" y="193">
-Derivation-by-Removal(key)</text>
-<polyline fill="none" points="126,96 126,48 278,48" stroke="#000000" stroke-width="1"/>
-<line fill="#000000" stroke="#000000" stroke-width="1" x1="266" x2="278" y1="55" y2="48"/>
-<line fill="#000000" stroke="#000000" stroke-width="1" x1="266" x2="278" y1="41" y2="48"/>
+<polyline fill="none" points="182,232 182,288" stroke="#000000" stroke-width="1"/>
+<polyline fill="none" points="190,144 190,96 342,96" stroke="#000000" stroke-width="1"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="330" x2="342" y1="103" y2="96"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="330" x2="342" y1="89" y2="96"/>
+<rect fill="#ffffff" height="68" stroke="#ffffff" stroke-width="1" width="66" x="14" y="80"/>
+<rect fill="none" height="68" stroke="#000000" stroke-width="1" width="66" x="14" y="80"/>
+<text font-family="Lucida Grande" font-size="13" x="36" y="94">
+Key</text>
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="66" x="14" y="104"/>
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="66" x="14" y="125"/>
+<polyline fill="none" points="158,144 158,96 80,96" stroke="#000000" stroke-width="1"/>
+<polyline fill="none" points="416,264 470,264 470,216 416,216" stroke="#000000" stroke-width="1"/>
+<ellipse cx="468" cy="240" fill="#000000" rx="0.5" ry="0.5" stroke="#000000" stroke-width="1"/>
+<ellipse cx="469" cy="241" fill="#ffffff" rx="-0.5" ry="-0.5" stroke="#ffffff" stroke-width="1"/>
+<rect fill="#ffffff" height="68" stroke="#ffffff" stroke-width="1" width="159" x="518" y="200"/>
+<rect fill="none" height="68" stroke="#000000" stroke-width="1" width="159" x="518" y="200"/>
+<text font-family="Lucida Grande" font-size="13" x="523" y="214">
+Derivation-by-Removal</text>
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="159" x="518" y="224"/>
+<rect fill="#000000" height="1" stroke="#000000" stroke-width="1" width="159" x="518" y="245"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="469" x2="474" y1="241" y2="241"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="479" x2="484" y1="241" y2="241"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="489" x2="494" y1="241" y2="241"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="499" x2="504" y1="241" y2="241"/>
+<line fill="#000000" stroke="#000000" stroke-width="1" x1="509" x2="514" y1="241" y2="241"/>
+<polyline fill="none" points="598,200 598,48 54,48 54,80" stroke="#000000" stroke-width="1"/>
</svg>
