--- a/model/prov-constraints.html Wed Aug 08 12:08:22 2012 +0100
+++ b/model/prov-constraints.html Wed Aug 08 12:10:14 2012 +0100
@@ -2967,11 +2967,11 @@
<p id='wasAssociatedWith-ordering_text'>An activity that was
-associated with an agent must have some overlap with the agent. The
-agent MUST have been generated, or MUST have become
-associated with the activity, after the activity start: so, the agent MUST exist before the activity end. Likewise, the agent may be destructed, or may terminate its association with the activity, before the activity end: hence, the agent invalidation is required to happen after the activity start.
-This is
-illustrated by <a href="#ordering-agents">Figure 6</a> (a) and expressed by <a class="rule-ref" href="#wasAssociatedWith-ordering"><span>TBD</span></a>.</p>
+associated with an agent must have some overlap with the agent. Ihe
+agent MUST have been generated (or started), or MUST have become
+associated with the activity, after the activity start: so, the agent MUST exist before the activity end. Likewise, the agent may be destructed (or ended), or may terminate its association with the activity, before the activity end: hence, the agent invalidation (or end) is required to happen after the activity start.
+This is illustrated by <a href="#ordering-agents">Figure 6</a> (a) and expressed by <a class="rule-ref" href="#wasAssociatedWith-ordering"><span>TBD</span></a>.</p>
+
<div class='constraint' id='wasAssociatedWith-ordering'>
@@ -3000,6 +3000,28 @@
<span class="name">gen</span>
<a title="precedes">precedes</a>
<span class="name">end</span>.
+ </li><li>
+ <span class="conditional">IF</span>
+<span class="name">wasAssociatedWith(_assoc; a,ag,_pl,_attrs)</span>
+and
+<span class="name">wasStartedBy(start; a,_e5,_a5,_t5,_attrs5)</span>
+and
+<span class="name">wasEndedBy(end; ag,_e6,_a6,_t6,_attrs6)</span>
+<span class="conditional">THEN</span>
+<span class="name">start</span>
+<a title="precedes">precedes</a>
+<span class="name">end</span>.
+ </li><li>
+ <span class="conditional">IF</span>
+<span class="name">wasAssociatedWith(_assoc; a,ag,_pl,_attrs)</span>
+and
+<span class="name">wasStartedBy(start; ag,_e7,_a7,_t7,_attrs7)</span>
+and
+<span class="name">wasEndedBy(end; a,_e8,_a8,_t8,_attrs8)</span>
+<span class="conditional">THEN</span>
+<span class="name">start</span>
+<a title="precedes">precedes</a>
+<span class="name">end</span>.
</li>
</ol>
</div>
@@ -3023,24 +3045,46 @@
<span class="conditional">IF</span>
<span class="name">wasAttributedTo(_at; e,ag,_attrs)</span>
and
-<span class="name">wasGeneratedBy(gen2; e,_a2,_t2,_attrs2)</span>
+<span class="name">wasGeneratedBy(gen; e,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasInvalidatedBy(inv1; ag,_a1,_t1,_attrs1)</span>
+<span class="name">wasInvalidatedBy(inv; ag,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
-<span class="name">gen1</span>
+<span class="name">gen</span>
<a title="precedes">precedes</a>
-<span class="name">inv2</span>.
+<span class="name">inv</span>.
</li><li>
<span class="conditional">IF</span>
<span class="name">wasAttributedTo(_at; e,ag,_attrs)</span>
and
-<span class="name">wasGeneratedBy(gen; ag,_a1,_t1,_attrs1)</span>
+<span class="name">wasGeneratedBy(gen; ag,_a3,_t3,_attrs3)</span>
and
-<span class="name">wasInvalidatedBy(inv; e,_a2,_t2,_attrs2)</span>
+<span class="name">wasInvalidatedBy(inv; e,_a4,_t4,_attrs4)</span>
<span class="conditional">THEN</span>
<span class="name">gen</span>
<a title="precedes">precedes</a>
<span class="name">inv</span>.
+ </li><li>
+ <span class="conditional">IF</span>
+<span class="name">wasAttributedTo(_at; e,ag,_attrs)</span>
+and
+<span class="name">wasGeneratedBy(gen; e,_a5,_t5,_attrs5)</span>
+and
+<span class="name">wasEndedBy(end; ag,_e6,_a6,_t6,_attrs6)</span>
+<span class="conditional">THEN</span>
+<span class="name">gen</span>
+<a title="precedes">precedes</a>
+<span class="name">end</span>.
+ </li><li>
+ <span class="conditional">IF</span>
+<span class="name">wasAttributedTo(_at; e,ag,_attrs)</span>
+and
+<span class="name">wasStartedBy(start; ag,_e7,_a7,_t7,_attrs7) </span>
+and
+<span class="name">wasInvalidatedBy(inv; e,_a8,_t8,_attrs8)</span>
+<span class="conditional">THEN</span>
+<span class="name">start</span>
+<a title="precedes">precedes</a>
+<span class="name">inv</span>.
</li>
</ol>
</div>
@@ -3052,7 +3096,8 @@
<div class='constraint' id='actedOnBehalfOf-ordering'>
-<p> <span class="conditional">IF</span>
+ <ol> <li>
+ <span class="conditional">IF</span>
<span class="name">actedOnBehalfOf(_del; ag2,ag1,_a,_attrs)</span>
and
<span class="name">wasGeneratedBy(gen; ag1,_a1,_t1,_attrs1)</span>
@@ -3062,7 +3107,20 @@
<span class="name">gen</span>
<a title="precedes">precedes</a>
<span class="name">inv</span>.
-</p>
+ </li><li>
+ <span class="conditional">IF</span>
+<span class="name">actedOnBehalfOf(_del; ag2,ag1,_a,_attrs)</span>
+and
+<span class="name">wasStartedBy(start; ag1,_e3,_a3,_t3,_attrs3)</span>
+and
+<span class="name">wasEndedBy(end; ag2,_e4,_a4,_t4,_attrs4)</span>
+<span class="conditional">THEN</span>
+<span class="name">start</span>
+<a title="precedes">precedes</a>
+<span class="name">end</span>.
+ </li>
+ </ol>
+
</div>
</section>