Merge remote-tracking branch 'origin/master' into ontology-review/sof…

…tware

Provenance-Example/Example.sadl

@@ -104,6 +104,7 @@ ExplanatoryRequirement
   is a REQUIREMENT
   createdBy DefineRequirements
   dataInsertedBy WriteSomeSadl
-  text "Help RACK users understand the difference between
+  description
+        "Help RACK users understand the difference between
         authorship of a requirement and the process of ingesting
         that requirement into RACK itself".

RACK-Ontology/OwlModels/AGENTS.owl

@@ -1,7 +1,7 @@
 <rdf:RDF
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:provs="http://arcos.rack/PROV-S#"
-    xmlns:AGENTS="http://arcos.rack/AGENTS#"
+    xmlns:Ag="http://arcos.rack/AGENTS#"
     xmlns:builtinfunctions="http://sadl.org/builtinfunctions#"
     xmlns:owl="http://www.w3.org/2002/07/owl#"
     xmlns:sadlimplicitmodel="http://sadl.org/sadlimplicitmodel#"
@@ -17,43 +17,46 @@
     <rdfs:comment xml:lang="en">This ontology was created from a SADL file 'AGENTS.sadl' and should not be directly edited.</rdfs:comment>
   </owl:Ontology>
   <owl:Class rdf:ID="TOOL">
-    <rdfs:comment xml:lang="en">An aid (software, hardware, etc) that automates the performance of a specific activity.</rdfs:comment>
-    <rdfs:subClassOf rdf:resource="PROV-S#AGENT"/>
-  </owl:Class>
-  <owl:Class rdf:ID="SOFTWAREAGENT">
-    <rdfs:comment xml:lang="en">A software agent is running software.</rdfs:comment>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:maxCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:maxCardinality>
+        <owl:onProperty>
+          <owl:DatatypeProperty rdf:ID="toolVersion"/>
+        </owl:onProperty>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:comment xml:lang="en">An aid (software, hardware, etc) that automates the performance of an activity.</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#AGENT"/>
   </owl:Class>
   <owl:Class rdf:ID="ORGANIZATION">
     <rdfs:comment xml:lang="en">An organization is a social or legal institution such as a company, society, etc.</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#AGENT"/>
   </owl:Class>
   <owl:Class rdf:ID="PERSON">
-    <rdfs:comment xml:lang="en">Person agents are people</rdfs:comment>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:someValuesFrom rdf:resource="PROV-S#AGENT"/>
+        <owl:onProperty>
+          <owl:ObjectProperty rdf:ID="employedBy"/>
+        </owl:onProperty>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:comment xml:lang="en">Person agents are people - alias for User</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#AGENT"/>
   </owl:Class>
-  <owl:ObjectProperty rdf:ID="employedBy">
+  <owl:ObjectProperty rdf:about="#employedBy">
     <rdfs:subPropertyOf rdf:resource="PROV-S#actedOnBehalfOf"/>
     <rdfs:comment xml:lang="en">Relates people to the company they were acting on behalf of.</rdfs:comment>
-    <rdfs:range rdf:resource="PROV-S#AGENT"/>
-    <rdfs:domain rdf:resource="#PERSON"/>
   </owl:ObjectProperty>
-  <owl:DatatypeProperty rdf:ID="name">
-    <rdfs:comment xml:lang="en">Full name of a person</rdfs:comment>
-    <rdfs:domain>
-      <owl:Class>
-        <owl:unionOf rdf:parseType="Collection">
-          <owl:Class rdf:about="#ORGANIZATION"/>
-          <owl:Class rdf:about="#PERSON"/>
-        </owl:unionOf>
-      </owl:Class>
-    </rdfs:domain>
-    <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-    <rdfs:comment xml:lang="en">Full name of an organization</rdfs:comment>
-  </owl:DatatypeProperty>
   <owl:DatatypeProperty rdf:ID="emailAddress">
     <rdfs:comment xml:lang="en">Email address of person</rdfs:comment>
     <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
     <rdfs:domain rdf:resource="#PERSON"/>
   </owl:DatatypeProperty>
+  <owl:DatatypeProperty rdf:about="#toolVersion">
+    <rdfs:comment xml:lang="en">The release version of the tool</rdfs:comment>
+    <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+    <rdfs:domain rdf:resource="#TOOL"/>
+  </owl:DatatypeProperty>
 </rdf:RDF>

RACK-Ontology/OwlModels/ANALYSIS.owl

@@ -1,61 +1,90 @@
 <rdf:RDF
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:provs="http://arcos.rack/PROV-S#"
-    xmlns:A="http://arcos.rack/ANALYSIS#"
+    xmlns:An="http://arcos.rack/ANALYSIS#"
     xmlns:builtinfunctions="http://sadl.org/builtinfunctions#"
     xmlns:owl="http://www.w3.org/2002/07/owl#"
     xmlns:sadlimplicitmodel="http://sadl.org/sadlimplicitmodel#"
     xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+    xmlns:D="http://arcos.rack/DOCUMENT#"
     xmlns:sadlbasemodel="http://sadl.org/sadlbasemodel#"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
   xml:base="http://arcos.rack/ANALYSIS">
   <owl:Ontology rdf:about="">
+    <owl:imports rdf:resource="DOCUMENT"/>
     <owl:imports rdf:resource="PROV-S"/>
     <owl:imports rdf:resource="http://sadl.org/builtinfunctions"/>
     <owl:imports rdf:resource="http://sadl.org/sadlimplicitmodel"/>
     <owl:imports rdf:resource="http://sadl.org/sadlbasemodel"/>
     <rdfs:comment xml:lang="en">This ontology was created from a SADL file 'ANALYSIS.sadl' and should not be directly edited.</rdfs:comment>
   </owl:Ontology>
   <owl:Class rdf:ID="ANALYSIS_ANNOTATION">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
+        <owl:onProperty>
+          <owl:ObjectProperty rdf:ID="annotationType"/>
+        </owl:onProperty>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
+        <owl:onProperty>
+          <owl:ObjectProperty rdf:ID="fromReport"/>
+        </owl:onProperty>
+      </owl:Restriction>
+    </rdfs:subClassOf>
     <rdfs:comment xml:lang="en">A result of the analysis that is linked to some specific part of the system.</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
   <owl:Class rdf:ID="ANALYSIS_RESULT">
     <owl:equivalentClass>
       <owl:Class>
         <owl:oneOf rdf:parseType="Collection">
-          <A:ANALYSIS_RESULT rdf:ID="Passed">
+          <An:ANALYSIS_RESULT rdf:ID="Passed">
             <provs:identifier>Passed</provs:identifier>
-          </A:ANALYSIS_RESULT>
-          <A:ANALYSIS_RESULT rdf:ID="Failed">
+          </An:ANALYSIS_RESULT>
+          <An:ANALYSIS_RESULT rdf:ID="Failed">
             <provs:identifier>Failed</provs:identifier>
-          </A:ANALYSIS_RESULT>
-          <A:ANALYSIS_RESULT rdf:ID="Indeterminate">
+          </An:ANALYSIS_RESULT>
+          <An:ANALYSIS_RESULT rdf:ID="Indeterminate">
             <provs:identifier>Indeterminate</provs:identifier>
-          </A:ANALYSIS_RESULT>
+          </An:ANALYSIS_RESULT>
         </owl:oneOf>
       </owl:Class>
     </owl:equivalentClass>
-    <rdfs:comment xml:lang="en">Outcome of an analysis report</rdfs:comment>
+    <rdfs:comment xml:lang="en">Outcome of an analysis</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#THING"/>
   </owl:Class>
   <owl:Class rdf:ID="ANALYSIS_ANNOTATION_TYPE">
     <rdfs:comment xml:lang="en">An open/extensible set of types of analysis annotations</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#THING"/>
   </owl:Class>
-  <owl:Class rdf:ID="ANALYSIS">
-    <rdfs:comment xml:lang="en">ACTIVITY of running some analysis, supposedly creating some ANALYSIS_REPORT</rdfs:comment>
-    <rdfs:subClassOf rdf:resource="PROV-S#ACTIVITY"/>
-  </owl:Class>
-  <owl:Class rdf:ID="ANALYSIS_REPORT">
+  <owl:Class rdf:ID="ANALYSIS_OUTPUT">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:maxCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:maxCardinality>
+        <owl:onProperty>
+          <owl:ObjectProperty rdf:ID="result"/>
+        </owl:onProperty>
+      </owl:Restriction>
+    </rdfs:subClassOf>
     <rdfs:comment xml:lang="en">Output of an ANALYSIS</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
+  <owl:Class rdf:ID="ANALYSIS">
+    <rdfs:comment xml:lang="en">ACTIVITY of running some analysis, and as a result creating some ANALYSIS_REPORT</rdfs:comment>
+    <rdfs:subClassOf rdf:resource="PROV-S#ACTIVITY"/>
+  </owl:Class>
   <owl:ObjectProperty rdf:ID="producedBy">
     <rdfs:subPropertyOf rdf:resource="PROV-S#wasGeneratedBy"/>
     <rdfs:comment xml:lang="en">ACTIVITY(s) (e.g. ANALYSIS) producing this report</rdfs:comment>
     <rdfs:range rdf:resource="PROV-S#ACTIVITY"/>
-    <rdfs:domain rdf:resource="#ANALYSIS_REPORT"/>
+    <rdfs:domain rdf:resource="#ANALYSIS_OUTPUT"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="performedBy">
     <rdfs:subPropertyOf rdf:resource="PROV-S#wasAssociatedWith"/>
@@ -64,41 +93,41 @@
     <rdfs:domain rdf:resource="#ANALYSIS"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="analyzes">
-    <rdfs:subPropertyOf rdf:resource="PROV-S#wasDerivedFrom"/>
+    <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
     <rdfs:comment xml:lang="en">ENTITY(s) under analysis</rdfs:comment>
     <rdfs:range rdf:resource="PROV-S#ENTITY"/>
-    <rdfs:domain rdf:resource="#ANALYSIS_REPORT"/>
+    <rdfs:domain rdf:resource="#ANALYSIS_OUTPUT"/>
   </owl:ObjectProperty>
-  <owl:ObjectProperty rdf:ID="annotationType">
+  <owl:ObjectProperty rdf:about="#annotationType">
     <rdfs:comment xml:lang="en">The type of the annotation.</rdfs:comment>
     <rdfs:range rdf:resource="#ANALYSIS_ANNOTATION_TYPE"/>
     <rdfs:domain rdf:resource="#ANALYSIS_ANNOTATION"/>
   </owl:ObjectProperty>
-  <owl:ObjectProperty rdf:ID="fromReport">
+  <owl:ObjectProperty rdf:about="#fromReport">
     <rdfs:comment xml:lang="en">Which analysis report this annotation comes from.</rdfs:comment>
-    <rdfs:range rdf:resource="PROV-S#ENTITY"/>
+    <rdfs:range rdf:resource="#ANALYSIS_OUTPUT"/>
     <rdfs:domain rdf:resource="#ANALYSIS_ANNOTATION"/>
   </owl:ObjectProperty>
-  <owl:ObjectProperty rdf:ID="result">
+  <owl:ObjectProperty rdf:about="#result">
     <rdfs:comment xml:lang="en">Passed/Failed/Indeterminate status of this report</rdfs:comment>
     <rdfs:range rdf:resource="#ANALYSIS_RESULT"/>
-    <rdfs:domain rdf:resource="#ANALYSIS_REPORT"/>
+    <rdfs:domain rdf:resource="#ANALYSIS_OUTPUT"/>
   </owl:ObjectProperty>
   <owl:DatatypeProperty rdf:ID="metric">
     <rdfs:comment xml:lang="en">provides a numerical result value from the analysis that was performed</rdfs:comment>
     <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
-    <rdfs:domain rdf:resource="#ANALYSIS_REPORT"/>
+    <rdfs:domain rdf:resource="#ANALYSIS_OUTPUT"/>
   </owl:DatatypeProperty>
-  <A:ANALYSIS_ANNOTATION_TYPE rdf:ID="POSTCONDITION">
+  <An:ANALYSIS_ANNOTATION_TYPE rdf:ID="POSTCONDITION">
     <provs:identifier>Postcondition</provs:identifier>
     <rdfs:comment xml:lang="en">A constraint that should hold after of successful operation of this unit of code.</rdfs:comment>
-  </A:ANALYSIS_ANNOTATION_TYPE>
-  <A:ANALYSIS_ANNOTATION_TYPE rdf:ID="INVARIANT">
+  </An:ANALYSIS_ANNOTATION_TYPE>
+  <An:ANALYSIS_ANNOTATION_TYPE rdf:ID="INVARIANT">
     <provs:identifier>Invariant</provs:identifier>
     <rdfs:comment xml:lang="en">A constraint on this unit of code or data that is true at any point in the program's execution.</rdfs:comment>
-  </A:ANALYSIS_ANNOTATION_TYPE>
-  <A:ANALYSIS_ANNOTATION_TYPE rdf:ID="PRECONDITION">
+  </An:ANALYSIS_ANNOTATION_TYPE>
+  <An:ANALYSIS_ANNOTATION_TYPE rdf:ID="PRECONDITION">
     <provs:identifier>Precondition</provs:identifier>
     <rdfs:comment xml:lang="en">A constraint that should hold in advance of successful operation of this unit of code.</rdfs:comment>
-  </A:ANALYSIS_ANNOTATION_TYPE>
+  </An:ANALYSIS_ANNOTATION_TYPE>
 </rdf:RDF>

RACK-Ontology/OwlModels/CONFIDENCE.owl

@@ -16,21 +16,6 @@
     <owl:imports rdf:resource="http://sadl.org/sadlbasemodel"/>
     <rdfs:comment xml:lang="en">This ontology was created from a SADL file 'CONFIDENCE.sadl' and should not be directly edited.</rdfs:comment>
   </owl:Ontology>
-  <rdfs:Datatype rdf:ID="Probability">
-    <owl:equivalentClass>
-      <rdfs:Datatype>
-        <owl:withRestrictions rdf:parseType="Collection">
-          <rdf:Description>
-            <xsd:maxInclusive rdf:datatype="http://www.w3.org/2001/XMLSchema#float"
-            >1</xsd:maxInclusive>
-            <xsd:minInclusive rdf:datatype="http://www.w3.org/2001/XMLSchema#float"
-            >0</xsd:minInclusive>
-          </rdf:Description>
-        </owl:withRestrictions>
-        <owl:onDatatype rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
-      </rdfs:Datatype>
-    </owl:equivalentClass>
-  </rdfs:Datatype>
   <owl:Class rdf:ID="CONFIDENCE_ASSESSMENT">
     <rdfs:subClassOf>
       <owl:Restriction>
@@ -59,6 +44,15 @@
         </owl:onProperty>
       </owl:Restriction>
     </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:maxCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:maxCardinality>
+        <owl:onProperty>
+          <owl:ObjectProperty rdf:ID="assesses"/>
+        </owl:onProperty>
+      </owl:Restriction>
+    </rdfs:subClassOf>
     <rdfs:comment xml:lang="en">Superclass for confidence assessments over some other data in the ontology.</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#THING"/>
   </owl:Class>
@@ -70,8 +64,8 @@
     <rdfs:comment xml:lang="en">A belief-disbelief-uncertainty confidence assessment, c.f. Subjective Logic. belief, disbelief, and uncertainty should sum to 1</rdfs:comment>
     <rdfs:subClassOf rdf:resource="#CONFIDENCE_ASSESSMENT"/>
   </owl:Class>
-  <owl:ObjectProperty rdf:ID="assesses">
-    <rdfs:subPropertyOf rdf:resource="PROV-S#wasDerivedFrom"/>
+  <owl:ObjectProperty rdf:about="#assesses">
+    <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
     <rdfs:comment xml:lang="en">ENTITY(s) whose confidence is assessed</rdfs:comment>
     <rdfs:range rdf:resource="PROV-S#ENTITY"/>
     <rdfs:domain rdf:resource="#CONFIDENCE_ASSESSMENT"/>