--- a/model/prov-constraints.html Tue Jul 03 16:12:06 2012 -0400
+++ b/model/prov-constraints.html Tue Jul 03 21:32:01 2012 +0100
@@ -765,7 +765,7 @@
start and end events having times matching the start and end times of
the activity.
</p>
-<div class='inference' id='inference'>
+<div class='inference' id='inference-activity-start-end'>
<p>
<span class='conditional'>IF</span> <span
class="name">activity(a,t1,t2,attrs)</span> <span
@@ -1202,19 +1202,13 @@
<div class='constraint' id='unique-generation'>
<p>
-Given an entity denoted by <span class="name">e</span>, two activities denoted by <span class="name">a1</span> and <span
-class="name">a2</span>, two time instants <span class="name">t1</span> and <span
-class="name">t2</span>, and two sets of attribute-value pairs <span class="name">attrs1</span> and <span class="name">attrs2</span>,
-<span class='conditional'>IF</span> <span class="name">wasGeneratedBy(id1; e, a1, t1, attrs1)</span> and <span class="name">wasGeneratedBy(id2; e, a2, t2, attrs2)</span> exist,
+<span class='conditional'>IF</span> <span class="name">wasGeneratedBy(id1;e,a1,t1,attrs1)</span> and <span class="name">wasGeneratedBy(id2;e,a2,t2,attrs2)</span>,
<span class='conditional'>THEN</span> <span class="name">id1</span>=<span class="name">id2</span>, <span class="name">a1</span>=<span class="name">a2</span>, <span class="name">t1</span>=<span class="name">t2</span> and <span class="name">attrs1</span>=<span class="name">attrs2</span>.</p>
</div>
<div class='constraint' id='unique-invalidation'>
<p>
-Given an entity denoted by <span class="name">e</span>, two activities denoted by <span class="name">a1</span> and <span
-class="name">a2</span>, two time instants <span class="name">t1</span> and <span
-class="name">t2</span>, and two sets of attribute-value pairs <span class="name">attrs1</span> and <span class="name">attrs2</span>,
-<span class='conditional'>IF</span> <span class="name">wasInvalidatedBy(id1; e, a1, t1, attrs1)</span> and <span class="name">wasInvalidatedBy(id2; e, a2, t2, attrs2)</span> exist,
+<span class='conditional'>IF</span> <span class="name">wasInvalidatedBy(id1;e,a1,t1,attrs1)</span> and <span class="name">wasInvalidatedBy(id2;e,a2,t2,attrs2)</span>,
<span class='conditional'>THEN</span> <span class="name">id1</span>=<span class="name">id2</span>, <span class="name">a1</span>=<span class="name">a2</span>, <span class="name">t1</span>=<span class="name">t2</span> and <span class="name">attrs1</span>=<span class="name">attrs2</span>.</p>
</div>
<div class="note">
@@ -1242,7 +1236,8 @@
class='conditional'>THEN</span> <span class="name">a1</span>=<span
class="name">a1'</span> and <span class="name">e</span>=<span
class="name">e'</span> and <span class="name">a2</span>=<span
- class="name">a2'</span> and <span class="name">t</span>=<span class="name">t'</span>.</p>
+ class="name">a2'</span> and <span class="name">t</span>=<span class="name">t'</span>
+ and <span class="name">attrs</span>=<span class="name">attrs'</span>.</p>
</div>
@@ -1261,7 +1256,8 @@
class='conditional'>THEN</span> <span class="name">a1</span>=<span
class="name">a1'</span> and <span class="name">e</span>=<span
class="name">e'</span> and <span class="name">a2</span>=<span
- class="name">a2'</span> and <span class="name">t</span>=<span class="name">t'</span>.</p>
+ class="name">a2'</span> and <span class="name">t</span>=<span class="name">t'</span>
+ and <span class="name">attrs</span>=<span class="name">attrs'</span>.</p>
</div>
<div class="note">The unique-startTime and unique-endTime constraints
@@ -1272,7 +1268,7 @@
<div class='constraint' id='unique-startTime'>
<p>
-<span class='conditional'>IF</span> <span class="name">activity(a,t1,t2)</span> and <span class="name">wasStartedBy(id;a,-,-,t)</span>, <span class='conditional'>THEN</span> <span class="name">t</span>=<span class="name">t1</span>.</p>
+<span class='conditional'>IF</span> <span class="name">activity(a,t,_t',_attrs)</span> and <span class="name">wasStartedBy(id;a,_e1,_a1,t1,_attrs1)</span>, <span class='conditional'>THEN</span> <span class="name">t</span>=<span class="name">t1</span>.</p>
</div>
<hr>
@@ -1283,9 +1279,9 @@
<div class='constraint' id='unique-endTime'>
<p>
<span class='conditional'>IF</span> <span
- class="name">activity(a,t1,t2)</span> and <span
- class="name">wasEndedBy(id;a,-,-,t)</span>, <span
- class='conditional'>THEN</span> <span class="name">t</span> = <span class="name">t2</span>.</p>
+ class="name">activity(a,_t,t',_attrs)</span> and <span
+ class="name">wasEndedBy(id;a,_e1,_a1,t1,_attrs1)</span>, <span
+ class='conditional'>THEN</span> <span class="name">t'</span> = <span class="name">t2</span>.</p>
</div>
<p>
@@ -1421,9 +1417,9 @@
<div class='constraint' id='start-precedes-end'>
<p>
<span class="conditional">IF</span>
-<span class="name">wasStartedBy(start;a,-,-,-)</span>
+<span class="name">wasStartedBy(start;a,_e1,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasEndedBy(end;a,-,-,-)</span>
+<span class="name">wasEndedBy(end;a,_e2,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">start</span>
<a>precedes</a>
@@ -1440,9 +1436,9 @@
<ol>
<li>
<span class="conditional">IF</span>
-<span class="name">used(use;a,e,-)</span>
+<span class="name">used(use;a,e,_t,_attrs)</span>
and
-<span class="name">wasStartedBy(start;a,-,-,-)</span>
+<span class="name">wasStartedBy(start;a,_e1,_a1,_t1,_attrs1)</span>
<span class="conditional">THEN</span>
<span class="name">start</span>
<a>precedes</a>
@@ -1450,9 +1446,9 @@
</li>
<li>
<span class="conditional">IF</span>
-<span class="name">used(use;a,e,-)</span>
+<span class="name">used(use;a,e,_t,_attrs)</span>
and
-<span class="name">wasEndedBy(end;a,-,-,-)</span>
+<span class="name">wasEndedBy(end;a,_e1,_a1,_t1,_attrs1)</span>
<span class="conditional">THEN</span>
<span class="name">use</span>
<a>precedes</a>
@@ -1473,9 +1469,9 @@
<ol>
<li>
<span class="conditional">IF</span>
-<span class="name">wasGeneratedBy(gen;a,e,-)</span>
+<span class="name">wasGeneratedBy(gen;e,a,_t,_attrs)</span>
and
-<span class="name">wasStartedBy(start;a,-,-,-)</span>
+<span class="name">wasStartedBy(start;a,_e1,_a1,_t1,_attrs1)</span>
<span class="conditional">THEN</span>
<span class="name">start</span>
<a>precedes</a>
@@ -1483,9 +1479,9 @@
</li>
<li>
<span class="conditional">IF</span>
-<span class="name">wasGeneratedBy(gen;a,e,-)</span>
+<span class="name">wasGeneratedBy(gen;e,a,_t,_attrs)</span>
and
-<span class="name">wasEndedBy(end;a,-,-,-)</span>
+<span class="name">wasEndedBy(end;a,_e1,_a1,_t1,_attrs1)</span>
<span class="conditional">THEN</span>
<span class="name">gen</span>
<a>precedes</a>
@@ -1517,9 +1513,9 @@
<span class="conditional">IF</span>
<span class="name">wasInformedBy(_id;a2,a1,_attrs)</span>
and
-<span class="name">wasStartedBy(start;a1,_e1,_a1',_attrs1)</span>
+<span class="name">wasStartedBy(start;a1,_e1,_a1',_t1,_attrs1)</span>
and
-<span class="name">wasEndedBy(end;a2,_e2,_a2',_attrs2)</span>
+<span class="name">wasEndedBy(end;a2,_e2,_a2',_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">start</span>
<a>precedes</a>
@@ -1591,9 +1587,9 @@
<div class='constraint' id='generation-precedes-invalidation'>
<p>
<span class="conditional">IF</span>
-<span class="name">wasGeneratedBy(gen;e,-,-)</span>
+<span class="name">wasGeneratedBy(gen;e,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasInvalidatedBy(inv;e,-,-)</span>
+<span class="name">wasInvalidatedBy(inv;e,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">gen</span>
<a>precedes</a>
@@ -1612,9 +1608,9 @@
<div class='constraint' id='generation-precedes-usage'>
<p> <span class="conditional">IF</span>
-<span class="name">wasGeneratedBy(gen;e,-,-)</span>
+<span class="name">wasGeneratedBy(gen;e,_a1,_t1,_attrs1)</span>
and
-<span class="name">used(use;-,e,-)</span>
+<span class="name">used(use;_a2,e,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">gen</span>
<a>precedes</a>
@@ -1630,9 +1626,9 @@
<div class='constraint' id='usage-precedes-invalidation'>
<p>
<span class="conditional">IF</span>
-<span class="name">used(use;-,e,-)</span>
+<span class="name">used(use;_a1,e,_t1,_attrs1)</span>
and
-<span class="name">wasInvalidatedBy(inv;e,-,-)</span>
+<span class="name">wasInvalidatedBy(inv;e,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">use</span>
<a>precedes</a>
@@ -1683,11 +1679,11 @@
id='derivation-generation-generation-ordering'>
<p>
<span class="conditional">IF</span>
-<span class="name">wasDerivedFrom(-;e2,e1,attrs)</span>
+<span class="name">wasDerivedFrom(_d;e2,e1,attrs)</span>
and
-<span class="name">wasGeneratedBy(gen1;e1,-,-)</span>
+<span class="name">wasGeneratedBy(gen1;e1,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasGeneratedBy(gen2;e2,-,-)</span>
+<span class="name">wasGeneratedBy(gen2;e2,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">gen1</span>
<a>precedes</a>
@@ -1712,18 +1708,18 @@
<ol>
<li>
<span class="conditional">IF</span>
-<span class="name">wasStartedBy(start;a,e,-,-)</span>
+<span class="name">wasStartedBy(start;a,e,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasGeneratedBy(gen;e,-,-)</span>
+<span class="name">wasGeneratedBy(gen;e,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">gen</span>
<a>precedes</a>
<span class="name">start</span>.
</li><li>
<span class="conditional">IF</span>
-<span class="name">wasStartedBy(start;a,e,-,-)</span>
+<span class="name">wasStartedBy(start;a,e,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasInvalidatedBy(inv;e,-,-)</span>
+<span class="name">wasInvalidatedBy(inv;e,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">start</span>
<a>precedes</a>
@@ -1744,18 +1740,18 @@
<ol>
<li>
<span class="conditional">IF</span>
-<span class="name">wasEndedBy(end;a,e,-,-)</span>
+<span class="name">wasEndedBy(end;a,e,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasGeneratedBy(gen;e,-,-)</span>
+<span class="name">wasGeneratedBy(gen;e,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">gen</span>
<a>precedes</a>
<span class="name">end</span>.
</li><li>
<span class="conditional">IF</span>
-<span class="name">wasEndedBy(end;a,e,-,-)</span>
+<span class="name">wasEndedBy(end;a,e,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasInvalidatedBy(inv;e,-,-)</span>
+<span class="name">wasInvalidatedBy(inv;e,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">end</span>
<a>precedes</a>
@@ -1805,22 +1801,22 @@
<div class='constraint' id='wasAssociatedWith-ordering'>
<ol> <li>
<span class="conditional">IF</span>
-<span class="name">wasAssociatedWith(-;a,ag,-)</span>
+<span class="name">wasAssociatedWith(_assoc;a,ag,_pl,_attrs)</span>
and
-<span class="name">wasStartedBy(start;a,-,-,-)</span>
+<span class="name">wasStartedBy(start;a,_e1,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasInvalidatedBy(inv;ag,-,-)</span>
+<span class="name">wasInvalidatedBy(inv;ag,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">start</span>
<a>precedes</a>
<span class="name">inv</span>.
</li><li>
<span class="conditional">IF</span>
-<span class="name">wasAssociatedWith(-;a,ag,-)</span>
+<span class="name">wasAssociatedWith(_assoc;a,ag,_pl,_attrs)</span>
and
-<span class="name">wasGeneratedBy(gen;ag,-,-)</span>
+<span class="name">wasGeneratedBy(gen;ag,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasEndedBy(end;a,-,-,-)</span>
+<span class="name">wasEndedBy(end;a,_e2,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">gen</span>
<a>precedes</a>
@@ -1846,22 +1842,22 @@
<div class='constraint' id='wasAttributedTo-ordering'>
<ol> <li>
<span class="conditional">IF</span>
-<span class="name">wasAttributedTo(-;e,ag)</span>
+<span class="name">wasAttributedTo(_at;e,ag,_attrs)</span>
and
-<span class="name">wasGeneratedBy(gen;e,-,-)</span>
+<span class="name">wasGeneratedBy(gen;e,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasInvalidatedBy(inv;ag,-,-)</span>
+<span class="name">wasInvalidatedBy(inv;ag,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">gen</span>
<a>precedes</a>
<span class="name">inv</span>.
</li><li>
<span class="conditional">IF</span>
-<span class="name">wasAttributedTo(-;e,ag)</span>
+<span class="name">wasAttributedTo(_at;e,ag,_attrs)</span>
and
-<span class="name">wasGeneratedBy(gen;ag,-,-)</span>
+<span class="name">wasGeneratedBy(gen;ag,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasInvalidatedBy(inv;e,-,-)</span>
+<span class="name">wasInvalidatedBy(inv;e,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">gen</span>
<a>precedes</a>
@@ -1878,11 +1874,11 @@
<div class='constraint' id='actedOnBehalfOf-ordering'>
<p> <span class="conditional">IF</span>
-<span class="name">actedOnBehalfOf(-;ag2,ag1,-)</span>
+<span class="name">actedOnBehalfOf(_del;ag2,ag1,_a,_attrs)</span>
and
-<span class="name">wasGeneratedBy(gen;ag1,-,-)</span>
+<span class="name">wasGeneratedBy(gen;ag1,_a1,_t1,_attrs1)</span>
and
-<span class="name">wasInvalidatedBy(inv;ag2,-,-)</span>
+<span class="name">wasInvalidatedBy(inv;ag2,_a2,_t2,_attrs2)</span>
<span class="conditional">THEN</span>
<span class="name">gen</span>
<a>precedes</a>
@@ -1944,7 +1940,7 @@
The only exception is:
<ul>
<li><div id="optional-attributes4">In an association of the form
- <span class="name">wasAssociatedWith(a, ag, -, attr)</span>, the
+ <span class="name">wasAssociatedWith(a, ag,-,attr)</span>, the
absence of a plan means: either no plan exists, or a plan exists but
it is not identified.</div></li>
</div></li>