--- a/model/prov-constraints.html Fri Aug 31 16:59:05 2012 +0100
+++ b/model/prov-constraints.html Mon Sep 03 14:08:23 2012 +0100
@@ -523,7 +523,9 @@
together with zero or more <a>bundles</a>, or named sets of
statements. For
example, a PROV document could be a .provn document, the result
-of a query, a triple store containing PROV statements in RDF, etc. The
+of a query, a triple store containing PROV statements in RDF, etc.
+A PROV <dfn>instance</dfn> is a set of PROV statements.
+The
PROV-DM specification [[PROV-DM]] imposes minimal requirements upon
PROV instances. A <a>valid</a> PROV instance corresponds to a
consistent history of objects and interactions to which logical
@@ -839,11 +841,11 @@
</tr>
<tr align="center">
<td rowspan="2" class="name">wasInformedBy(id; a2,a1,attrs)</td>
- <td class="name">a1</td>
+ <td class="name">a2</td>
<td class="name">'activity'</td>
</tr>
<tr align="center">
- <td class="name">a2</td>
+ <td class="name">a1</td>
<td class="name">'activity'</td>
</tr>
<tr align="center">
@@ -1081,7 +1083,7 @@
which is equivalent to the logical constant <span class="math">False</span>. </li>
</ul>
<p> Similarly, the definitions, inferences, and constraint rules in this
- specification can also be viewed as logical formulas., built up out
+ specification can also be viewed as logical formulas, built up out
of atomic formulas, logical connectives "and" (∧), "implies" (⇒),
and quantifiers "for all" (∀) and "there exists" (∃). For more
background on logical formulas, see a logic textbook such as [[Logic]].</p>
@@ -1908,6 +1910,14 @@
class="name">r(id; a<sub>1</sub>,...,a<sub>n</sub>,[])</span>.</li></ol>
</div>
+
+ <div class="remark">
+ <p>Definitions <a class="rule-ref" href="#optional-identifiers"><span>TBD</span></a> and <a class="rule-ref" href="#optional-attributes"><span>TBD</span></a>.
+do not apply to <span class="name">alternateOf</span>, <span class="name">specializationOf</span>, and <span class="name">mentionOf</span>, which do not have identifiers and attributes.
+</p>
+ </div>
+
+
<p> Finally, many PROV
statements have other optional arguments or short forms that can be
used if none of the optional arguments is present. These are
@@ -1955,7 +1965,7 @@
attribution, influence, alternate, specialization, or mention
relations, because these
have no optional parameters aside from the identifier and attributes,
- which are expanded by the rules in <a class="rule-ref" href="#optional-identifiers"><span>TBD</span></a> <a class="rule-ref" href="#optional-attributes"><span>TBD</span></a>. </p>
+ which are expanded by the rules in <a class="rule-ref" href="#optional-identifiers"><span>TBD</span></a> and <a class="rule-ref" href="#optional-attributes"><span>TBD</span></a>. </p>
</div>
<!--<div id="optional-attributes1"> -->
@@ -2079,8 +2089,8 @@
indicate how to handle expansion of parameters for
<span class="name">wasDerivedFrom</span> expansion, which is only allowed for the
generation and use parameters when the activity is specified. A
- later constraint <a class="rule-ref"
- href="impossible-unspecified-derivation-generation-use"><span>impossible-unspecified-derivation-generation-use</span></a>
+ later constraint, <a class="rule-ref"
+ href="#impossible-unspecified-derivation-generation-use"><span>TBD</span></a>,
forbids specifying generation and use parameters when the activity
is unspecified.</p>
@@ -2964,7 +2974,7 @@
the <span class="name">wasAttributedTo(id; e,ag,attr)</span> statement.
</li>
<li>The identifier field <span class="name">id</span> is a <span class="conditional">KEY</span> for
- the <span class="name">wasAssociatedWith(id; a,ag,pl,attrs)</span>
+ the <span class="name">wasAssociatedWith(id; a,ag,pl,attrs)</span> statement.
</li>
<li>The identifier field <span class="name">id</span> is a <span class="conditional">KEY</span> for
the <span class="name">wasAssociatedWith(id; a,ag,-,attrs)</span> statement.
@@ -3225,7 +3235,7 @@
<p>
This section specifies ordering constraints from the perspective of
the <a>lifetime</a> of an activity. An activity starts, then during
-its lifetime can use, generate or invalidates entities, communicate
+its lifetime can use, generate or invalidate entities, communicate
with, start, or end
other
activities, or be associated with agents, and finally it ends. The following constraints amount to
@@ -3313,8 +3323,8 @@
<p id='end-end-ordering_text'>
If an activity is ended by more than one activity, the events must all
-be simultaneous. The following constraint requires that if there are two start
-events that start the same activity, then one <a>precedes</a> the
+be simultaneous. The following constraint requires that if there are two end
+events that end the same activity, then one <a>precedes</a> the
other. Using this constraint in both directions means that each event
<a>precedes</a> the other, that is, they are simultaneous.
</p>
@@ -3544,9 +3554,9 @@
<hr />
<p id='generation-generation-ordering_text'>
-If an activity is generated by more than one activity, the events must all
+If an entity is generated by more than one activity, the events must all
be simultaneous. The following constraint requires that if there are two generation
-events that generate the same activity, then one <a>precedes</a> the
+events that generate the same entity, then one <a>precedes</a> the
other. Using this constraint in both directions means that each event
<a>precedes</a> the other.
</p>
@@ -3566,9 +3576,9 @@
<hr />
<p id='invalidation-invalidation-ordering_text'>
-If an activity is invalidated by more than one activity, the events must all
-be simultaneous. The following constraint requires that if there are two start
-events that start the same activity, then one <a>precedes</a> the
+If an entity is invalidated by more than one activity, the events must all
+be simultaneous. The following constraint requires that if there are two invalidation
+events that invalidate the same entity, then one <a>precedes</a> the
other. Using this constraint in both directions means that each event
<a>precedes</a> the other, that is, they are simultaneous.
</p>
@@ -3751,7 +3761,7 @@
<span class="conditional">IF</span> <span
class="name">specializationOf(e1,e2)</span> and <span
<span class="name">wasInvalidatedBy(inv1; e1,_a1,_t1,_attrs1)</span> and
- class="name">wasInvalidatedBy(inv2; e2,_a2,_t2,_attrs2)</span>
+ <span class="name">wasInvalidatedBy(inv2; e2,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span> <span class="name">inv1</span> <a>precedes</a> <span class="name">inv2</span>.
</p>
</div>
@@ -4162,7 +4172,7 @@
are unspecified. It is forbidden to specify a generation or use
event without specifying the activity.</p>
- <div class='constraint' id="impossible-specialization-reflexive">
+ <div class='constraint' id="impossible-unspecified-derivation-generation-use">
<p> In the following rules, <span class="name">g</span> and <span class="name">u</span> MUST NOT be <span class="name">-</span>.</p>
<ol>
<li> <span class="conditional">IF</span>