--- a/model/prov-dm.html Wed Jun 06 10:06:56 2012 +0100
+++ b/model/prov-dm.html Wed Jun 06 11:43:06 2012 +0100
@@ -2763,7 +2763,7 @@
A collection is an entity that has some members. The members are themselves entities, and therefore their provenance can be expressed. Some applications need to be able to express the provenance of the collection itself: e.g. who maintains the collection, which members it contains as it evolves, and how it was assembled. The purpose of Component 6 is to define the types and relations that are useful to express the provenance of collections. In PROV, the concept of Collection is implemented by means of dictionaries, which we introduce in this section. </p>
<p><a href="#figure-component6">Figure 10</a> depicts
-the sixth component with three new classes (Collection, Dictionary, and Pair) and three associations (insertion, removal, and memberOf).
+the sixth component with four new classes (Collection, Dictionary, EmptyDictionary, and Pair) and three associations (insertion, removal, and memberOf).
</p>
@@ -2859,7 +2859,7 @@
</div>
<p>
-An Insertion relation <span class="name">derivedByInsertionFrom(id; d2, d1, {(key_1, e_1), ..., (key_n, e_n)})</span> states that <span class="name">d2</span> is the state of the dictionary
+An Insertion relation <span class="name">derivedByInsertionFrom(id; d2, d1, {(key_1, e_1), ..., (key_n, e_n)})</span> states that <span class="name">d2</span> is the dictionary
following the insertion of pairs <span class="name">(key_1, e_1)</span>, ..., <span class="name">(key_n, e_n)</span> into dictionary <span class="name">d1</span>.</p>
@@ -2934,7 +2934,7 @@
</ul>
</div>
-<p>A Removal relation <span class="name">derivedByRemovalFrom(id; d2,d1, {key_1, ..., key_n})</span> states that <span class="name">d2</span> is the state of the dictionary following the removal of the set of pairs corresponding to keys <span class="name">key_1...key_n</span> from <span class="name">d1</span>.
+<p>A Removal relation <span class="name">derivedByRemovalFrom(id; d2,d1, {key_1, ..., key_n})</span> states that <span class="name">d2</span> is the dictionary following the removal of the set of pairs corresponding to keys <span class="name">key_1...key_n</span> from <span class="name">d1</span>.
<div class="anexample">
<pre class="codeexample">
@@ -2970,7 +2970,7 @@
<span class="glossary-ref" data-ref="glossary-membership"></span>
<p>
-The insertion and removal relations make insertions and removals explicit as part of the history of a dictionary. This, however, requires explicit mention of the state of the dictionary prior to each operation. The membership relation removes this need, allowing the state of a dictionary to be expressed without having to introduce a prior state.</p>
+The insertion and removal relations make insertions and removals explicit as part of the history of a dictionary. This, however, requires explicit reference to the dictionary prior to each operation. The membership relation removes this need, allowing the membership of a dictionary to be expressed without having to introduce a prior dictionary.</p>
<p>
<div class="attributes" id="attributes-memberOf">
@@ -2988,12 +2988,12 @@
-<p>The description <span class="name">memberOf(c, {(key_1, e_1), ..., (key_n, e_n)})</span> states that <span class="name">c</span> is known to include <span class="name">(key_1, e_1)</span>, ..., <span class="name">(key_n, e_n)}</span>, without having to introduce a previous state. </p>
+<p>The description <span class="name">memberOf(c, {(key_1, e_1), ..., (key_n, e_n)})</span> states that <span class="name">c</span> is known to include <span class="name">(key_1, e_1)</span>, ..., <span class="name">(key_n, e_n)}</span>, without having to introduce a previous dictionary. </p>
<div class="anexample">
<pre class="codeexample">
-entity(d1, [prov:type='prov:Dictionary' ]) // d1 is a dictionary, with unknown content
-entity(d2, [prov:type='prov:Dictionary' ]) // d2 is a dictionary, with unknown content
+entity(d1, [prov:type='prov:Dictionary' ]) // d1 is a dictionary, with unknown content
+entity(d2, [prov:type='prov:Dictionary' ]) // d2 is a dictionary, with unknown content
entity(e1)
entity(e2)
@@ -3002,7 +3002,7 @@
memberOf(d2, {("k1", e1), ("k2", e2)}, true)
entity(e3)
-entity(d3, [prov:type='prov:Dictionary' ])
+entity(d3, [prov:type='prov:Dictionary' ])
derivedByInsertionFrom(d3, d1, {("k3", e3)})
</pre>
@@ -3012,7 +3012,7 @@
<li> <span class="name">d2</span> exactly has the following pairs as members: <span class="name">("k1", e1), ("k2", e2)</span>, and does not contain any other.
<li> <span class="name">d3</span> has the following pairs as members: <span class="name">("k1", e1), ("k2", e2), ("k3", v3)</span>, and may contain others.
</ul>
-<p> Thus, the states of <span class="name">d1</span> and <span class="name">d3</span> are only partially known.</p>
+<p> Thus, the membership of <span class="name">d1</span> and <span class="name">d3</span> is only partially known.</p>
</div>
<!-- To go to part 2
--- a/model/working-copy/wd6-contextualization.html Wed Jun 06 10:06:56 2012 +0100
+++ b/model/working-copy/wd6-contextualization.html Wed Jun 06 11:43:06 2012 +0100
@@ -403,13 +403,13 @@
<h4>Contextualization</h4>
<p><em>
-Something that is a <dfn id="concept-contextualiation">contextualization</dfn> of another shares all aspects of the latter in a given context, specified by descriptions found in a bundle.
+Something that is a <dfn id="concept-contextualiation">contextualization</dfn> of another presents all aspects of the latter in a given context specified by descriptions found in a bundle.
</em></p>
<p><div class="attributes" id="attributes-contextualization">A <dfn title="contextualizationOf">contextualization</dfn> relation<span class="withPn">, written <span class="pnExpression">contextualizationOf(i2, i1, b)</span> in PROV-N,</span> has:
<ul>
-<li><span class='attribute' id="contextualization.contextualization2">contextualization2</span>: an identifier (<span class="name">i2</span>) for something sharing the facets of <span class="name">i1</span> in bundle <span class="name">b</span> ;</li>
+<li><span class='attribute' id="contextualization.contextualization2">contextualization2</span>: an identifier (<span class="name">i2</span>) for something presenting the aspects of <span class="name">i1</span> in bundle <span class="name">b</span> ;</li>
<li><span class='attribute' id="contextualization.contextualization2">contextualization1</span>: an identifier (<span class="name">i1</span>) of something identifiable in some bundle <span class="name">b</span>;</li>
<li><span class='attribute' id="contextualization.context">bundle</span>: an identifier (<span class="name">b</span>) for a bundle.</li>
</ul>
@@ -421,16 +421,16 @@
<pre class="codeexample">
bundle ex:run1
- activity(ex:a1, 2011-11-16T16:00:00,2011-11-16T17:0:00) //duration: 1hour
+ activity(ex:a1, 2011-11-16T16:00:00,2011-11-16T17:00:00) //duration: 1hour
wasAssociatedWith(ex:a1,ex:Bob,[prov:role="controller"])
endBundle
bundle ex:run2
- activity(ex:a2, 2011-11-17T10:00:00,2011-11-17T17:0:00) //duration: 7hours
+ activity(ex:a2, 2011-11-17T10:00:00,2011-11-17T17:00:00) //duration: 7hours
wasAssociatedWith(ex:a2,ex:Bob,[prov:role="controller"])
endBundle
</pre>
-<p>A performance rating tool reads these bundles, and rates the performance of the agent described in these bundles. The performance rating tool creates a new bundle <span class="name">tool:analysis01</span> containing the following. A new agent <span class="name">tool:Bob1</span> is declared as a restriction of <span class="name">ex:Bob</span> as described in context <span class="name">ex:run1</span>, and likewise for <span class="name">tool:Bob2</span> with respect to <span class="name">ex:run2</span>. The tool then defines two specializations of these contextualized agents with associated rating. The performance of the agent in the first bundle is judged to be good since the duration of <span class="name">ex:a1</span> is one hour, whereas it is judged to be bade in the second bundle since <span class="name">ex:a2</span>'s duration is seven hours.
+<p>A performance rating tool reads these bundles, and rates the performance of the agent described in these bundles. The performance rating tool creates a new bundle <span class="name">tool:analysis01</span> containing the following. A new agent <span class="name">tool:Bob1</span> is declared as a contextualization of <span class="name">ex:Bob</span> as described in context <span class="name">ex:run1</span>, and likewise for <span class="name">tool:Bob2</span> with respect to <span class="name">ex:run2</span>. The tool then defines two specializations of these contextualized agents with an associated rating. The performance of the agent in the first bundle is judged to be good since the duration of <span class="name">ex:a1</span> is one hour, whereas it is judged to be bad in the second bundle since <span class="name">ex:a2</span>'s duration is seven hours.
<pre class="codeexample">
bundle tool:analysis01
@@ -467,7 +467,7 @@
entity(tool:bundle8, [ prov:type='viz:Configuration', prov:type='prov:Bundle' ])
wasAttributedTo(tool:bundle8, viz:Visualizer)
- entity(tool:report1, [viz:color="orange"]) // is appropriate to add viz attributes to tool:report1 or should we specialize it?
+ entity(tool:report1, [viz:color="orange"]) // is it appropriate to add viz attributes to tool:report1 or should we specialize it?
contextualizationOf(tool:report1, obs:bundle7, ex:report1)
entity(tool:report2, [viz:color="blue"])