--- a/model/uml/essentials.svg Mon May 21 22:57:12 2012 +0100
+++ b/model/uml/essentials.svg Mon May 21 22:57:31 2012 +0100
@@ -59,10 +59,6 @@
/><line y2="14" fill="none" x1="0" clip-path="url(#clipPath1)" x2="80" y1="14"
/></g
><g font-size="11" transform="translate(57,88)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
- ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath2)" stroke="none"
- > id</text
- ><text x="2" xml:space="preserve" y="27" clip-path="url(#clipPath2)" stroke="none"
- > attributes</text
></g
><g font-size="11" transform="translate(57,74)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
><text x="23" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
@@ -76,14 +72,6 @@
/><line y2="14" fill="none" x1="0" clip-path="url(#clipPath4)" x2="80" y1="14"
/></g
><g font-size="11" transform="translate(287,88)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
- ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath5)" stroke="none"
- > id</text
- ><text x="2" xml:space="preserve" y="27" clip-path="url(#clipPath5)" stroke="none"
- > startTime</text
- ><text x="2" xml:space="preserve" y="41" clip-path="url(#clipPath5)" stroke="none"
- > endTime</text
- ><text x="2" xml:space="preserve" y="55" clip-path="url(#clipPath5)" stroke="none"
- > attributes</text
></g
><g font-size="11" transform="translate(287,74)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
><text x="18" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
@@ -97,10 +85,6 @@
/><line y2="14" fill="none" x1="0" clip-path="url(#clipPath1)" x2="80" y1="14"
/></g
><g font-size="11" transform="translate(57,248)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
- ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath2)" stroke="none"
- > id</text
- ><text x="2" xml:space="preserve" y="27" clip-path="url(#clipPath2)" stroke="none"
- > attributes</text
></g
><g font-size="11" transform="translate(57,234)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
><text x="22" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
@@ -167,8 +151,6 @@
>used</text
></g
><g fill="rgb(120,120,120)" text-rendering="geometricPrecision" fill-opacity="1" font-size="8" stroke-opacity="1" stroke="rgb(120,120,120)"
- ><text x="0" xml:space="preserve" y="10" stroke="none"
- >Visual Paradigm for UML Standard Edition(University of Southampton)</text
></g
></g
></svg
--- a/model/working-copy/wd6-prov-dm-with-core.html Mon May 21 22:57:12 2012 +0100
+++ b/model/working-copy/wd6-prov-dm-with-core.html Mon May 21 22:57:31 2012 +0100
@@ -404,8 +404,8 @@
<div style="text-align: center; ">
<figure style="max-width: 70%; " >
-<!-- <img src="uml/essentials.svg" alt="PROV Core Structures" style="max-width: 70%; " /> -->
- <img src="../images/OverviewDiagram.png" alt="PROV Core Structures" style="max-width: 70%; " />
+<!-- <img src="../images/OverviewDiagram.png" alt="PROV Core Structures" style="max-width: 70%; " /> -->
+<img src="../uml/essentials.svg" alt="PROV Core Structures" style="max-width: 70%; " />
<figcaption id="prov-core-structures">Figure 1: PROV Core Structures</figcaption>
</figure>
</div>
@@ -421,11 +421,11 @@
<caption id="overview-types-and-relations">Table 2: Mapping of Provenance concepts to types and relations</caption>
<tr><td><a><b>PROV Concepts</b></a></td><td><b>PROV-DM types or relations</b></td><td><b>Name</b></td></tr>
<tr>
-<td><a>Entity</a></td><td rowspan="3">PROV-DM Types</td><td><a title="dfn-Entity">entity</a></td></tr>
+<td><a>Entity</a></td><td rowspan="3" style="text-align: center;">PROV-DM Types</td><td><a title="dfn-Entity">entity</a></td></tr>
<tr><td><a>Activity</a></td><td><a title="dfn-Activity">activity</a></td></tr>
<tr><td><a>Agent</a></td><td><a title="dfn-agent">agent</a></td></tr>
<tr>
-<td><a>Generation</a></td><td rowspan="6">PROV-DM Relations</td><td><a title="wasGeneratedBy">wasGeneratedBy</a></td></tr>
+<td><a>Generation</a></td><td rowspan="6" style="text-align: center;">PROV-DM Relations</td><td><a title="wasGeneratedBy">wasGeneratedBy</a></td></tr>
<tr><td><a>Usage</a></td><td><a title="used">used</a></td></tr>
<tr><td><a>Attribution</a></td><td><a title="wasAttributedTo">wasAttributedTo</a></td></tr>
<tr><td><a>Association</a></td><td><a title="wasAssociatedWith">wasAssociatedWith</a></td></tr>
@@ -1140,7 +1140,8 @@
<p>
While not all PROV-DM relations are binary, they all involve two primary elements. Hence, <a href="#relations-at-a-glance">Table 3</a> indexes all relations according to their two primary elements. The table adopts the same color scheme as <a href="#prov-dm-components">Figure 4</a>, allowing components to be readily identified.
Note that for simplicity, this table does not include bundle-oriented and collection-oriented relations.
-Relation names appearing in bold correspond to the essential concepts introduced in the <a href="#starting-points">Starting Points Section</a>.</p>
+Relation names appearing in bold correspond to the core structures introduced
+in <a href="#core-structures">Section 2.1</a>.</p>
</p>
<div id="relations-at-a-glance-div" style="text-align: center;">
@@ -1155,7 +1156,7 @@
</table>
</div>
-<p><a href="#prov-dm-types-and-relations">Table 4</a> is a complete index of all the types and relations of PROV-DM, color-coded according to the component they belong to. In the first column, concept names link to their informal definition, whereas, in the second column, representations link to the information used to represent the concept. Concept names appearing in bold are the essential concepts introduced in the <a href="#starting-points">Starting Points Section</a>.</p>
+<p><a href="#prov-dm-types-and-relations">Table 4</a> is a complete index of all the types and relations of PROV-DM, color-coded according to the component they belong to. In the first column, concept names link to their informal definition, whereas, in the second column, representations link to the information used to represent the concept. Concept names appearing in bold are the core structures introduced in <a href="#core-structures">Section 2.1</a>.</p>
<div id="prov-dm-types-and-relations-fig" style="text-align: left;">