--- a/model/ProvenanceModel.html Thu Jan 19 13:42:09 2012 +0000
+++ b/model/ProvenanceModel.html Thu Jan 19 15:22:24 2012 +0000
@@ -627,17 +627,11 @@
<ul>
<li>An <a title="entity record">Entity Record</a> (noted <samp>entity</samp> in the diagram, to reflect the term used in the ASN) is a representation of an <em>entity</em>.
-<<<<<<< local
+
<li>An <a title="activity record">Activity Record</a>(noted <samp>activity</samp> in the diagram) represents an activity that has an effect on entities, namely it either <em>generates</em> or <em>uses</em> one or more entities.
Usage and generation are modelled by means of the <a title="usage record">used</a> and the <a title="generation record">wasGeneratedBy</a> relationships. Activities may include not only computations, but also any other type of activity that can be described in terms of their effect on <samp>entities</samp>.
Note that multiple <samp>activities</samp> may <em>use</em> the same <samp>entity</samp>, and each activity may use multiple <samp>entities</samp>. Finally, entities can be derived from other entities, and this is specified using the <a title="derivation record">wasDerivedFrom</a> relation.</li>
-=======
- <li>An <a title="activity record">Activity Record</a>(noted <samp>activity</samp> in the diagram) represents an activity that has an effect on entities, namely it either <em>generates</em>
-or <em>uses</em> one or more entities. Usage and generation are modelled by means of the <a title="usage record">used</a> and the <a title="generation record">wasGeneratedBy</a>
-relationships. <samp>Activity</samp> denotes any type of activity that have an effect on <samp>entities</samp>.
-Note that multiple <samp>activities</samp> may <em>use</em> the same <samp>entity</samp>, and each activity may use multiple <samp>entities</samp>. Finally, entities can be derived from
-other entities, and this is specified using the <a title="derivation record">wasDerivedFrom</a> relation.</li>
->>>>>>> other
+
<li>An <a title="agent record">Agent Record</a> represents a particular <samp>entity</samp> that can be associated to activities, meaning that it can be assigned some degree of
responsibility for an <samp>activity</samp> taking place.
@@ -1536,12 +1530,7 @@
-->
-<<<<<<< local
<div class='pending'> We may want to assert the time at which an entity is created. The placeholder for such time information is a generation record. But a generation mandates the presence of an activity identifier. But it may not be known.
-=======
-<div class='issue'> We may want to assert the time at which an entity is created. The placeholder for such time information is a generation record. But a generation mandates the presence of
-an activity identifier. But it may not be known.
->>>>>>> other
It would be nice if the activity identifier was made optional in the generation record.
This is <a href="http://www.w3.org/2011/prov/track/issues/205">ISSUE-205</a>.
<em>This is now implemented. See also <a href="http://www.w3.org/2011/prov/track/issues/43">ISSUE-43</a>.</em></div>
@@ -1991,15 +1980,9 @@
<ul>
<li><em>id</em>: an OPTIONAL identifier <span class="name">id</span> identifying the derivation record;</li>
<li><em>generatedEntity</em>: the identifier <span class="name">e2</span> of an entity record, which is a representation of the generated entity;</li>
-<<<<<<< local
<li><em>usedEntity</em>: the identifier <span class="name">e1</span> of an entity record, which is a representation of the used entity;</li>
<li><em>time</em>: an OPTIONAL "generation time" <span class="name">t</span>, the time at which the entity denoted by <span class="name">e2</span> was created;</li>
<li><em>attributes</em>: a set of attribute-value pairs <span class="name">attrs</span> that describe the modalities of this derivation; it MUST include the attribute-value pair <span class="name">prov:steps="single"</span>.</li>
-=======
-<li><em>usedEntity</em>: the identifier <span class="name">e1</span> of an entity record, which is a representation of the used entity.</li>
-<li><em>attributes</em>: a set of attribute-value pairs <span class="name">attrs</span> that describe the modalities of this derivation; it MUST include the attribute-value pair <span
-class="name">prov:steps="single"</span>.</li>
->>>>>>> other
</ul>
<p>An imprecise-1 derivation MUST include the attribute <span class="name">prov:steps</span>, since it is the only means to distinguish this record from an imprecise-n derivation
record.</p>
@@ -2009,15 +1992,9 @@
<ul>
<li><em>id</em>: an OPTIONAL identifier <span class="name">id</span> identifying the derivation record;</li>
<li><em>generatedEntity</em>: the identifier <span class="name">e2</span> of an entity record, which is a representation of the generated entity;</li>
-<<<<<<< local
<li><em>usedEntity</em>: the identifier <span class="name">e1</span> of an entity record, which is a representation of the used entity;</li>
<li><em>time</em>: an OPTIONAL "generation time" <span class="name">t</span>, the time at which the entity denoted by <span class="name">e2</span> was created;</li>
<li><em>attributes</em>: an OPTIONAL set of attribute-value pairs <span class="name">attrs</span> that describe the modalities of this derivation; it optionally includes the attribute-value pair <span class="name">prov:steps="any"</span>.</li>
-=======
-<li><em>usedEntity</em>: the identifier <span class="name">e1</span> of an entity record, which is a representation of the used entity.</li>
-<li><em>attributes</em>: an OPTIONAL set of attribute-value pairs <span class="name">attrs</span> that describe the modalities of this derivation; it optionally includes the attribute-value
-pair <span class="name">prov:steps="any"</span>.</li>
->>>>>>> other
</ul>
<p>It is OPTIONAL to include the attribute <span class="name">prov:steps</span> in an imprecise-n derivation record. It defaults to <span class="name">prov:steps="any"</span>.</p>
@@ -2081,13 +2058,8 @@
entity denoted by <span class="name">e5</span> and generated it according to generation record
<span class="name">g2</span>.
-<<<<<<< local
+
The third record is an imprecise-1 derivation, which is similar for <span class="name">e3</span> and <span class="name">e2</span>, but it leaves the activity record and associated attributes implicit. The fourth and fifth records are imprecise-n derivation records between <span class="name">e2</span> and <span class="name">e1</span>, but no information is provided as to the number and identity of activities underpinning the derivation. The six derivation records extends the fifth with the derivation time of <span class="name">e2</span>.
-=======
-The third record is an imprecise-1 derivation, which is similar for <span class="name">e3</span> and <span class="name">e2</span>, but it leaves the activity record and associated attributes
-implicit. The fourth and fifth records are imprecise-n derivation records between <span class="name">e2</span> and <span class="name">e1</span>, but no information is provided as to the
-number and identity of activities underpinning the derivation.
->>>>>>> other
</p>
</div>
@@ -2557,13 +2529,9 @@
account.</p>
</div>
-<<<<<<< local
+
<p>Whilst constraint <a href="#identifiable-record-in-account">identifiable-record-in-account</a> specifies how to understand multiple entity records with a same identifier within a given account, it does not guarantee that the entity record formed with the union of all attribute-value pairs satisfies the <a>attribute occurrence validity</a> property, as illustrated by the following example.</p>
-=======
-<p>Whilst constraint <a href="#identifiable-entity-in-account">identifiable-entity-in-account</a> specifies how to understand multiple entity records with a same identifier within a given
-account, it does not guarantee that the entity record formed with the union of all attribute-value pairs satisfies the <a>attribute occurrence validity</a> property, as illustrated by the
-following example.</p>
->>>>>>> other
+
<div class="anexample">
<p>
@@ -2575,15 +2543,8 @@
entity(e,[prov:type="person", ex:weight=50, ex:age=30])
...)
</pre>
-<<<<<<< local
+
<p>Application of <a href="#identifiable-record-in-account">identifiable-record-in-account</a> results in an entity record containing the attribute-value pairs <span class="name">age=20</span>, <span class="name">weight=50</span>, and <span class="name">age=30</span>. The namespace referred to by prefix <span class="name">ex</span> declares the number of occurrences that are permitted for each attribute. The resulting entity record may or may not satisfy the <a>attribute occurrence validity</a>, depending on this namespace. For instance, if the namespace referred to by <span class="name">ex</span> declares that <span class="name">age</span> must have at most one occurrence, then the resulting entity record does not satisfy the <a>attribute occurrence validity</a> property. This document does not specify how to handle such an entity record.
-=======
-<p>Application of <a href="#identifiable-entity-in-account">identifiable-entity-in-account</a> results in an entity record containing the attribute-value pairs <span
-class="name">age=20</span>, <span class="name">weight=50</span>, and <span class="name">age=30</span>. The namespace referred to by prefix <span class="name">ex</span> declares the number of
-occurrences that are permitted for each attribute. The resulting entity record may or may not satisfy the <a>attribute occurrence validity</a>, depending on this namespace. For instance, if
-the namespace referred to by <span class="name">ex</span> declares that <span class="name">age</span> must have at most one occurrence, then the resulting entity record does not satisfy the
-<a>attribute occurrence validity</a> property. This document does not specify how to handle such an entity record.
->>>>>>> other
</p></div>
<p>Account records can be nested since an account record can occur among the records being wrapped by another account. </p>