IDMP-387 - simplified the definition of batch to use isConstituentOf …

…vs a new isBatchOf property

Signed-off-by: Elisa Kendall <ekendall@thematix.com>

ISO/ISO11615-MedicinalProducts.rdf

@@ -347,12 +347,6 @@
 
 	<owl:Class rdf:about="&idmp-mprd;Batch">
 		<rdfs:subClassOf rdf:resource="&cmns-prd;Product"/>
-		<rdfs:subClassOf>
-			<owl:Restriction>
-				<owl:onProperty rdf:resource="&idmp-mprd;isBatchOf"/>
-				<owl:someValuesFrom rdf:resource="&cmns-prd;Product"/>
-			</owl:Restriction>
-		</rdfs:subClassOf>
 		<rdfs:subClassOf>
 			<owl:Restriction>
 				<owl:onProperty rdf:resource="&idmp-mprd;isOutputOf"/>
@@ -365,6 +359,12 @@
 				<owl:someValuesFrom rdf:resource="&idmp-sub;Matter"/>
 			</owl:Restriction>
 		</rdfs:subClassOf>
+		<rdfs:subClassOf>
+			<owl:Restriction>
+				<owl:onProperty rdf:resource="&cmns-col;isConstituentOf"/>
+				<owl:someValuesFrom rdf:resource="&cmns-prd;Product"/>
+			</owl:Restriction>
+		</rdfs:subClassOf>
 		<rdfs:label>batch</rdfs:label>
 		<dct:source>ANSI/ISA S88: https://www.isa.org/products/ansi-isa-88-00-01-2010-batch-control-part-1-models (paragraph 3.1.6)</dct:source>
 		<skos:definition>material that is being produced or that has been produced by a single execution of a process that leads to the production of finite quantities of material by subjecting quantities of input materials to an ordered set of processing activities over a finite period of time</skos:definition>
@@ -1120,14 +1120,14 @@
 		<rdfs:subClassOf rdf:resource="&idmp-mprd;Batch"/>
 		<rdfs:subClassOf>
 			<owl:Restriction>
-				<owl:onProperty rdf:resource="&idmp-mprd;isBatchOf"/>
-				<owl:someValuesFrom rdf:resource="&idmp-mprd;PharmaceuticalProduct"/>
+				<owl:onProperty rdf:resource="&idmp-mprd;isContainedIn"/>
+				<owl:someValuesFrom rdf:resource="&idmp-mprd;PackagedMedicinalProduct"/>
 			</owl:Restriction>
 		</rdfs:subClassOf>
 		<rdfs:subClassOf>
 			<owl:Restriction>
-				<owl:onProperty rdf:resource="&idmp-mprd;isContainedIn"/>
-				<owl:someValuesFrom rdf:resource="&idmp-mprd;PackagedMedicinalProduct"/>
+				<owl:onProperty rdf:resource="&cmns-col;isConstituentOf"/>
+				<owl:someValuesFrom rdf:resource="&idmp-mprd;PharmaceuticalProduct"/>
 			</owl:Restriction>
 		</rdfs:subClassOf>
 		<rdfs:subClassOf>
@@ -1557,14 +1557,6 @@
 		<skos:definition>indicates the situation that faciliates endorsement of the authorized party for some purpose</skos:definition>
 	</owl:ObjectProperty>
 
-	<owl:ObjectProperty rdf:about="&idmp-mprd;isBatchOf">
-		<rdfs:subPropertyOf rdf:resource="&cmns-ra;isRelatedTo"/>
-		<rdfs:label>is batch of</rdfs:label>
-		<dct:source>ANSI/ISA S88: https://www.isa.org/products/ansi-isa-88-00-01-2010-batch-control-part-1-models (paragraph 3.1.6)</dct:source>
-		<rdfs:range rdf:resource="&idmp-mprd;BatchManufacturingProcess"/>
-		<skos:definition>is produced or has been produced by a single execution of a batch process</skos:definition>
-	</owl:ObjectProperty>
-
 	<owl:ObjectProperty rdf:about="&idmp-mprd;isContainedIn">
 		<rdf:type rdf:resource="&owl;TransitiveProperty"/>
 		<rdfs:subPropertyOf rdf:resource="&cmns-col;isPartOf"/>