--- a/model/ProvenanceModel.html	Wed Jan 18 09:27:07 2012 +0000
+++ b/model/ProvenanceModel.html	Wed Jan 18 09:40:03 2012 +0000
@@ -2119,18 +2119,76 @@
 
 
 
+<<<<<<< local
 <!-- 
 <section>
 <h4>Transitive Derivation Record</h4>
+=======
+<!--
+
+<div style="text-align: center;">
+<img src="complement-of.png" alt="illustration complementOf"/>
+</div>
+
+
+
+
+<div class="anexample">
+<p>The following example illustrates the entity "Royal Society"and its perspectives at various points in time.</p>
+<pre class="codeexample">
+entity(rs,[ex:created=1870])
+
+entity(rs_l1,[prov:location="loc2"])
+entity(rs_l2,[prov:location="The Mall"])
+
+entity(rs_m1,[ex:membership=250, ex:year=1900])
+entity(rs_m2,[ex:membership=300, ex:year=1945])
+entity(rs_m3,[ex:membership=270, ex:year=2010])
+
+wasComplementOf(rs_m3, rs_l2)
+wasComplementOf(rs_m2, rs_l1)
+wasComplementOf(rs_m2, rs_l2)
+wasComplementOf(rs_m1, rs_l1)
+
+wasComplementOf(rs_m3, rs)
+wasComplementOf(rs_m2, rs)
+wasComplementOf(rs_m1, rs)
+wasComplementOf(rs_l1, rs)
+wasComplementOf(rs_l2, rs)
+</pre>
+</div>
+
+
+
+<div class='constraint' id='wasComplementOf-necessary-cond'>
+An assertion "wasComplementOf(B,A)" holds over the temporal intersection of A and B, <span class='conditional'>only if</span>: 
+<ol>
+<li> if a mapping can be established from an attribute X of entity record identified by B to an attribute Y of entity record identified by A, then the values of A and B must be consistent with that mapping;</li>
+<li>entity record identified by B has some attribute that entity record identified by A does not have.</li>
+</ol>
+ </div>
+
+<p>The complementarity relation is not transitive. Let us consider identifiers <span class="name">e1</span>, <span class="name">e2</span>, and <span class="name">e3</span> identifying three entity records such that 
+ <span class="name">wasComplementOf(e3,e2)</span> and <span class="name">wasComplementOf(e2,e1)</span> hold.  The record <span class="name">wasComplementOf(e3,e1)</span> may not hold because the characterization intervals of the denoted entity records may not overlap.</p>
+
+>>>>>>> other
 
 
 <p>
+<<<<<<< local
 If <span class="name">wasDerivedFrom(e2,e1)</span> holds because attribute <span class="name">a2.1</span> of <span class="name">e2</span> is determined by attribute <span class="name">a1.1</span> of <span class="name">e1</span>,
 and if <span class="name">wasDerivedFrom(e3,e2)</span> holds because attribute <span class="name">a3.1</span>of <span class="name">e3</span> is determined by  attribute <span class="name">a2.2</span> of <span class="name">e1</span>, it is not necessarily the case that an attribute of <span class="name">e3</span> is determined by an attribute of <span class="name">e1</span>; so, an asserter may not be able to assert <span class="name">wasDerivedFrom(e3,e1)</span>, since it would fail to satisfy constraint <a href="#derivation-attributes">derivation-attributes</a>.  Hence, the constraint on attributes as expressed in <a href="#derivation-attributes">derivation-attributes</a> invalidates transitivity in the general case.
+=======
+An entity record identifier can optionally be accompanied by an account identifier. When this is the case, it becomes possible to link two entity record identifiers that are appear in different accounts. (In particular, the entity record identifiers in two different account are allowed to be the same.). When account identifiers are not available, then the linking of entity records through complementarity can only take place within the scope of a single account.
+>>>>>>> other
 </p>
 
+<<<<<<< local
 <p>However, there is sense that <span class="name">e3</span> still depends on <span class="name">e1</span>, since <span class="name">e3</span> could not be generated without <span class="name">e1</span> existing. Hence, we introduce a weaker notion of derivation record, which is transitive.</p>
-
+=======
+>>>>>>> other
+
+<<<<<<< local
 A transitive derivation record, written <span class="name">dependedOn(e2, e1)</span> in PROV-ASN:
 <ul>
 <li> contains an identifier <span class="name">e2</span>, denoting an entity record, which represents the entity that is the result of the derivation;
@@ -2139,17 +2197,53 @@
 <p>The record <span class="name">dependedOn</span> can only be inferred; in other words, it cannot be asserted. It is
 transitive by definition and relies on the previously defined derivation assertions for its
 base case.</p>
-
+=======
+<div class="anexample">
+<p>In the following example, the same description of the Royal Society is structured according to two different accounts.   In the second account, we find a complementarity record linking <span class="name">rs_m1</span>  in account <span class="name">ex:acc2</span>  to
+<span class="name">rs</span>  in account <span class="name">ex:acc1</span>.
+<pre class="codeexample">
+account(ex:acc1,
+        http://example.org/asserter1, 
+>>>>>>> other
+
+<<<<<<< local
 <div class='constraint' id='transitive-derivation'>
 <ul> 
 <li><span class='conditional'>If</span> <span class="name">wasDerivedFrom(e2,e1)</span> or <span class="name">wasDerivedFrom(e2,e1,pe,attrs2,attrs1)</span> holds, <span class='conditional'>then</span> <span class="name">dependedOn(e2,e1)</span> holds.</li>
 <li><span class='conditional'>If</span> <span class="name">wasEventuallyDerivedFrom(e2,e1)</span> holds, <span class='conditional'>then</span> <span class="name">dependedOn(e2,e1)</span> holds.</li>
 <li><span class='conditional'>If</span> <span class="name">dependedOn(e3,e2)</span> and <span class="name">dependedOn(e2,e1)</span> hold, <span class='conditional'>then</span> <span class="name">dependedOn(e3,e1)</span> holds.</li>
 </ul>
+=======
+    ...
+    entity(rs,[ex:created=1870])
+    ...
+    )
+
+
+account(ex:acc2,
+        http://example.org/asserter2, 
+
+    ...
+    entity(rs_m1,[ex:membership=250, ex:year=1900])
+    ...
+    wasComplementOf(rs_m1, ex:acc2, rs, ex:acc1)
+
+)
+</pre>
+>>>>>>> other
 </div>
 
+<<<<<<< local
 </section>
+=======
+
+>>>>>>> other
 -->
+<<<<<<< local
+=======
+
+
+>>>>>>> other