--- a/model/images/Collections.svg Thu Mar 29 22:29:35 2012 +0100
+++ b/model/images/Collections.svg Fri Mar 30 08:10:04 2012 +0100
@@ -1,69 +1,529 @@
-<?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="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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ 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"
+ height="370"
+ version="1.1"
+ width="691"
+ id="svg2"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="Collections.svg">
+ <metadata
+ id="metadata124">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs122">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 185 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="691 : 185 : 1"
+ inkscape:persp3d-origin="345.5 : 123.33333 : 1"
+ id="perspective126" />
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="1001"
+ id="namedview120"
+ showgrid="false"
+ inkscape:zoom="1.7452967"
+ inkscape:cx="345.5"
+ inkscape:cy="185"
+ inkscape:window-x="1280"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <rect
+ fill="#ffffff"
+ height="68"
+ stroke="#ffffff"
+ stroke-width="1"
+ width="74"
+ x="342"
+ y="200"
+ id="rect4" />
+ <rect
+ fill="none"
+ height="68"
+ stroke="#000000"
+ stroke-width="1"
+ width="74"
+ x="342"
+ y="200"
+ id="rect6" />
+ <text
+ font-family="Lucida Grande"
+ font-size="13"
+ x="347"
+ y="214"
+ id="text8">
Collection</text>
-<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">
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="74"
+ x="342"
+ y="224"
+ id="rect10" />
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="74"
+ x="342"
+ y="245"
+ id="rect12" />
+ <rect
+ fill="#ffffff"
+ height="68"
+ stroke="#ffffff"
+ stroke-width="1"
+ width="66"
+ x="342"
+ y="72"
+ id="rect14" />
+ <rect
+ fill="none"
+ height="68"
+ stroke="#000000"
+ stroke-width="1"
+ width="66"
+ x="342"
+ y="72"
+ id="rect16" />
+ <text
+ font-family="Lucida Grande"
+ font-size="13"
+ x="357"
+ y="86"
+ id="text18">
Entity</text>
-<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">
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="66"
+ x="342"
+ y="96"
+ id="rect20" />
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="66"
+ x="342"
+ y="117"
+ id="rect22" />
+ <polyline
+ fill="none"
+ points="382,200 382,140"
+ stroke="#000000"
+ stroke-width="1"
+ id="polyline24" />
+ <polygon
+ fill="#ffffff"
+ points="382,140 389,152 375,152"
+ stroke="#ffffff"
+ stroke-width="1"
+ id="polygon26" />
+ <polygon
+ fill="none"
+ points="382,140 389,152 375,152"
+ stroke="#000000"
+ stroke-width="1"
+ id="polygon28" />
+ <rect
+ fill="#ffffff"
+ height="88"
+ stroke="#ffffff"
+ stroke-width="1"
+ width="67"
+ x="150"
+ y="144"
+ id="rect30" />
+ <rect
+ fill="none"
+ height="88"
+ stroke="#000000"
+ stroke-width="1"
+ width="67"
+ x="150"
+ y="144"
+ id="rect32" />
+ <text
+ font-family="Lucida Grande"
+ font-size="13"
+ x="172"
+ y="158"
+ id="text34">
Pair</text>
-<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">
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="67"
+ x="150"
+ y="168"
+ id="rect36" />
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="67"
+ x="150"
+ y="199"
+ id="rect38" />
+ <polyline
+ fill="none"
+ points="342,240 270,240 270,328 366,328 366,268"
+ stroke="#000000"
+ stroke-width="1"
+ id="polyline40" />
+ <ellipse
+ cx="271"
+ cy="325"
+ fill="#000000"
+ rx="0.5"
+ ry="0.5"
+ stroke="#000000"
+ stroke-width="1"
+ id="ellipse42" />
+ <ellipse
+ cx="272"
+ cy="326"
+ fill="#ffffff"
+ rx="-0.5"
+ ry="-0.5"
+ stroke="#ffffff"
+ stroke-width="1"
+ id="ellipse44" />
+ <rect
+ fill="#ffffff"
+ height="68"
+ stroke="#ffffff"
+ stroke-width="1"
+ width="162"
+ x="78"
+ y="288"
+ id="rect46" />
+ <rect
+ fill="none"
+ height="68"
+ stroke="#000000"
+ stroke-width="1"
+ width="162"
+ x="78"
+ y="288"
+ id="rect48" />
+ <text
+ font-family="Lucida Grande"
+ font-size="13"
+ x="83"
+ y="302"
+ id="text50">
Derivation-by-Insertion</text>
-<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="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">
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="162"
+ x="78"
+ y="312"
+ id="rect52" />
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="162"
+ x="78"
+ y="333"
+ id="rect54" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="271"
+ x2="266"
+ y1="325"
+ y2="325"
+ id="line56" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="261"
+ x2="256"
+ y1="325"
+ y2="325"
+ id="line58" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="251"
+ x2="246"
+ y1="325"
+ y2="325"
+ id="line60" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="241"
+ x2="240"
+ y1="325"
+ y2="325"
+ id="line62" />
+ <polyline
+ points="217,200 342,200"
+ id="polyline64"
+ transform="translate(0,12)"
+ style="fill:none;stroke:#000000;stroke-width:1" />
+ <line
+ x1="330"
+ x2="342"
+ y1="219"
+ y2="212"
+ id="line66"
+ style="fill:#000000;stroke:#000000;stroke-width:1" />
+ <line
+ x1="330"
+ x2="342"
+ y1="205"
+ y2="212"
+ id="line68"
+ style="fill:#000000;stroke:#000000;stroke-width:1" />
+ <text
+ font-size="13"
+ x="242"
+ y="210"
+ id="text70"
+ style="font-size:13px;font-family:Lucida Grande">memberOf</text>
+ <polyline
+ fill="none"
+ points="182,232 182,288"
+ stroke="#000000"
+ stroke-width="1"
+ id="polyline72" />
+ <polyline
+ fill="none"
+ points="190,144 190,96 342,96"
+ stroke="#000000"
+ stroke-width="1"
+ id="polyline74" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="330"
+ x2="342"
+ y1="103"
+ y2="96"
+ id="line76" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="330"
+ x2="342"
+ y1="89"
+ y2="96"
+ id="line78" />
+ <rect
+ fill="#ffffff"
+ height="68"
+ stroke="#ffffff"
+ stroke-width="1"
+ width="66"
+ x="14"
+ y="80"
+ id="rect80" />
+ <rect
+ fill="none"
+ height="68"
+ stroke="#000000"
+ stroke-width="1"
+ width="66"
+ x="14"
+ y="80"
+ id="rect82" />
+ <text
+ font-family="Lucida Grande"
+ font-size="13"
+ x="36"
+ y="94"
+ id="text84">
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">
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="66"
+ x="14"
+ y="104"
+ id="rect86" />
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="66"
+ x="14"
+ y="125"
+ id="rect88" />
+ <polyline
+ fill="none"
+ points="158,144 158,96 80,96"
+ stroke="#000000"
+ stroke-width="1"
+ id="polyline90" />
+ <polyline
+ fill="none"
+ points="416,264 470,264 470,216 416,216"
+ stroke="#000000"
+ stroke-width="1"
+ id="polyline92" />
+ <ellipse
+ cx="468"
+ cy="240"
+ fill="#000000"
+ rx="0.5"
+ ry="0.5"
+ stroke="#000000"
+ stroke-width="1"
+ id="ellipse94" />
+ <ellipse
+ cx="469"
+ cy="241"
+ fill="#ffffff"
+ rx="-0.5"
+ ry="-0.5"
+ stroke="#ffffff"
+ stroke-width="1"
+ id="ellipse96" />
+ <rect
+ fill="#ffffff"
+ height="68"
+ stroke="#ffffff"
+ stroke-width="1"
+ width="159"
+ x="518"
+ y="200"
+ id="rect98" />
+ <rect
+ fill="none"
+ height="68"
+ stroke="#000000"
+ stroke-width="1"
+ width="159"
+ x="518"
+ y="200"
+ id="rect100" />
+ <text
+ font-family="Lucida Grande"
+ font-size="13"
+ x="523"
+ y="214"
+ id="text102">
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"/>
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="159"
+ x="518"
+ y="224"
+ id="rect104" />
+ <rect
+ fill="#000000"
+ height="1"
+ stroke="#000000"
+ stroke-width="1"
+ width="159"
+ x="518"
+ y="245"
+ id="rect106" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="469"
+ x2="474"
+ y1="241"
+ y2="241"
+ id="line108" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="479"
+ x2="484"
+ y1="241"
+ y2="241"
+ id="line110" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="489"
+ x2="494"
+ y1="241"
+ y2="241"
+ id="line112" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="499"
+ x2="504"
+ y1="241"
+ y2="241"
+ id="line114" />
+ <line
+ fill="#000000"
+ stroke="#000000"
+ stroke-width="1"
+ x1="509"
+ x2="514"
+ y1="241"
+ y2="241"
+ id="line116" />
+ <polyline
+ fill="none"
+ points="598,200 598,48 54,48 54,80"
+ stroke="#000000"
+ stroke-width="1"
+ id="polyline118" />
</svg>