Mercurial > hg > prov / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset
* merging
authorjcheney@inf.ed.ac.uk
Thu, 10 Jan 2013 14:10:41 +0000
changeset 5410 25e09c198bb7
parent 5409 e124540018ad (current diff)
parent 5407 2c7a7c59642d (diff)
child 5411 da97b1d3c1aa
* merging 
--- a/testcases/constraints/ordering-association2-PASS-c47.provn	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/constraints/ordering-association2-PASS-c47.provn	Thu Jan 10 14:10:41 2013 +0000
@@ -2,7 +2,7 @@
   prefix ex <http://example.org/>
 
   activity(ex:a,-,-)
-  entity(ex:ag)
+  activity(ex:ag)
 
   agent(ex:ag)
   entity(ex:e1)
--- a/testcases/constraints/ordering-association2-PASS-c47.provx	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/constraints/ordering-association2-PASS-c47.provx	Thu Jan 10 14:10:41 2013 +0000
@@ -3,8 +3,8 @@
         <prov:activity prov:id="ex:a">
         </prov:activity>
         
-	<prov:entity prov:id="ex:ag">
-        </prov:entity>
+	<prov:activity prov:id="ex:ag">
+        </prov:activity>
         
 	<prov:agent prov:id="ex:ag">
         </prov:agent>
--- a/testcases/constraints/ordering-association2-PASS-c47.ttl	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/constraints/ordering-association2-PASS-c47.ttl	Thu Jan 10 14:10:41 2013 +0000
@@ -3,7 +3,7 @@
 
 ex:a a prov:Activity .
 
-ex:ag a prov:Entity , prov:Agent .
+ex:ag a prov:Activity , prov:Agent .
 
 ex:e1 a prov:Entity .
 
--- a/testcases/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provn	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provn	Thu Jan 10 14:10:41 2013 +0000
@@ -3,6 +3,6 @@
 
   entity(proteinSample)
   entity(digestedProteinSample1)
-  wasDerivedFrom(digestedProteinSample1, proteinSample, -, u1)
+  wasDerivedFrom(digestedProteinSample1, proteinSample, -, u1, -)
   used(u1; -, Trypsin, -,[prov:role='treatmentEnzyme'])
 endDocument
--- a/testcases/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provx	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/constraints/prov-o-property-hadUsage-FAIL-c51-DM.provx	Thu Jan 10 14:10:41 2013 +0000
@@ -3,16 +3,12 @@
     <prov:entity xmlns:def="http://example.com/" prov:id="def:proteinSample"/>
     <prov:entity xmlns:def="http://example.com/" prov:id="def:digestedProteinSample1"/>
     <prov:wasDerivedFrom>
+        <prov:usage xmlns="" prov:ref="node17d8sv91ex2"/>
         <prov:generatedEntity xmlns:def="http://example.com/" prov:ref="def:digestedProteinSample1"/>
         <prov:usedEntity xmlns:def="http://example.com/" prov:ref="def:proteinSample"/>
     </prov:wasDerivedFrom>
-    <prov:wasDerivedFrom>
-        <prov:usage xmlns="" prov:ref="node17d8sv91ex2"/>
-        <prov:generatedEntity xmlns:def="http://example.com/" prov:ref="def:digestedProteinSample1"/>
-    </prov:wasDerivedFrom>
     <prov:used>
         <prov:entity xmlns:def="http://example.com/" prov:ref="def:Trypsin"/>
         <prov:role xsi:type="xsd:string">http://example.com/treatmentEnzyme</prov:role>
-        <prov:role xmlns:def="http://example.com/" xsi:type="prov:AnyRef" prov:ref="def:treatmentEnzyme"/>
     </prov:used>
 </prov:document>
--- a/testcases/constraints/unification-influence-f1-FAIL-DM.ttl	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/constraints/unification-influence-f1-FAIL-DM.ttl	Thu Jan 10 14:10:41 2013 +0000
@@ -1,5 +1,5 @@
 @prefix prov: <http://www.w3.org/ns/prov#> .
 @prefix ex:   <http://example.com/> .
 
-
+ex:infl1 a prov:Influence .
 ex:x1 prov:qualifiedInfluence ex:infl1.
\ No newline at end of file
--- a/testcases/constraints/unification-influence-s1-PASS-c23.ttl	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/constraints/unification-influence-s1-PASS-c23.ttl	Thu Jan 10 14:10:41 2013 +0000
@@ -14,4 +14,5 @@
 ex:infl1
 	a prov:Influence;
 	prov:influencer ex:x2
-.
\ No newline at end of file
+.
+
--- a/testcases/provo/prov-o-class-Collection-PASS.provn	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/provo/prov-o-class-Collection-PASS.provn	Thu Jan 10 14:10:41 2013 +0000
@@ -8,7 +8,7 @@
   entity(todays-us-supreme-court, [prov:type='prov:Collection', prov:type='RobertsCourt', dcterms:description='copied-string'])
   wasGeneratedBy(todays-us-supreme-court, -, -, [dcterms:date="2012" %% xsd:gYear])
   
-  hadMember(todays-us-supreme-court, dbpedia:John_Glover_Roberts,\_Jr.)
+  hadMember(todays-us-supreme-court, dbpedia:John_Glover_Roberts\,_Jr\.)
   hadMember(todays-us-supreme-court, dbpedia:Antonin_Scalia)
   hadMember(todays-us-supreme-court, dbpedia:Anthony_Kennedy)
   hadMember(todays-us-supreme-court, dbpedia:Clarence_Thomas)
@@ -20,15 +20,16 @@
 
   wasDerivedFrom(todays-us-supreme-court, the-first-us-supreme-court)
 
-  entity(copied-string, [prov:value="2010–present: A. Scalia A. Kennedy C. Thomas R.B. Ginsburg\nS. Breyer S. Alito S. Sotomayor E. Kagan"]);
+  entity(copied-string, [prov:value="""2010–present: A. Scalia A. Kennedy C. Thomas R.B. Ginsburg
+                                       S. Breyer S. Alito S. Sotomayor E. Kagan"""])
   entity(page-by-seat, [prov:type='ex:WikipediaPage'])
   entity(page-by-composition, [prov:type='ex:WikipediaPage'])
   
   wasDerivedFrom(copied-string, page-by-composition, [prov:type='prov:Quotation'])
   specializationOf(page-by-seat, twc:wikipedia/us-supreme-court-by-seat)
-  wasGeneratedBy(page-by-seat, -, 2011-08-31T12:51)
+  wasGeneratedBy(page-by-seat, -, 2011-08-31T12:51:00)
 
   specializationOf(page-by-composition, twc:wikipedia/us-supreme-court-by-composition)
-  wasGeneratedBy(page-by-composition, -, 2012-05-16T14:33)
+  wasGeneratedBy(page-by-composition, -, 2012-05-16T14:33:00)
 
 endDocument
--- a/testcases/provo/prov-o-class-Collection-PASS.provx	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/provo/prov-o-class-Collection-PASS.provx	Thu Jan 10 14:10:41 2013 +0000
@@ -3,7 +3,7 @@
     <prov:entity xmlns="http://example.com/" prov:id="todays-us-supreme-court">
         <prov:type xsi:type="xsd:QName">prov:Collection</prov:type>
         <prov:type xsi:type="xsd:QName">RobertsCourt</prov:type>
-        <dcterms:description xmlns:dcterms="http://purl.org/dc/terms/" xsi:type="xsd:QName">{http://example.com/}copied-string</dcterms:description>
+        <dcterms:description xmlns:dcterms="http://purl.org/dc/terms/" xsi:type="xsd:QName">ex:copied-string</dcterms:description>
     </prov:entity>
     <prov:hadMember>
         <prov:collection xmlns="http://example.com/" prov:ref="todays-us-supreme-court"/>
@@ -48,11 +48,11 @@
         <prov:type xmlns:ex="http://example.com/ontology#" xsi:type="xsd:QName">ex:WikipediaPage</prov:type>
     </prov:entity>
     <prov:specializationOf>
-        <prov:specializedEntity xmlns="http://example.com/" prov:ref="page-by-seat"/>
+        <prov:specificEntity xmlns="http://example.com/" prov:ref="page-by-seat"/>
         <prov:generalEntity xmlns:twc="http://purl.org/twc/page/" prov:ref="twc:wikipedia/us-supreme-court-by-seat"/>
     </prov:specializationOf>
     <prov:specializationOf>
-        <prov:specializedEntity xmlns="http://example.com/" prov:ref="page-by-composition"/>
+        <prov:specificEntity xmlns="http://example.com/" prov:ref="page-by-composition"/>
         <prov:generalEntity xmlns:twc="http://purl.org/twc/page/" prov:ref="twc:wikipedia/us-supreme-court-by-composition"/>
     </prov:specializationOf>
 </prov:document>
--- a/testcases/provo/prov-o-property-alternateOf-PASS.provx	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/provo/prov-o-property-alternateOf-PASS.provx	Thu Jan 10 14:10:41 2013 +0000
@@ -19,11 +19,11 @@
         <prov:activity xmlns="" prov:ref="node17d8susgpx1"/>
     </prov:wasGeneratedBy>
     <prov:alternateOf>
-        <prov:entity2 xmlns:def="http://example.com/" prov:ref="def:london_forecast_0412"/>
-        <prov:entity1 xmlns:def="http://example.com/" prov:ref="def:london_forecast_043"/>
+        <prov:alternate1 xmlns:def="http://example.com/" prov:ref="def:london_forecast_0412"/>
+        <prov:alternate2 xmlns:def="http://example.com/" prov:ref="def:london_forecast_043"/>
     </prov:alternateOf>
     <prov:specializationOf>
-        <prov:specializedEntity xmlns:def="http://example.com/" prov:ref="def:london_forecast_0412"/>
+        <prov:specificEntity xmlns:def="http://example.com/" prov:ref="def:london_forecast_0412"/>
         <prov:generalEntity xmlns:def="http://example.com/" prov:ref="def:london_forecast"/>
     </prov:specializationOf>
     <prov:wasAttributedTo>
@@ -35,11 +35,11 @@
         <prov:activity xmlns="" prov:ref="node17d8susgpx2"/>
     </prov:wasGeneratedBy>
     <prov:alternateOf>
-        <prov:entity2 xmlns:def="http://example.com/" prov:ref="def:london_forecast_0413"/>
-        <prov:entity1 xmlns:def="http://example.com/" prov:ref="def:london_forecast_0412"/>
+        <prov:alternate1 xmlns:def="http://example.com/" prov:ref="def:london_forecast_0413"/>
+        <prov:alternate2 xmlns:def="http://example.com/" prov:ref="def:london_forecast_0412"/>
     </prov:alternateOf>
     <prov:specializationOf>
-        <prov:specializedEntity xmlns:def="http://example.com/" prov:ref="def:london_forecast_0413"/>
+        <prov:specificEntity xmlns:def="http://example.com/" prov:ref="def:london_forecast_0413"/>
         <prov:generalEntity xmlns:def="http://example.com/" prov:ref="def:london_forecast"/>
     </prov:specializationOf>
     <prov:wasAttributedTo>
--- a/testcases/provo/prov-o-property-hadMember-PASS.provn	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/provo/prov-o-property-hadMember-PASS.provn	Thu Jan 10 14:10:41 2013 +0000
@@ -8,7 +8,7 @@
   entity(todays-us-supreme-court, [prov:type='prov:Collection', prov:type='RobertsCourt', dcterms:description='copied-string'])
   wasGeneratedBy(todays-us-supreme-court, -, -, [dcterms:date="2012" %% xsd:gYear])
   
-  hadMember(todays-us-supreme-court, dbpedia:John_Glover_Roberts,_Jr.)
+  hadMember(todays-us-supreme-court, dbpedia:John_Glover_Roberts\,_Jr\.)
   hadMember(todays-us-supreme-court, dbpedia:Antonin_Scalia)
   hadMember(todays-us-supreme-court, dbpedia:Anthony_Kennedy)
   hadMember(todays-us-supreme-court, dbpedia:Clarence_Thomas)
@@ -20,15 +20,16 @@
 
   wasDerivedFrom(todays-us-supreme-court, the-first-us-supreme-court)
 
-  entity(copied-string, [prov:value="2010–present: A. Scalia A. Kennedy C. Thomas R.B. Ginsburg\nS. Breyer S. Alito S. Sotomayor E. Kagan"];
+  entity(copied-string, [prov:value="""2010–present: A. Scalia A. Kennedy C. Thomas R.B. Ginsburg
+                                       S. Breyer S. Alito S. Sotomayor E. Kagan"""])
   entity(page-by-seat, [prov:type='ex:WikipediaPage'])
   entity(page-by-composition, [prov:type='ex:WikipediaPage'])
   
   wasQuotedFrom(copied-string, page-by-composition)
   specializationOf(page-by-seat, twc:wikipedia/us-supreme-court-by-seat)
-  wasGeneratedBy(page-by-seat, -, 2011-08-31T12:51)
+  wasGeneratedBy(page-by-seat, -, 2011-08-31T12:51:00)
 
   specializationOf(page-by-composition, twc:wikipedia/us-supreme-court-by-composition)
-  wasGeneratedBy(page-by-composition, -, 2012-05-16T14:33)
+  wasGeneratedBy(page-by-composition, -, 2012-05-16T14:33:00)
 
 endDocument
--- a/testcases/provo/prov-o-property-hadMember-PASS.provx	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/provo/prov-o-property-hadMember-PASS.provx	Thu Jan 10 14:10:41 2013 +0000
@@ -48,11 +48,11 @@
         <prov:type xmlns:ex="http://example.com/ontology#" xsi:type="xsd:QName">ex:WikipediaPage</prov:type>
     </prov:entity>
     <prov:specializationOf>
-        <prov:specializedEntity xmlns="http://example.com/" prov:ref="page-by-seat"/>
+        <prov:specificEntity xmlns="http://example.com/" prov:ref="page-by-seat"/>
         <prov:generalEntity xmlns:twc="http://purl.org/twc/page/" prov:ref="twc:wikipedia/us-supreme-court-by-seat"/>
     </prov:specializationOf>
     <prov:specializationOf>
-        <prov:specializedEntity xmlns="http://example.com/" prov:ref="page-by-composition"/>
+        <prov:specificEntity xmlns="http://example.com/" prov:ref="page-by-composition"/>
         <prov:generalEntity xmlns:twc="http://purl.org/twc/page/" prov:ref="twc:wikipedia/us-supreme-court-by-composition"/>
     </prov:specializationOf>
 </prov:document>
--- a/testcases/provo/prov-o-property-hadUsage-FAIL.provn	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/provo/prov-o-property-hadUsage-FAIL.provn	Thu Jan 10 14:10:41 2013 +0000
@@ -3,6 +3,6 @@
 
   entity(proteinSample)
   entity(digestedProteinSample1)
-  wasDerivedFrom(digestedProteinSample1, proteinSample, -, u1)
+  wasDerivedFrom(digestedProteinSample1, proteinSample, -, u1, -)
   used(u1; -, Trypsin, -,[prov:role='treatmentEnzyme'])
 endDocument
--- a/testcases/provo/prov-o-property-qualifiedDerivation-FAIL.provn	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/provo/prov-o-property-qualifiedDerivation-FAIL.provn	Thu Jan 10 14:10:41 2013 +0000
@@ -2,6 +2,7 @@
 prefix def <http://example.com/>
 activity(def:chart_creation,2011-07-16T01:52:02Z,2011-07-16T03:00:02Z)
 entity(def:bar_chart)
-wasAssociatedWith(def:chat_plotting;def:chart_creation,def:derek,2011-07-16T03:00:02Z)
+wasAssociatedWith(def:chart_creation,def:derek,-)
+wasGeneratedBy(def:chat_plotting;-,-,2011-07-16T03:00:02Z)
 wasDerivedFrom(def:bar_chart, def:aggregatedByRegions, def:chart_creation, def:chat_plotting, -)
 endDocument
--- a/testcases/provo/prov-o-property-specializationOf-PASS.provx	Thu Jan 10 14:10:18 2013 +0000
+++ b/testcases/provo/prov-o-property-specializationOf-PASS.provx	Thu Jan 10 14:10:41 2013 +0000
@@ -18,11 +18,11 @@
         <prov:activity xmlns="" prov:ref="node17d8su6thx1"/>
     </prov:wasGeneratedBy>
     <prov:alternateOf>
-        <prov:entity2 xmlns:def="http://example.com/" prov:ref="def:london_forecast_0412"/>
-        <prov:entity1 xmlns:def="http://example.com/" prov:ref="def:london_forecast_0413"/>
+        <prov:alternate1 xmlns:def="http://example.com/" prov:ref="def:london_forecast_0412"/>
+        <prov:alternate2 xmlns:def="http://example.com/" prov:ref="def:london_forecast_0413"/>
     </prov:alternateOf>
     <prov:specializationOf>
-        <prov:specializedEntity xmlns:def="http://example.com/" prov:ref="def:london_forecast_0412"/>
+        <prov:specificEntity xmlns:def="http://example.com/" prov:ref="def:london_forecast_0412"/>
         <prov:generalEntity xmlns:def="http://example.com/" prov:ref="def:london_forecast"/>
     </prov:specializationOf>
     <prov:wasAttributedTo>
prov

Hosted by W3C Systems Team, please report bugs to sysreq@w3.org