* Adapted rules to use convention that events predicates appear in same order as precedes conclusion
authorJames Cheney <jcheney@inf.ed.ac.uk>
Thu, 16 Aug 2012 13:28:13 +0100
changeset 4340 a5c4eb9f3eb1
parent 4339 d2c43a3ad8b1
child 4341 aae9c125b746
* Adapted rules to use convention that events predicates appear in same order as precedes conclusion
model/prov-constraints.html
--- a/model/prov-constraints.html	Thu Aug 16 13:04:24 2012 +0100
+++ b/model/prov-constraints.html	Thu Aug 16 13:28:13 2012 +0100
@@ -3002,9 +3002,9 @@
 <ol>
     <li>
   <span class="conditional">IF</span>
-<span class="name">used(use; a,e,_t,_attrs)</span> 
-and
 <span class="name">wasStartedBy(start; a,_e1,_a1,_t1,_attrs1)</span> 
+ and
+<span class="name">used(use; a,_e2,_t2,_attrs2)</span> 
 <span class="conditional">THEN</span>
 <span class="name">start</span> 
 <a title="precedes">precedes</a>
@@ -3012,7 +3012,7 @@
   </li>
   <li>
   <span class="conditional">IF</span>
-<span class="name">used(use; a,e,_t,_attrs)</span> 
+<span class="name">used(use; a,_e1,_t1,_attrs1)</span> 
 and
 <span class="name">wasEndedBy(end; a,_e2,_a2,_t2,_attrs2)</span> 
 <span class="conditional">THEN</span>
@@ -3035,9 +3035,9 @@
    <ol>
     <li>
   <span class="conditional">IF</span>
-<span class="name">wasGeneratedBy(gen; _e,a,_t,_attrs)</span> 
-and
 <span class="name">wasStartedBy(start; a,_e1,_a1,_t1,_attrs1)</span> 
+ and
+<span class="name">wasGeneratedBy(gen; _e2,a,_t2,_attrs2)</span> 
 <span class="conditional">THEN</span>
 <span class="name">start</span> 
 <a title="precedes">precedes</a>
@@ -3325,9 +3325,9 @@
  <ol>
     <li>
     <span class="conditional">IF</span>
-<span class="name">wasStartedBy(start; _a,e,_a1,_t1,_attrs1)</span> 
+<span class="name">wasGeneratedBy(gen; e,_a1,_t1,_attrs1)</span> 
 and
-<span class="name">wasGeneratedBy(gen; e,_a2,_t2,_attrs2)</span> 
+<span class="name">wasStartedBy(start; _a,e,_a2,_t2,_attrs2)</span> 
 <span class="conditional">THEN</span>
 <span class="name">gen</span> 
 <a title="precedes">precedes</a>
@@ -3336,7 +3336,7 @@
     <span class="conditional">IF</span>
 <span class="name">wasStartedBy(start; _a,e,_a1,_t1,_attrs1)</span> 
 and
-<span class="name">wasInvalidatedBy(inv; e,_a3,_t3,_attrs3)</span> 
+<span class="name">wasInvalidatedBy(inv; e,_a2,_t2,_attrs2)</span> 
 <span class="conditional">THEN</span>
 <span class="name">start</span> 
 <a title="precedes">precedes</a>
@@ -3357,9 +3357,9 @@
  <ol>
       <li>
     <span class="conditional">IF</span>
-<span class="name">wasEndedBy(end; _a,e,_a1,_t1,_attrs1)</span> 
+<span class="name">wasGeneratedBy(gen; e,_a1,_t1,_attrs1)</span> 
 and
-<span class="name">wasGeneratedBy(gen; e,_a2,_t2,_attrs2)</span> 
+   <span class="name">wasEndedBy(end; _a,e,_a2,_t2,_attrs2)</span> 
 <span class="conditional">THEN</span>
 <span class="name">gen</span> 
 <a title="precedes">precedes</a>
@@ -3368,7 +3368,7 @@
     <span class="conditional">IF</span>
 <span class="name">wasEndedBy(end; _a,e,_a1,_t1,_attrs1)</span> 
 and
-<span class="name">wasInvalidatedBy(inv; e,_a3,_t3,_attrs3)</span> 
+<span class="name">wasInvalidatedBy(inv; e,_a2,_t2,_attrs2)</span> 
 <span class="conditional">THEN</span>
 <span class="name">end</span> 
 <a title="precedes">precedes</a>
@@ -3412,8 +3412,8 @@
   <p>
 <span class="conditional">IF</span> <span
   class="name">specializationOf(e1,e2)</span> and <span
-  class="name">wasInvalidatedBy(inv2; e2,_a2,_t2,_attrs2)</span> and
-  <span class="name">wasInvalidatedBy(inv1; e1,_a1,_t1,_attrs1)</span>
+ <span class="name">wasInvalidatedBy(inv1; e1,_a1,_t1,_attrs1)</span> and
+  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>
@@ -3486,20 +3486,20 @@
 and
 <span class="name">wasStartedBy(start; a,_e5,_a5,_t5,_attrs5)</span> 
 and
-<span class="name">wasEndedBy(end1; ag,_e6,_a6,_t6,_attrs6)</span> 
+<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">end1</span>.
+<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(start1; ag,_e7,_a7,_t7,_attrs7)</span> 
+<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">start1</span> 
+<span class="name">start</span> 
 <a title="precedes">precedes</a>
 <span class="name">end</span>.
   </li>