--- a/model/prov-constraints.html Wed Aug 08 13:07:28 2012 +0100
+++ b/model/prov-constraints.html Wed Aug 08 15:25:01 2012 +0200
@@ -2983,7 +2983,7 @@
<p id='wasAssociatedWith-ordering_text'>An activity that was
-associated with an agent must have some overlap with the agent. Ihe
+associated with an agent must have some overlap with the agent. The
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>
@@ -3047,9 +3047,7 @@
<hr />
-<p id='wasAttributedTo-ordering_text'>An entity that was attributed to an agent must have some overlap
-with the agent. The agent MUST exist before the entity
-invalidation. Likewise, the entity generation must precede the agent destruction.
+<p id='wasAttributedTo-ordering_text'>An agent to which an entity was attributed, MUST exist before this entity was generated.
This is
illustrated by <a href="#ordering-agents">Figure 6</a> (b) and expressed by <a class="rule-ref" href="#wasAttributedTo-ordering"><span>TBD</span></a>.</p>
@@ -3061,46 +3059,24 @@
<span class="conditional">IF</span>
<span class="name">wasAttributedTo(_at; e,ag,_attrs)</span>
and
-<span class="name">wasGeneratedBy(gen; e,_a1,_t1,_attrs1)</span>
+<span class="name">wasGeneratedBy(gen1; e,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasInvalidatedBy(inv; ag,_a2,_t2,_attrs2)</span>
+<span class="name">wasGeneratedBy(gen2; ag,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
-<span class="name">gen</span>
+<span class="name">gen2</span>
<a title="precedes">precedes</a>
-<span class="name">inv</span>.
+<span class="name">gen1</span>.
</li><li>
<span class="conditional">IF</span>
<span class="name">wasAttributedTo(_at; e,ag,_attrs)</span>
and
-<span class="name">wasGeneratedBy(gen; ag,_a3,_t3,_attrs3)</span>
-and
-<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>
+<span class="name">wasGeneratedBy(gen; e,_a3,_t3,_attrs3)</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="name">wasStartedBy(start; ag,_e4,_a4,_t4,_attrs4)</span>
<span class="conditional">THEN</span>
<span class="name">start</span>
<a title="precedes">precedes</a>
-<span class="name">inv</span>.
+<span class="name">gen</span>.
</li>
</ol>
</div>